612 Commits

Author SHA1 Message Date
Moriz Wahl
455012147c fix timezone issue 2022-01-20 16:50:13 +01:00
Moriz Wahl
f46fe2d2a0 remove moment from package 2022-01-20 16:14:16 +01:00
Moriz Wahl
105f48084c remove moment 2022-01-20 16:10:07 +01:00
ogerly
fbd0d65b35 add mock in tests 2022-01-20 16:05:16 +01:00
Moriz Wahl
da72a15cf1 remove moment 2022-01-20 15:59:56 +01:00
Moriz Wahl
4142e6df9f add date, pass date to server 2022-01-20 15:57:13 +01:00
Moriz Wahl
f9b5df8720 remove moment. localize datetime 2022-01-20 14:44:40 +01:00
Moriz Wahl
4837aca0bd remove moment, localize datetime 2022-01-20 14:37:49 +01:00
Moriz Wahl
0db297a267 fix test 2022-01-20 14:13:10 +01:00
Moriz Wahl
5e78e4ad07 remove moment. localize date time 2022-01-20 13:42:25 +01:00
Moriz Wahl
af2ea3e809 fix tests 2022-01-20 13:26:31 +01:00
ogerly
a2848fa21c remove in locales formatter for date fields 2022-01-20 13:25:40 +01:00
ogerly
6f082726f8 change fields key data formatter 2022-01-20 13:22:44 +01:00
Moriz Wahl
66a1377db2 fix: Localize Datetime in Admin Interface 2022-01-20 13:21:19 +01:00
ogerly
e1df3718c5 add string GDD on creation amount 2022-01-19 17:46:07 +01:00
Alexander Friedland
b4090f50ef
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-19 15:53:18 +01:00
elweyn
1aeab3244d yarn lint --fix 2022-01-19 15:10:31 +01:00
elweyn
5d4b3825c1 yarn locales fixed 2022-01-19 15:09:04 +01:00
elweyn
a8de79c0c6 yarn test fixed 2022-01-19 15:08:29 +01:00
ogerly
b86431fa40 change field amount an position 2 last date 2022-01-19 14:42:44 +01:00
elweyn
018bfa05d6 defined fields for Transactionlist in UserSearch in Adminarea, add Localized fields and formatted fields 2022-01-19 14:37:49 +01:00
Alexander Friedland
fcc0aca0b2
Merge branch 'master' into 1306-Admin-Logo-font-color 2022-01-19 10:52:42 +01:00
ogerly
f42d2b96e3 change Admin Gradido-Logo font color to white 2022-01-19 08:59:19 +01:00
ogerly
4161a6194a yarn locales fix 2022-01-19 08:50:30 +01:00
ogerly
99696d16f8 rename Wallet to My Account 2022-01-19 08:49:30 +01:00
Moriz Wahl
2e25c280cf Merge branch 'master' into paginate-user-table 2022-01-18 12:54:59 +01:00
Moriz Wahl
ddd9e4ecc0 perPage as data parameter 2022-01-18 12:51:59 +01:00
Moriz Wahl
9b87b26fa2 change text to users 2022-01-18 12:47:00 +01:00
ac4eaeb381
Merge branch 'master' into new_deployment_stage2 2022-01-17 13:45:05 +01:00
90effb41b5
changed syntax again due to shell replacing $variables 2022-01-14 18:49:35 +01:00
Moriz Wahl
0c6d63331f test watchers 2022-01-14 13:39:34 +01:00
Moriz Wahl
d88c16a66c pagination for user list on creation page 2022-01-14 13:32:44 +01:00
Moriz Wahl
5d9cc6ae24 get the tests working again 2022-01-14 13:18:34 +01:00
Moriz Wahl
9244fc4e1a Add pagination buttons to search users 2022-01-14 13:12:49 +01:00
5217b347be
replace all $1 url variables with something meaningfull, since $1 is replaced in scripting 2022-01-14 10:24:47 +01:00
elweyn
bea99f6904 New login page is on localhost/login no vue anymore. 2022-01-14 08:06:50 +01:00
Hannes Heine
b046f94744
Merge branch 'master' into fix-token-logout-redirect-to-wallet-login 2022-01-14 07:47:30 +01:00
94dc5d3962
Merge branch 'master' into new_deployment 2022-01-13 09:14:13 +01:00
Hannes Heine
53470b8cc0
Merge branch 'master' into fix-token-logout-redirect-to-wallet-login 2022-01-13 09:12:41 +01:00
elweyn
9d29c00ebb Remove route from apolloProvider.test and changed the test that checks the redirect on wallet login. 2022-01-13 08:58:26 +01:00
Hannes Heine
4b0fc4a8a2
Merge branch 'master' into 1242-admin-creation-test-remove-space 2022-01-13 08:51:40 +01:00
d387ae9592
corrected two urls 2022-01-12 21:32:47 +01:00
6adb2298c0
admin must be reachable under /admin even locally - till we parameterize this there is no other solution 2022-01-12 21:21:23 +01:00
b6bd3f839d
unified all urls of our services. every server now serves on / and nginxs routes accordingly 2022-01-12 21:21:22 +01:00
acd04b3432
removed /vue from tests, configs and references 2022-01-12 21:21:21 +01:00
elweyn
a3682a424e Fix redirect to /logout, now redirects to the wallet login. 2022-01-12 11:52:30 +01:00
elweyn
06fdbf863e Fix removing from masscreationlist now gives right item to the left list. 2022-01-12 11:36:36 +01:00
elweyn
4c098b0124 Withdrew space at the end of an locale definition. 2022-01-12 10:39:22 +01:00
Hannes Heine
b63674b00b
Merge branch 'master' into 1241-admin-logout-sends-to-wallet-login 2022-01-12 07:52:52 +01:00
Moriz Wahl
e4c8225799 Merge branch 'master' into fix-admin-creation-list 2022-01-11 13:01:30 +01:00