3778 Commits

Author SHA1 Message Date
elweyn
9438cefb04 Fix small merge error, and verifyLogin query. 2023-01-17 15:24:41 +01:00
Hannes Heine
bba5d4a193
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-17 13:25:12 +01:00
Hannes Heine
149eddfb91
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-17 12:31:12 +01:00
ogerly
5dec52f508 add icon for deleted in crontibution list 2023-01-17 11:58:26 +01:00
Alexander Friedland
c623ff1294
Update frontend/src/components/Inputs/InputHour.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:42:08 +01:00
Alexander Friedland
81fee35064
Update frontend/src/components/Inputs/InputHour.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:41:58 +01:00
Alexander Friedland
7bcb3c915e
Update frontend/src/components/Inputs/InputHour.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:41:46 +01:00
ogerly
e062fc6288 fix lint 2023-01-17 11:33:53 +01:00
ogerly
4f0a78022a fix tests 2023-01-17 11:10:06 +01:00
ogerly
07dc5cf5d4 test first example 2023-01-17 10:56:17 +01:00
ogerly
f4729e4984 navbar name add router link 2023-01-17 09:48:08 +01:00
ogerly
3c86d523a8 mobil navbar set sheet image 2023-01-17 08:37:02 +01:00
ogerly
5203644283 mobil navbar fix and transparent 2023-01-17 07:36:34 +01:00
ogerly
8c033842fb placeholder in InputHoures.vue 2023-01-16 20:08:49 +01:00
ogerly
01093d026f current date custom in datepicker 2023-01-16 19:39:22 +01:00
ogerly
f3ae7a02e9 mobil navbar avatar and name displayed 2023-01-16 19:17:09 +01:00
ogerly
c0a889a5b3 fix stylelint and locales 2023-01-16 15:43:30 +01:00
ogerly
5c5ecc84e3 fix lint 2023-01-16 15:42:46 +01:00
Alexander Friedland
60ca3485c3
Merge branch 'master' into mobil-menu-transparent-bg-color 2023-01-16 15:37:28 +01:00
ogerly
067ed3652b settings header data style 2023-01-16 15:34:29 +01:00
ogerly
51d20d4d5b mobil navbar toggler no border 2023-01-16 15:03:09 +01:00
ogerly
fae97dd786 mobile starttext change style 2023-01-16 14:54:35 +01:00
ogerly
41f7dfe56f remove last month label, matching stands and button size 2023-01-16 14:24:02 +01:00
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
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
elweyn
0d268ae96f Change tests to the new reject layout. 2023-01-16 09:47:08 +01:00
Hannes Heine
8a27960aba
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-14 07:46:38 +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
Moriz Wahl
031da1b028 more compact right side 2023-01-13 15:24:54 +01:00
Moriz Wahl
0d59f83bb8
Merge branch 'master' into computed-hours-for-open-creations 2023-01-13 14:54:49 +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
elweyn
51abaf8a22 Last changes to make it work. 2023-01-13 13:20:00 +01:00
elweyn
df4e2b419a Merge master in here. 2023-01-13 11:24:11 +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
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
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
ogerly
1f23afc147 initials without space 2023-01-12 19:49:51 +01:00
Moriz Wahl
f5fe88cffc setup slots for content header and right side 2023-01-12 15:41:41 +01:00
Moriz Wahl
f66fb5b597 add unit test for open creations amount component 2023-01-12 14:46:08 +01:00
Moriz Wahl
862a6c4b10 fix(frontend): computed hours for open contribution amounts 2023-01-12 14:09:17 +01:00
Moriz Wahl
5a763f030a
Merge branch 'master' into open-creations-call 2023-01-12 13:41:21 +01:00
Alexander Friedland
d72c54c7e1
Merge branch 'master' into 2535-editing-transaction-does-not-work 2023-01-12 13:36:50 +01:00
Alexander Friedland
0acca718f3
Merge branch 'master' into 2516-Creation-menu-is-not-highlighted-on-all-submenus 2023-01-12 13:36:27 +01:00
ogerly
035d588c5a fix test 2023-01-12 13:35:48 +01:00
Moriz Wahl
78a219afea get send page test working again 2023-01-12 13:23:45 +01:00