ogerly
8514e9af9d
mobil navbar avatar over sheet image
2023-01-16 13:45:24 +01:00
ogerly
0d93e55635
mobile menu has transparent background color
2023-01-16 13:00:36 +01:00
Moriz Wahl
becaa750e8
Merge pull request #2548 from gradido/slots-for-right-sidebar
...
refactor(frontend): slots for right sidebar and header
2023-01-16 12:45:00 +01:00
Moriz Wahl
d95dc27e17
Merge branch 'master' into slots-for-right-sidebar
2023-01-16 11:38:04 +01:00
Moriz Wahl
82a6c61633
mock replace in route.path, stub last transactions
2023-01-16 11:37:13 +01:00
466e59a550
typo
2023-01-16 11:27:30 +01:00
c3f7f15420
refactor all semaphore-locks
2023-01-16 11:21:38 +01:00
fd2563f171
Merge branch 'master' into fix-semaphore-deadlock-on-error
2023-01-16 11:16:45 +01:00
dab7fe584a
try catch around semaphore lock
2023-01-16 11:04:14 +01:00
ogerly
d9f8f8cb07
normalized-amount-transaction-if-processed again
2023-01-16 10:19:10 +01:00
elweyn
0d268ae96f
Change tests to the new reject layout.
2023-01-16 09:47:08 +01:00
ogerly
36c54f7211
change emit to methods
2023-01-16 09:26:13 +01:00
mahula
9737905dbd
adapt admin are overlay for open contributions page
...
- use slots
- refactor for reusability for main 3 admin actions confirm/delete/reject
2023-01-15 13:17:14 +01:00
mahula
97a4e337a9
adapt locales to admin functionality of confirmation, deletion, and rejection
2023-01-15 12:27:54 +01:00
Hannes Heine
8a27960aba
Merge branch 'master' into 2332-mark-contribution-as-rejected
2023-01-14 07:46:38 +01:00
clauspeterhuebner
be01529b75
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2023-01-13 19:13:30 +01:00
Alexander Friedland
baeedf80a6
Merge pull request #2527 from gradido/2516-Creation-menu-is-not-highlighted-on-all-submenus
...
fix(frontend): creation menu highlighted on all submenus
2023-01-13 16:54:34 +01:00
Alexander Friedland
bec3184bac
Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus
2023-01-13 16:34:30 +01:00
clauspeterhuebner
f5ba8af177
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2023-01-13 15:38:44 +01:00
Moriz Wahl
031da1b028
more compact right side
2023-01-13 15:24:54 +01:00
Moriz Wahl
0c330854df
Merge pull request #2545 from gradido/computed-hours-for-open-creations
...
refactor(frontend): computed hours for open creations
2023-01-13 15:07:38 +01:00
Moriz Wahl
0d59f83bb8
Merge branch 'master' into computed-hours-for-open-creations
2023-01-13 14:54:49 +01:00
mahula
a3f83b9822
Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus
2023-01-13 14:23:40 +01:00
clauspeterhuebner
db6d18da1f
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2023-01-13 14:21:20 +01:00
clauspeterhuebner
2c366aa67d
Merge pull request #2532 from gradido/1489-feature-backup-cron
...
feat(other): add description for daily backup cronjob
2023-01-13 14:20:20 +01:00
Alexander Friedland
270d837ba2
Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus
2023-01-13 14:17:35 +01:00
clauspeterhuebner
d7d4eae8d4
Merge branch 'master' into 1489-feature-backup-cron
2023-01-13 14:07:09 +01:00
Alexander Friedland
20c3851308
Merge pull request #2543 from gradido/2535-editing-transaction-does-not-work
...
fix(frontend): editing transaction does not work
2023-01-13 14:03:24 +01:00
elweyn
51abaf8a22
Last changes to make it work.
2023-01-13 13:20:00 +01:00
elweyn
7a7246cde5
Add error for already confirmed contribution.
2023-01-13 11:37:48 +01:00
elweyn
9d8c026617
Move contribution, user and moderator search in the first try block to lock the database.
2023-01-13 11:35:33 +01:00
elweyn
df4e2b419a
Merge master in here.
2023-01-13 11:24:11 +01:00
elweyn
605812d777
Add error to confirmContribution mutation in case where contributionState is 'DENIED'
2023-01-13 11:15:14 +01:00
elweyn
2e9f8caa9d
Add denied symbols in the frontend.
2023-01-13 11:08:18 +01:00
elweyn
70017c3115
Add state & messagesCount to the query listAllContributions.
2023-01-13 11:07:26 +01:00
elweyn
79220ced79
Add deleted Contribution to the Contribution list in the admin interface.
2023-01-13 11:05:56 +01:00
Hannes Heine
49f69816de
Merge branch 'master' into 2535-editing-transaction-does-not-work
2023-01-13 10:38:32 +01:00
Hannes Heine
d64a385ff8
Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus
2023-01-13 10:34:04 +01:00
mahula
76136c9569
Merge pull request #2541 from gradido/open-creations-call
...
refactor(frontend): remove open creations from store
2023-01-13 10:27:53 +01:00
mahula
18a2b7b6f9
Merge branch 'master' into open-creations-call
2023-01-13 10:13:32 +01:00
Alexander Friedland
b16a599209
Merge branch 'master' into 2535-editing-transaction-does-not-work
2023-01-13 08:50:39 +01:00
Claus-Peter Hübner
29109fc4c8
Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2023-01-13 00:24:50 +01:00
Claus-Peter Hübner
de3fdd7c62
Merge branch
...
'2428-feature-federation-implement-multiple-apollo-graphql-endpoints' of
github.com:gradido/gradido into
2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2023-01-13 00:24:08 +01:00
51991024ae
Merge pull request #2524 from gradido/vscode-extensions
...
feat(other): vscode extensions
2023-01-12 22:40:11 +01:00
852d9746dd
Merge branch 'master' into vscode-extensions
2023-01-12 22:24:20 +01:00
f05176becb
Merge pull request #2533 from gradido/remove-jest-from-dependencies
...
fix(backend): remove jest from dependecies
2023-01-12 22:24:04 +01:00
b5b4799d5b
Merge branch 'master' into remove-jest-from-dependencies
2023-01-12 22:08:55 +01:00
mahula
102f2fc919
Merge pull request #2546 from gradido/initials-without-space
...
fix(frontend): initials without space
2023-01-12 21:10:29 +01:00
mahula
0c65d8c4ab
Merge branch 'master' into open-creations-call
2023-01-12 20:58:15 +01:00
ogerly
1f23afc147
initials without space
2023-01-12 19:49:51 +01:00
