Claus-Peter Hübner
|
7ef6a45f20
|
Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-07-21 23:59:19 +02:00 |
|
Claus-Peter Hübner
|
86a0ab731f
|
adapt UserResolver and Test to database changes
|
2022-07-21 23:18:31 +02:00 |
|
Claus-Peter Hübner
|
26985ef49c
|
switch DB_VERSION to 0044
|
2022-07-21 23:17:05 +02:00 |
|
Claus-Peter Hübner
|
cb4ee4590a
|
adapt User and UserContact entity
|
2022-07-21 23:16:19 +02:00 |
|
Claus-Peter Hübner
|
cca6226b55
|
new table user_contacts and change table users
|
2022-07-21 23:15:29 +02:00 |
|
Wolfgang Huß
|
4e5b100b44
|
Merge pull request #2050 from gradido/2049-remove-image-entries-in-docker-compose-files
chore: 🍰 Change `image` Entries In Docker Compose Files And Get Apple M1 Running
|
2022-07-21 11:47:56 +02:00 |
|
Wolfgang Huß
|
3e259b049a
|
Merge branch 'master' into 2049-remove-image-entries-in-docker-compose-files
|
2022-07-21 11:35:10 +02:00 |
|
Moriz Wahl
|
47fb530725
|
Merge pull request #2064 from gradido/fix-windows-line-breaks
fix: Windows 0D 0A Linebreaks to Unix 0A
|
2022-07-21 09:11:21 +02:00 |
|
clauspeterhuebner
|
7f6eb1cb47
|
Merge branch 'master' into fix-windows-line-breaks
|
2022-07-20 23:05:48 +02:00 |
|
Hannes Heine
|
5ce94282b3
|
Merge pull request #2066 from gradido/2065-add-contribution-date-to-list-queries
Add contributionDate to the Contribution object.
|
2022-07-20 12:08:28 +02:00 |
|
elweyn
|
c8267cf774
|
Add contributionDate to the Contribution object.
|
2022-07-20 10:42:24 +02:00 |
|
Claus-Peter Hübner
|
ab765e7a8f
|
shift User from migration 0044 to 0039
|
2022-07-19 23:51:38 +02:00 |
|
Claus-Peter Hübner
|
0e2bb87437
|
return migration back to 0039
|
2022-07-19 23:36:59 +02:00 |
|
Claus-Peter Hübner
|
1ef7d8f1b9
|
Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-07-19 23:10:18 +02:00 |
|
clauspeterhuebner
|
5e0eea4cfe
|
Merge pull request #2062 from gradido/add-contributions-relation-to-user
fix: Add Contributions to User
|
2022-07-19 23:09:39 +02:00 |
|
clauspeterhuebner
|
8d30c56213
|
Merge branch 'master' into add-contributions-relation-to-user
|
2022-07-19 23:01:25 +02:00 |
|
Claus-Peter Hübner
|
4951a684c6
|
Merge remote-tracking branch 'origin/master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-07-19 21:11:28 +02:00 |
|
Moriz Wahl
|
1e5738f0aa
|
fix: Windows 0D 0A Linebreaks to Unix 0A
|
2022-07-19 15:11:27 +02:00 |
|
Hannes Heine
|
9cd0d012c5
|
Merge pull request #2035 from gradido/2000-contribution-delete
Feat: ContributionResolver - delete mutation
|
2022-07-19 14:01:57 +02:00 |
|
elweyn
|
ccc16b4083
|
Test that an already confirmed contribution can not be deleted.
|
2022-07-19 13:09:44 +02:00 |
|
elweyn
|
b4a4a9e126
|
Throw error if confirmedAt is present.
|
2022-07-19 13:09:03 +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 |
|
Moriz Wahl
|
c9098fa2cf
|
fix: Add Contributions to User
|
2022-07-19 11:47:03 +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 |
|
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 |
|
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 |
|