8259 Commits

Author SHA1 Message Date
Wolfgang Huß
46fc1e9d63 Merge branch 'master' of github.com:gradido/gradido into add-nvm-config-files 2022-04-28 16:21:55 +02:00
Moriz Wahl
97d974aade
Merge pull request #1852 from gradido/disable-dev-reset
devops: Disable DB Reset on Stage 1
2022-04-28 16:06:12 +02:00
Moriz Wahl
856ee5cc0a
Update deployment/bare_metal/start.sh 2022-04-28 15:58:01 +02:00
Wolfgang Huß
715dfb5675 Revert "Add NVM config files"
This reverts commit e351e82129b0b6abc8ec6e4ff8dbd7086c4bb2c4.
2022-04-28 15:57:13 +02:00
Wolfgang Huß
833c8f64ec Revert "Add NVM config file as well for the main folder"
This reverts commit fe4e87f5760bf2e708008bfffed8c2469df18d86.
2022-04-28 15:57:13 +02:00
Moriz Wahl
2041951e42 devops: Disable DB reset on stage 1 2022-04-28 15:49:08 +02:00
Wolfgang Huß
5496ab5a97 Ignore .nvmrc files in sub directories 2022-04-28 15:42:14 +02:00
Wolfgang Huß
340f2d5090
Merge pull request #1791 from gradido/1685-refactor-notActivated-isDeleted
🍰 Refactor notActivated and isDeleted
2022-04-28 15:30:33 +02:00
Moriz Wahl
ac363347f9
Merge branch 'master' into 1685-refactor-notActivated-isDeleted 2022-04-28 11:28:30 +02:00
Moriz Wahl
0d9c39c4cb
Merge pull request #1849 from gradido/send-email-again-on-stage1
devops: Disable Send Email on Seeding
2022-04-28 11:17:34 +02:00
Wolfgang Huß
778c9568e6 Resolved Ulf's error detection 2022-04-28 10:48:50 +02:00
Wolfgang Huß
fe4e87f576 Add NVM config file as well for the main folder 2022-04-28 08:41:17 +02:00
Moriz Wahl
9ee43d8b3e devops: Disable send email on Seeding 2022-04-27 18:10:49 +02:00
Wolfgang Huß
e351e82129 Add NVM config files 2022-04-27 09:51:53 +02:00
Wolfgang Huß
ee18ae41b9 Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted 2022-04-27 09:24:20 +02:00
Moriz Wahl
387ce34390
Merge pull request #1838 from gradido/fix-confirm-creation
fix: Confirm Creation with Decimal
2022-04-26 15:04:05 +02:00
Moriz Wahl
3c89bd5fbb
Merge branch 'master' into fix-confirm-creation 2022-04-26 14:46:41 +02:00
Moriz Wahl
e5dd373f52 no console 2022-04-26 13:30:21 +02:00
Alexander Friedland
16d292618b
Merge pull request #1841 from gradido/1837-Copying-a-link-not-work-on-mobile-devices
error message by no navigator.clipbord function
2022-04-26 13:29:31 +02:00
Moriz Wahl
ca42bbd478 Merge branch 'fix-confirm-creation' of github.com:gradido/gradido into fix-confirm-creation 2022-04-26 13:29:00 +02:00
Moriz Wahl
b06e3c3c04 proper TS definition 2022-04-26 13:28:36 +02:00
Moriz Wahl
2ca291684c
Delete AdminResolver.test.ts 2022-04-26 13:26:59 +02:00
Moriz Wahl
6810c7b50d remove comment 2022-04-26 13:24:25 +02:00
ogerly
f1e87ff271 remove unused data 2022-04-26 13:17:15 +02:00
Alexander Friedland
b6f855ea75
Update frontend/src/components/ClipboardCopy.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-26 13:12:28 +02:00
Moriz Wahl
8d1ead22eb disable email on stage1 2022-04-26 13:08:19 +02:00
Moriz Wahl
bef2badd89 debug seeed on stage1 2022-04-26 12:58:31 +02:00
Moriz Wahl
e639b73283 debug server 2022-04-26 12:49:28 +02:00
Moriz Wahl
3ff2ee659e debug server 2022-04-26 12:47:40 +02:00
Moriz Wahl
d212ccb4b7 debug server 2022-04-26 12:45:23 +02:00
Moriz Wahl
ae679bcb4c debug server 2022-04-26 12:41:56 +02:00
Alexander Friedland
38fe002f4b
Update frontend/src/components/ClipboardCopy.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-26 12:39:09 +02:00
Alexander Friedland
526b2bbd5c
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-26 12:38:52 +02:00
Alexander Friedland
73b7b5b1a1
Update frontend/src/components/ClipboardCopy.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-26 12:38:29 +02:00
Moriz Wahl
205a1d6fd4 debug server 2022-04-26 12:38:12 +02:00
Alexander Friedland
82f6bf4d9c
Update frontend/src/components/ClipboardCopy.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-26 12:38:01 +02:00
Moriz Wahl
ad68c881ed debug server 2022-04-26 12:36:24 +02:00
Moriz Wahl
f9589fad84 force NODE_ENV=development for seed target 2022-04-26 12:22:40 +02:00
ogerly
3c9a12d293 open modal only for id 2022-04-26 11:05:30 +02:00
Moriz Wahl
6d48b6f4e3 fix: Confirm Creation with Decimal 2022-04-26 09:27:55 +02:00
7f9f564497
Merge pull request #1836 from gradido/v1.8.0
v1.8.0
2022-04-25 17:00:10 +02:00
84d4d41f22
v1.8.0 2022-04-25 16:51:48 +02:00
823a212d94
Merge pull request #1835 from gradido/fix_database_version
Fix: database version requirement for backend corrected
2022-04-25 16:49:30 +02:00
Moriz Wahl
1f19b3e4de
Merge branch 'master' into fix_database_version 2022-04-25 16:40:07 +02:00
Moriz Wahl
85abfafbcf
Merge pull request #1827 from gradido/more-user-resolver-tests
feat: More User Resolver Tests
2022-04-25 16:39:51 +02:00
6aad140247
fix database version requirement for backend 2022-04-25 16:36:33 +02:00
Moriz Wahl
60d7163d78
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:31:26 +02:00
Moriz Wahl
23ed8fe4f7
Merge pull request #1834 from gradido/fix-decay-rounding-with-transaction-links
fix: Round Decay with Tranasction Links
2022-04-25 16:31:13 +02:00
Moriz Wahl
294433ec7e
Merge branch 'master' into more-user-resolver-tests 2022-04-25 16:20:19 +02:00
99f03817bf
Merge branch 'master' into fix-decay-rounding-with-transaction-links 2022-04-25 16:20:13 +02:00