11026 Commits

Author SHA1 Message Date
Moriz Wahl
c3b72f40a0
Merge branch 'master' into fix-update-admin-contribution-updates-list 2022-11-07 11:44:53 +01:00
mahula
3145571727
Merge pull request #2336 from gradido/2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time
Refactor: GitHub test workflow - disable video recording and reduce wait time
2022-11-04 14:21:47 +01:00
mahula
5297ffaf40
Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time 2022-11-04 14:08:56 +01:00
clauspeterhuebner
a460bbef20
Merge pull request #2289 from gradido/2274-feature-concept-manuel-user-registration-for-admins
2274 feature concept manuel user registration for admins
2022-11-04 14:06:14 +01:00
mahula
ceedc49063
Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time 2022-11-04 13:43:47 +01:00
mahula
668546e49f github workflow: remove branch specific trigger 2022-11-04 12:19:36 +01:00
mahula
dbdb0f4221 github workflow: set nginx building job after jobs for frontend, backend, and admin interface 2022-11-04 11:19:49 +01:00
mahula
958b681e94 github workflow: reuse system images build in previuos jobs 2022-11-04 11:12:44 +01:00
mahula
ece9e21aaf github workflow: restructure system boot uo steps and reduce wait time 2022-11-04 11:10:50 +01:00
mahula
0a02a96885 github workflow: set reqiured image names in docker-compose.test.yml 2022-11-04 11:01:20 +01:00
Moriz Wahl
2e070cef7b remove stupid comments 2022-11-03 20:05:57 +01:00
Moriz Wahl
2746c4718a test apollo client with apollo client mock library 2022-11-03 19:53:24 +01:00
clauspeterhuebner
70c5104e0c
Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins 2022-11-03 14:49:55 +01:00
Moriz Wahl
a8247da3d4 use apollo correctly 2022-11-03 14:24:09 +01:00
Moriz Wahl
0ba82d66fe fix: Update Contribution List after Admin Updates Contribution 2022-11-03 13:01:02 +01:00
clauspeterhuebner
1bdb41f3a2
Merge pull request #2252 from gradido/1574-Concept_to_introduce_Gradido-ID
1574 concept to introduce gradidoID and change password encryption
2022-11-02 22:52:24 +01:00
clauspeterhuebner
64fb98de4a
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID 2022-11-02 22:39:18 +01:00
Claus-Peter Hübner
c4ccc02828 finished 2022-11-02 22:24:27 +01:00
Claus-Peter Hübner
0a70a1f047 Merge branch '2274-feature-concept-manuel-user-registration-for-admins' of github.com:gradido/gradido into 2274-feature-concept-manuel-user-registration-for-admins 2022-11-02 18:47:07 +01:00
Claus-Peter Hübner
dba98e316d Merge remote-tracking branch 'origin/master' into 2274-feature-concept-manuel-user-registration-for-admins 2022-11-02 18:45:38 +01:00
mahula
d2f80e27c4 github workflow: restructure e2e steps for runtime reduction 2022-11-02 17:36:40 +01:00
clauspeterhuebner
694963c2e1
Merge pull request #2241 from gradido/2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
contributionlink stage-2 and stage-3 of capturing and activation
2022-11-02 16:36:02 +01:00
clauspeterhuebner
3e530dc2ef
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham 2022-11-02 14:45:02 +01:00
mahula
73c4f62a8e e2e testing: disable video recording 2022-11-02 13:59:25 +01:00
clauspeterhuebner
d1f7bb26d7
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID 2022-11-02 13:57:00 +01:00
clauspeterhuebner
f9ed4fd1d6
Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins 2022-11-02 13:53:49 +01:00
mahula
0fd585a96f
Merge pull request #2323 from gradido/fix-github-workflow-actions-node-deprecation-warnings
Github workflow: update actions to the current API version using Node v 16
2022-11-02 11:53:57 +01:00
mahula
97cb69f042 github workflow: update actions to the current API version using Node.js v16 2022-11-01 23:56:30 +01:00
mahula
168b01d01f
Merge pull request #2319 from gradido/2283-feature-fullstack-tests-as-github-workflow
feature: Fullstack tests in GitHub workflow
2022-11-01 23:14:12 +01:00
mahula
f49da855ce
Merge branch 'master' into 2283-feature-fullstack-tests-as-github-workflow 2022-11-01 21:05:39 +01:00
Moriz Wahl
f74fb216dc
Merge pull request #2322 from gradido/release-1.13.3
release: Version 1.13.3
2022-11-01 16:01:40 +01:00
Moriz Wahl
7f56eb2f75 release: Version 1.13.3 2022-11-01 15:48:31 +01:00
Alexander Friedland
54277a6161
Merge pull request #2312 from gradido/2294-Contribution-Links-on-its-own-Page
2294 contribution links on its own page
2022-11-01 15:47:09 +01:00
Moriz Wahl
abe57bd2f6
Merge branch 'master' into 2294-Contribution-Links-on-its-own-Page 2022-11-01 15:36:51 +01:00
Moriz Wahl
96323cd05d
Merge pull request #2302 from gradido/change-orange-color
fix: Change Orange Color
2022-11-01 15:35:54 +01:00
Moriz Wahl
e81fcbdba1 Merge branch 'master' into 2294-Contribution-Links-on-its-own-Page 2022-11-01 15:33:38 +01:00
Moriz Wahl
38e51f6cab
Merge branch 'master' into change-orange-color 2022-11-01 15:27:46 +01:00
Moriz Wahl
83c1fc4bfa
Merge pull request #2320 from gradido/release-statistics-query
fix: Release Statistic Query Runner
2022-11-01 15:27:14 +01:00
Moriz Wahl
e0f824fb13
Merge branch 'master' into release-statistics-query 2022-11-01 15:18:35 +01:00
Alexander Friedland
aca0fd48b4
Merge pull request #2311 from gradido/2295-Horizontal-Scrollbar
bug: 2295 remove horizontal scrollbar in admin overview
2022-11-01 15:17:48 +01:00
mahula
d5a89454ff
Merge branch 'master' into 2283-feature-fullstack-tests-as-github-workflow 2022-11-01 15:07:46 +01:00
Alexander Friedland
652548ef27
Merge branch 'master' into 2295-Horizontal-Scrollbar 2022-11-01 15:06:09 +01:00
Alexander Friedland
887f7051b3
Merge pull request #2313 from gradido/2292-Community-Information-Contact
2292 community information contact
2022-11-01 15:05:55 +01:00
mahula
beab2f9e91
Merge branch 'master' into 2283-feature-fullstack-tests-as-github-workflow 2022-11-01 15:04:47 +01:00
Moriz Wahl
0e1d09c2fe
Merge branch 'master' into change-orange-color 2022-11-01 14:55:18 +01:00
Moriz Wahl
1528503d67
Merge branch 'master' into release-statistics-query 2022-11-01 14:55:02 +01:00
Alexander Friedland
90182dc86b
Merge branch 'master' into 2295-Horizontal-Scrollbar 2022-11-01 14:54:12 +01:00
Alexander Friedland
c02d6aa8af
Merge branch 'master' into 2292-Community-Information-Contact 2022-11-01 14:53:44 +01:00
Alexander Friedland
e31737f456
Merge pull request #2316 from gradido/2315-Contribution-Month-and-TEST-FAIL-in-MASTER
bug: 2315 Contribution Month and TEST FAIL in MASTER
2022-11-01 14:53:14 +01:00
ogerly
de1a305880 rename ContributionLink to ContributionLinks 2022-11-01 14:51:56 +01:00