12033 Commits

Author SHA1 Message Date
Moriz Wahl
a8247da3d4 use apollo correctly 2022-11-03 14:24:09 +01:00
ogerly
8450075135 Merge branch '2004-Basic-Menu' into 2290-New-Design 2022-11-03 13:52:44 +01:00
ogerly
da9457be35 refactor struktur app, mainpage, flex and positions 2022-11-03 13:51:58 +01:00
ogerly
b8cb5e9c7f Merge branch '2004-Basic-Menu' into 2290-New-Design 2022-11-03 13:02:48 +01:00
ogerly
95b0185de1 lightning and dark mode prepared 2022-11-03 13:02:02 +01:00
Moriz Wahl
0ba82d66fe fix: Update Contribution List after Admin Updates Contribution 2022-11-03 13:01:02 +01:00
Hannes Heine
fb92cf9ed6
Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-11-03 09:45:09 +01:00
elweyn
b3fd53ab7a Change the display of the history message. 2022-11-03 08:35:26 +01:00
ogerly
28f67cbbf7 fix test 2022-11-03 07:56:40 +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
clauspeterhuebner
917eb0a5b0
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month 2022-11-02 17:45:11 +01:00
mahula
d2f80e27c4 github workflow: restructure e2e steps for runtime reduction 2022-11-02 17:36:40 +01:00
jjimenezgarcia
afed8c94ea
Merge branch 'master' into logger-error-cleaning-history 2022-11-02 16:46:52 +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
jjimenezgarcia
d693f5f025
Merge branch 'master' into logger-error-cleaning-history 2022-11-02 15:22:30 +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
ogerly
c9fc3e61f5 fix stylelint 2022-11-02 14:37:46 +01:00
Alexander Friedland
c12b9af504
Merge branch 'master' into 2290-New-Design 2022-11-02 14:09:55 +01:00
ogerly
1607bed006 resolve conflicts 2022-11-02 14:08:02 +01:00
ogerly
b35e373d3f fix locales 2022-11-02 14:05:12 +01:00
ogerly
63fb6f3cd2 delete unused locales 2022-11-02 14:04:49 +01:00
ogerly
a54a37be6a add skeleton system 2022-11-02 14:02:16 +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
Hannes Heine
677519dda7
Merge branch 'master' into 2140-add-updated-at-to-contributions 2022-11-02 13:27:06 +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
ogerly
172eeaeeaf add light and dark mode in seperate scss, add switch in sidebar 2022-11-02 11:41:00 +01:00
Alexander Friedland
733bc69abe
Merge branch 'master' into 2004-Basic-Menu 2022-11-02 07:15:56 +01:00
Alexander Friedland
03d7857f53
Merge branch 'master' into 2290-New-Design 2022-11-02 07:15:42 +01:00
Alexander Friedland
7376f55308
Merge branch 'master' into 2303-Allow-the-admin-to-edit-automatic-contribution-link 2022-11-02 07:13:43 +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
Alexander Friedland
4a14742c22
Merge branch 'master' into 2303-Allow-the-admin-to-edit-automatic-contribution-link 2022-11-01 16:35:16 +01:00
Moriz Wahl
cd93b0bf34 release: Version 1.13.3 2022-11-01 16:31:40 +01:00
Moriz Wahl
d93fb24d09 linting 2022-11-01 16:31:40 +01:00
Moriz Wahl
71a4cb464a fix: Change Orange Color 2022-11-01 16:31:40 +01:00
ogerly
ebc61b90b9 fix locales && lint 2022-11-01 16:31:40 +01:00
ogerly
a3bc4dc026 Contact email under own heading 2022-11-01 16:31:40 +01:00
ogerly
737b374811 remove horizontal scrollbar in admin overview 2022-11-01 16:31:40 +01:00
ogerly
15d0971f6b more tests, 31st, 28st, 29.02.2024 2022-11-01 16:31:40 +01:00
ogerly
3cc7339ca6 the last and current month is displayed cleanly again. 2022-11-01 16:31:40 +01:00
Moriz Wahl
2386a980c6 fix: Release Statistic Query Runner 2022-11-01 16:31:40 +01:00
ogerly
4f69403b77 rename ContributionLink to ContributionLinks 2022-11-01 16:31:39 +01:00
ogerly
d4e722ea93 more tests for all nav-items 2022-11-01 16:31:39 +01:00