10976 Commits

Author SHA1 Message Date
elweyn
b4a4a9e126 Throw error if confirmedAt is present. 2022-07-19 13:09:03 +02:00
mahula
fda966d273 update cypress dockerfile 2022-07-19 13:05:07 +02:00
Moriz Wahl
515da85626
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-19 12:40:18 +02:00
Moriz Wahl
d7a907b41e
Merge branch 'master' into 2049-remove-image-entries-in-docker-compose-files 2022-07-19 12:37:54 +02:00
Hannes Heine
d5a2c24d7e
Merge branch 'master' into 2000-contribution-delete 2022-07-19 12:25:12 +02:00
elweyn
93e0451124 Fix linting. 2022-07-19 12:24:42 +02:00
elweyn
97a83e633a Add block to send the email to the sender of a transactionLink after the receiver redeemed it. 2022-07-19 12:11:57 +02:00
elweyn
c1ec142121 Add method to send email to sender of a transactionLink after the receiver redeemed it. 2022-07-19 12:10:59 +02:00
elweyn
d23a060aba Add text to send to the sender of a transaction link after the receiver redeem it. 2022-07-19 12:10:09 +02:00
Moriz Wahl
c9098fa2cf fix: Add Contributions to User 2022-07-19 11:47:03 +02:00
mahula
5ab925d823 update both README file regarding using the hosts network for local testing 2022-07-19 11:03:25 +02:00
mahula
5baf558e77 update README regarding yarn usage 2022-07-19 08:35:48 +02:00
Claus-Peter Hübner
7d0a0af68e Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema 2022-07-19 02:53:22 +02:00
Claus-Peter Hübner
f125f967f2 delete columns passphraseEncryptType and emailHash 2022-07-19 02:52:54 +02:00
Claus-Peter Hübner
126495676f upgrade DB_VERSION to 0044 2022-07-19 02:51:37 +02:00
clauspeterhuebner
c02e12fa96
Update database/migrations/0044-adapt_users_table_for_gradidoid.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-19 02:47:36 +02:00
clauspeterhuebner
3a9186d192
Update database/migrations/0044-adapt_users_table_for_gradidoid.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-19 02:47:17 +02:00
clauspeterhuebner
950241a2f0
Update database/entity/0044-adapt_users_table_for_gradidoid/UserContact.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-19 02:46:06 +02:00
clauspeterhuebner
5d15ea7d7a
Update database/entity/0044-adapt_users_table_for_gradidoid/User.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-19 02:45:01 +02:00
Hannes Heine
298f76de0f
Merge pull request #2061 from gradido/add_count_to_list_contributions
Fix: Add count to list contributions
2022-07-19 01:59:49 +02:00
Claus-Peter Hübner
7f1ac41b33 Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
2022-07-19 01:55:46 +02:00
Hannes Heine
ab6db2e0a6
Merge branch 'master' into add_count_to_list_contributions 2022-07-19 01:50:39 +02:00
Moriz Wahl
b35b3e5965
Merge pull request #2022 from gradido/docu-env-vars
docu: Explain how `.env` Files are Working
2022-07-19 00:55:54 +02:00
Moriz Wahl
f2e34938c5 Merge branch 'docu-env-vars' of github.com:gradido/gradido into docu-env-vars 2022-07-19 00:23:04 +02:00
Moriz Wahl
b31309f7ef remove file artifact 2022-07-19 00:22:47 +02:00
Moriz Wahl
19dda11857
Merge branch 'master' into docu-env-vars 2022-07-19 00:20:21 +02:00
clauspeterhuebner
0188fc7213
Merge pull request #1997 from gradido/1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol
[WIP] 1794 feature event protocol 1 implement the basics of the business event protocol
2022-07-19 00:19:46 +02:00
Claus-Peter Hübner
86487a2ddb change to Unix LF 2022-07-18 23:55:13 +02:00
Claus-Peter Hübner
e9b8691b38 turned around the logic 2022-07-18 23:53:59 +02:00
Moriz Wahl
22a8f0a280
Merge branch 'master' into docu-env-vars 2022-07-18 23:47:42 +02:00
Moriz Wahl
1691167582 explain nginx ports with docker 2022-07-18 23:47:24 +02:00
mahula
196e0e661d refactor Dockerfile to avoid hardcoded versioning of Playwright 2022-07-18 22:50:58 +02:00
mahula
a04610153b set Playwright test to utilize webkit 2022-07-18 22:28:31 +02:00
mahula
e8bcda810a fix selection if identifiers for login POM in Playwright tests 2022-07-18 22:26:47 +02:00
clauspeterhuebner
5a77247c79
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-18 19:31:47 +02:00
clauspeterhuebner
3e617fdf95
Update deployment/bare_metal/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:31:24 +02:00
clauspeterhuebner
d4f32f42e0
Update backend/.env.template
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:30:56 +02:00
clauspeterhuebner
212952cf56
Update backend/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:30:25 +02:00
ogerly
f3390b7de1 add updateContribution updateContributionForm 2022-07-18 18:10:29 +02:00
ogerly
95b8e9e55a check disable button and amount info text 2022-07-18 18:10:29 +02:00
ogerly
70a8f9b0ca change query to get contributionCount and contributionList 2022-07-18 18:10:29 +02:00
elweyn
9385648285 Remove unused import. 2022-07-18 18:10:29 +02:00
elweyn
a25d9f7399 Change query fields to new names. 2022-07-18 18:10:29 +02:00
elweyn
7d5555c7e4 Change query listAllContributions now gets contributionCount and contributionList instead of linkCount and linkList. 2022-07-18 18:10:29 +02:00
elweyn
b384782e63 Change query of listContribution to get contributionCount and contributionList instead of link... 2022-07-18 18:10:29 +02:00
elweyn
f1238957f9 Change linkCount to contributionCount and linkList to contributionList. 2022-07-18 18:10:29 +02:00
elweyn
951d7f2f88 Change the listContribution query to give back ContributionListResult object with linkCount. 2022-07-18 18:10:29 +02:00
Hannes Heine
15051a61e1
Merge branch 'master' into add_count_to_list_contributions 2022-07-18 14:32:05 +02:00
elweyn
55d81d2feb Merge branch '2000-contribution-delete' of https://github.com/gradido/gradido into 2000-contribution-delete 2022-07-18 13:08:39 +02:00
elweyn
e84061c412 Added tests for deleteContribution 2022-07-18 13:08:27 +02:00