9349 Commits

Author SHA1 Message Date
elweyn
b991bb0467 Delete datas after all listContributions and updateContribution Tests. 2022-07-12 10:11:28 +02:00
elweyn
46206c4752 Handled the merge conflict so that we can continue to work. 2022-07-12 10:01:26 +02:00
Hannes Heine
f852c97995
Merge pull request #2031 from gradido/2000-contribution-list
feat: implement contribution list query
2022-07-12 09:55:19 +02:00
elweyn
c6ae5760c3 Test that the updateContribution mutation updates the contribution with the right values. 2022-07-12 09:55:03 +02:00
elweyn
9ee40767bb Change test so that only the date is to old and the amount could be right. 2022-07-12 09:45:48 +02:00
elweyn
9e355f9202 Test that the updateContribution mutation can not update contribution to a date that is older than 3 month. 2022-07-12 09:43:47 +02:00
elweyn
6348756ab3 Test that the updateContribution mutation can not update more gdd's than allowed in the month. 2022-07-12 09:39:24 +02:00
elweyn
86433478ec Test that only the user that created the contribution can update it with the updateContribution mutation. 2022-07-12 09:38:19 +02:00
elweyn
5369aced43 Change mutation to include id in the result, write test to update contribution with inexistent id. 2022-07-12 09:37:06 +02:00
Hannes Heine
773d40e1c5
Merge branch 'master' into 2000-contribution-list 2022-07-12 09:32:33 +02:00
elweyn
0e13c7c2e1 Remove spaces. 2022-07-12 08:47:15 +02:00
elweyn
b6f1b0730a Change the orders and structure from the tests for listContributions. 2022-07-12 08:44:36 +02:00
einhornimmond
cc15dd811f
Merge pull request #2034 from gradido/move_users_creation_date
add code for moving user creation date if transaction before exist
2022-07-11 23:40:16 +02:00
elweyn
339b32a02f Change FindOperator<any> to <number> 2022-07-11 17:16:31 +02:00
Einhornimmond
6d4d030136 exchanged order with other migration 2022-07-11 15:08:41 +02:00
elweyn
70db65044c Fix linting. 2022-07-11 14:09:40 +02:00
elweyn
f8cdad7e58 Change the where clause to a defined object. 2022-07-11 14:07:57 +02:00
elweyn
2113061629 Change the imports to the standard. 2022-07-11 14:05:57 +02:00
elweyn
caf4e9ae3e Change the test name to filterConfirmed is false. 2022-07-11 14:04:38 +02:00
einhornimmond
89854923dc
Merge branch 'master' into move_users_creation_date 2022-07-11 13:00:55 +02:00
Hannes Heine
4e6ac97906
Merge branch 'master' into 2000-contribution-list 2022-07-11 12:38:15 +02:00
elweyn
9239f93096 Add no non nullable assertion to admin Creation. 2022-07-11 12:21:51 +02:00
Alexander Friedland
a1d86962ee
Merge pull request #2037 from gradido/2036-change-text-start-page
change text from page
2022-07-11 12:17:01 +02:00
elweyn
ae52b520dd Withdrew where clause to an variable with inline condition. 2022-07-11 12:04:46 +02:00
elweyn
a2eccb12ed Change the variable name contribution to contributions. 2022-07-11 11:42:39 +02:00
elweyn
3718f0dc56 Change the test so that we can test if the contribution list finds only created but not confirmed contribution 2022-07-11 11:42:24 +02:00
Alexander Friedland
971473965a
Update en.json 2022-07-11 10:59:27 +02:00
Einhornimmond
1841d9969d finalize 2022-07-10 08:39:25 +02:00
elweyn
f373562d83 Merge branch 'master' into 2000-contribution-list 2022-07-08 12:08:30 +02:00
ogerly
ca84fc3bae change text from page 2022-07-07 07:42:39 +02:00
mahula
2f67e5f98a
Merge pull request #2030 from gradido/link-text-for-emails
Transaction link: copy link, text and more
2022-07-06 11:57:47 +02:00
mahula
9272ca87cd fix unit test 2022-07-06 11:39:59 +02:00
Moriz Wahl
37dad1ca84
Merge branch 'master' into link-text-for-emails 2022-07-06 11:24:20 +02:00
elweyn
18ff51aacf Merge master into this branch. 2022-07-06 10:51:35 +02:00
Hannes Heine
e834d06704
Merge branch 'master' into 2000-contribution-list 2022-07-06 10:48:28 +02:00
Alexander Friedland
4b924be72d
Merge pull request #2025 from gradido/2015-Change-welcome-text
change welcome in community text
2022-07-06 10:36:33 +02:00
Alexander Friedland
3e57cfa033
Merge branch 'master' into 2015-Change-welcome-text 2022-07-06 09:56:18 +02:00
Alexander Friedland
69bb329188
Merge pull request #2024 from gradido/2023-switched-link-color
changed link color in navbar and language switch
2022-07-06 09:55:16 +02:00
Alexander Friedland
e1186100bd
Merge branch 'master' into 2023-switched-link-color 2022-07-06 07:50:50 +02:00
Alexander Friedland
d8fd6cb9b7
Merge branch 'master' into 2015-Change-welcome-text 2022-07-06 07:50:45 +02:00
einhorn_b
6b3813a0c8 add code for moving user creation date if transaction before exist 2022-07-05 17:09:31 +02:00
Moriz Wahl
e4a4744f4e fix unit tests 2022-07-05 13:17:52 +02:00
mahula
a9a518c9bb fix linting errors 2022-07-05 13:17:52 +02:00
mahula
ca8732bd75 Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-05 13:17:52 +02:00
mahula
7d9253e4c7 Update frontend/src/components/TransactionLinks/TransactionLink.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-05 13:17:52 +02:00
mahula
794bcbdfa3 update unit test 2022-07-05 13:17:52 +02:00
mahula
45e7fecd39 fix unit test 2022-07-05 13:17:52 +02:00
mahula
a61df84a39 add unit tests for new feature 2022-07-05 13:17:52 +02:00
mahula
4274974207 reformat string to avoid unwanted indents 2022-07-05 13:17:52 +02:00
ogerly
e8b70608e9 double apostrophe removed, fix yarn lint 2022-07-05 13:17:52 +02:00