Alexander Friedland
|
09c75bc204
|
Merge branch 'master' into 2592-Gradido-Logo-blurred
|
2023-02-16 14:30:49 +01:00 |
|
Alexander Friedland
|
0b6f7743a9
|
Merge pull request #2623 from gradido/2594-contributions-list-frontend
refactor(admin): add tabs for all statusus on contributions
|
2023-02-16 14:07:07 +01:00 |
|
Moriz Wahl
|
1933bca019
|
Merge branch 'master' into 2594-contributions-list-frontend
|
2023-02-16 13:50:47 +01:00 |
|
clauspeterhuebner
|
3b41ec27b6
|
Merge pull request #2511 from gradido/2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
feat(federation): implement a graphql client to request getpublickey
|
2023-02-16 13:48:03 +01:00 |
|
Alexander Friedland
|
1cf217b1f0
|
Merge branch 'master' into 2594-contributions-list-frontend
|
2023-02-15 14:55:28 +01:00 |
|
Alexander Friedland
|
ebbb86d054
|
Update admin/src/locales/en.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-02-15 14:54:45 +01:00 |
|
Alexander Friedland
|
fdee876ffb
|
Update admin/src/pages/Overview.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-02-15 14:52:34 +01:00 |
|
Alexander Friedland
|
ead181eec7
|
Update admin/src/pages/CreationConfirm.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-02-15 14:52:21 +01:00 |
|
Alexander Friedland
|
580f57f99d
|
Update admin/src/pages/Overview.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-02-15 14:51:37 +01:00 |
|
clauspeterhuebner
|
a8176a3b4a
|
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-15 00:02:25 +01:00 |
|
Alexander Friedland
|
b3b84fca36
|
Merge pull request #2643 from gradido/2598-Register-Login-buttons-not-full-size
refactor(frontend): style refactor mobil auth area
|
2023-02-15 00:01:57 +01:00 |
|
Claus-Peter Hübner
|
ef2f8da826
|
linting
|
2023-02-14 22:00:12 +01:00 |
|
Alexander Friedland
|
a7b6e3c384
|
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size
|
2023-02-14 21:39:13 +01:00 |
|
clauspeterhuebner
|
270a73689d
|
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-14 21:24:03 +01:00 |
|
clauspeterhuebner
|
14ec20d172
|
Update dht-node/.env.template
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-02-14 21:23:41 +01:00 |
|
|
|
0d5370948f
|
Merge pull request #2676 from gradido/logger_transactionResolver
refactor(backend): use LogError on TransactionResolver
|
2023-02-14 20:12:10 +01:00 |
|
Moriz Wahl
|
7c2bf9da7a
|
Merge branch 'master' into 2594-contributions-list-frontend
|
2023-02-14 17:59:34 +01:00 |
|
clauspeterhuebner
|
92543a420d
|
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-14 17:36:28 +01:00 |
|
Moriz Wahl
|
0b60759c69
|
remove warnings from test
|
2023-02-14 17:26:21 +01:00 |
|
Moriz Wahl
|
3e894d36bd
|
fix linting, raise coverage
|
2023-02-14 17:17:17 +01:00 |
|
|
|
4864ad6276
|
Merge branch 'master' into logger_transactionResolver
|
2023-02-14 17:11:48 +01:00 |
|
|
|
db236b1d34
|
Merge pull request #2691 from gradido/event_protocol_rework
refactor(backend): event protocol rework
|
2023-02-14 17:11:34 +01:00 |
|
clauspeterhuebner
|
cf0f4cd241
|
Merge branch 'master' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-14 17:11:24 +01:00 |
|
Moriz Wahl
|
f8fca7ab0c
|
move deny contribution to left
|
2023-02-14 17:08:12 +01:00 |
|
Moriz Wahl
|
ddbdbe4224
|
Merge branch 'master' into 2594-contributions-list-frontend
|
2023-02-14 17:05:11 +01:00 |
|
|
|
70c6d3b026
|
Merge branch 'master' into event_protocol_rework
|
2023-02-14 16:20:36 +01:00 |
|
|
|
18242ccfea
|
Merge branch 'master' into logger_transactionResolver
|
2023-02-14 16:18:29 +01:00 |
|
|
|
5f41286d56
|
Merge pull request #2673 from gradido/logger_transactionLinkResolver
refactor(backend): use LogError on TransactionLinkResolver
|
2023-02-14 16:18:10 +01:00 |
|
|
|
ef1c436132
|
Merge branch 'master' into logger_transactionLinkResolver
|
2023-02-14 16:05:41 +01:00 |
|
Moriz Wahl
|
5713e703b3
|
improve unit tests contribution link
|
2023-02-14 16:04:06 +01:00 |
|
Alexander Friedland
|
0af478071c
|
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size
|
2023-02-14 16:02:53 +01:00 |
|
Alexander Friedland
|
fb5c0d1cd9
|
Merge pull request #2647 from gradido/2590-To-long-text-has-submit-button-still-enabled
fix(frontend): simple disabled function on submit send
|
2023-02-14 16:02:42 +01:00 |
|
|
|
d85c34a76e
|
Merge branch 'master' into logger_transactionLinkResolver
|
2023-02-14 15:53:07 +01:00 |
|
|
|
d0ff8ffb2c
|
diferentiate between saving and not saving event
|
2023-02-14 15:50:25 +01:00 |
|
|
|
9101c3f74d
|
save moderator & user_id for EVENT_ADMIN_CONTRIBUTION_DENY
|
2023-02-14 15:39:41 +01:00 |
|
Alexander Friedland
|
5cf445d16b
|
Merge branch 'master' into 2590-To-long-text-has-submit-button-still-enabled
|
2023-02-14 15:26:19 +01:00 |
|
Alexander Friedland
|
330657fcad
|
Merge pull request #2660 from gradido/2589-Missing-Message-on-old-Transactions
refactor(frontend): missing message on old transactions
|
2023-02-14 15:26:07 +01:00 |
|
Alexander Friedland
|
49f123fa6b
|
Merge branch 'master' into 2589-Missing-Message-on-old-Transactions
|
2023-02-14 14:21:54 +01:00 |
|
Alexander Friedland
|
442ba8be69
|
Merge pull request #2661 from gradido/2655-Remove-Overview-Menu-entry
refactor(admin): remove overview and multi creation menu entry
|
2023-02-14 13:39:11 +01:00 |
|
mahula
|
f584ad4e52
|
Merge branch 'master' into 2655-Remove-Overview-Menu-entry
|
2023-02-14 10:32:59 +01:00 |
|
mahula
|
29f26502a6
|
Merge pull request #2693 from gradido/2366-devopsbackend-have-yarn-locales-fix-in-the-backend
feat(other): add locales check to backend and integrate it to test workflow
|
2023-02-14 08:10:58 +01:00 |
|
Hannes Heine
|
cffced76ab
|
Merge branch 'master' into 2598-Register-Login-buttons-not-full-size
|
2023-02-14 07:58:01 +01:00 |
|
Hannes Heine
|
bb926b2454
|
Merge branch 'master' into 2366-devopsbackend-have-yarn-locales-fix-in-the-backend
|
2023-02-14 07:57:26 +01:00 |
|
|
|
2a1cb037c7
|
log moderator who denies contribution instead of user
|
2023-02-14 01:47:07 +01:00 |
|
Claus-Peter Hübner
|
f3a72b2545
|
add TODO comment for reminding event-based communication
|
2023-02-13 22:27:40 +01:00 |
|
Claus-Peter Hübner
|
70276800e6
|
rework PR-comments
|
2023-02-13 22:19:52 +01:00 |
|
Claus-Peter Hübner
|
e3284f4659
|
Merge remote-tracking branch 'origin/2650-feature-federation-harmonize-and-sync-modules-of-federation' into 2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-13 21:13:44 +01:00 |
|
Claus-Peter Hübner
|
a10de9b55a
|
Merge remote-tracking branch 'origin/master' into
2501-feature-federation-implement-a-graphql-client-to-request-getpublickey
|
2023-02-13 21:12:41 +01:00 |
|
Claus-Peter Hübner
|
0bd43b2e39
|
remove commented code
|
2023-02-13 20:56:17 +01:00 |
|
Claus-Peter Hübner
|
b0cd39c53a
|
Merge remote-tracking branch 'origin/master' into 2650-feature-federation-harmonize-and-sync-modules-of-federation
|
2023-02-13 20:54:17 +01:00 |
|
