Alexander Friedland
|
08319b0631
|
Merge branch 'master' into 2560-style-and-design-send-link
|
2023-01-19 11:29:24 +01:00 |
|
elweyn
|
d8645969d3
|
remove mx for small device, change email align & change col size.
|
2023-01-19 11:28:24 +01:00 |
|
Alexander Friedland
|
38a93d0ad7
|
Merge pull request #2576 from gradido/2574-mobile-device-login-refactor
refactor(frontend): tyle mobile device auth template
|
2023-01-19 11:25:48 +01:00 |
|
ogerly
|
79d9af6ec4
|
test open in TransactionLinkSummary.spec.js
|
2023-01-19 10:14:45 +01:00 |
|
elweyn
|
dcbc137441
|
Update yarn.lock file of admin.
|
2023-01-19 09:19:29 +01:00 |
|
ogerly
|
ad8e8b8609
|
fix test
|
2023-01-19 09:13:39 +01:00 |
|
ogerly
|
f7b74d8e63
|
refctor link result
|
2023-01-19 07:57:11 +01:00 |
|
Hannes Heine
|
c84fa68132
|
Merge branch 'master' into 2332-mark-contribution-as-rejected
|
2023-01-19 07:50:22 +01:00 |
|
Alexander Friedland
|
96c2e84192
|
Merge branch 'master' into 2574-mobile-device-login-refactor
|
2023-01-19 07:04:56 +01:00 |
|
clauspeterhuebner
|
0b27d09cdd
|
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
|
2023-01-18 22:20:23 +01:00 |
|
ogerly
|
b938586353
|
style refactor mobile device auth template
|
2023-01-18 16:07:36 +01:00 |
|
|
|
75b435456e
|
Merge pull request #2575 from gradido/v1.17.0
chore(release): v1.17.0
|
2023-01-18 16:06:24 +01:00 |
|
|
|
a3dc4c168b
|
v1.17.0
|
2023-01-18 15:54:57 +01:00 |
|
Moriz Wahl
|
6ad7ca114b
|
Merge pull request #2573 from gradido/fix-submit-contribution-locale
fix(frontend): submit contribution text
|
2023-01-18 15:50:03 +01:00 |
|
|
|
53ced0d406
|
Merge branch 'master' into fix-submit-contribution-locale
|
2023-01-18 15:34:52 +01:00 |
|
Moriz Wahl
|
2de03060b6
|
Merge pull request #2571 from gradido/fix-admin-cannot-delete-confirmed-contribution
fix(backend): admin cannot delete confirmed contribution
|
2023-01-18 15:34:45 +01:00 |
|
Moriz Wahl
|
443da2b863
|
fix(frontend): submit contribution text
|
2023-01-18 15:24:26 +01:00 |
|
|
|
8f087bfec5
|
Merge branch 'master' into fix-admin-cannot-delete-confirmed-contribution
|
2023-01-18 15:23:07 +01:00 |
|
|
|
2ae0925aa1
|
Merge pull request #2572 from gradido/fix_english_locales
fix(frontend): english locales - horas -> hours
|
2023-01-18 15:22:56 +01:00 |
|
Moriz Wahl
|
3a298b4edf
|
Merge branch 'master' into fix-admin-cannot-delete-confirmed-contribution
|
2023-01-18 15:09:28 +01:00 |
|
clauspeterhuebner
|
f0f0937609
|
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
|
2023-01-18 15:09:01 +01:00 |
|
|
|
6d3cb57caf
|
fix horas
|
2023-01-18 15:07:58 +01:00 |
|
Moriz Wahl
|
52f9da5c0d
|
fix(backend): admin cannot delete confirmed contribution
|
2023-01-18 15:06:18 +01:00 |
|
Alexander Friedland
|
f38c3a187e
|
Merge pull request #2570 from gradido/2567-contibution-calendar-disappears-behind
fix(frontend): mobil divices datepicker add props dropleft
|
2023-01-18 14:35:17 +01:00 |
|
Alexander Friedland
|
9948340d74
|
Merge branch 'master' into 2567-contibution-calendar-disappears-behind
|
2023-01-18 14:23:51 +01:00 |
|
ogerly
|
b0c339aeca
|
b-form-datepicker add props dropleft for dropdown menu
|
2023-01-18 14:10:47 +01:00 |
|
Hannes Heine
|
cc053b6ddc
|
Merge pull request #2569 from gradido/fix-pagination-frontend
fix(frontend): pagination
|
2023-01-18 14:07:57 +01:00 |
|
Moriz Wahl
|
173265d1f9
|
Merge branch 'master' into fix-pagination-frontend
|
2023-01-18 13:53:48 +01:00 |
|
Hannes Heine
|
f03150d315
|
Merge pull request #2568 from gradido/fix-gdt-transaction-list-load
fix(frontend): add a watch on gdt prop to assure propper loading when mounted
|
2023-01-18 13:53:14 +01:00 |
|
Hannes Heine
|
7d949a5b37
|
Update frontend/src/pages/Transactions.vue
|
2023-01-18 13:26:52 +01:00 |
|
elweyn
|
3247c1c9f5
|
Fix on 25 transactions
|
2023-01-18 13:12:43 +01:00 |
|
elweyn
|
02e1b33839
|
Pagination for Gdt and Gdd was not working correctly.
|
2023-01-18 12:59:28 +01:00 |
|
elweyn
|
357033657e
|
Merge branch 'master' into fix-gdt-transaction-list-load
|
2023-01-18 12:49:38 +01:00 |
|
elweyn
|
1a0dfa0e45
|
Add a watch on gdt prop and when changed to true loads the gdt datas.
|
2023-01-18 12:18:30 +01:00 |
|
Alexander Friedland
|
9e37cd827e
|
Merge pull request #2566 from gradido/2565-scoop-step-in-quarter-hour-set
refactor(frontend): creation step in quarter hour set
|
2023-01-18 11:39:29 +01:00 |
|
ogerly
|
518867cb05
|
scoop step in quarter hour set
|
2023-01-18 11:26:10 +01:00 |
|
Alexander Friedland
|
1c12cf45bb
|
Merge pull request #2561 from gradido/fix-tunneled-email-on-right-side
fix(frontend): tunneled email on right side last transactions
|
2023-01-18 09:16:05 +01:00 |
|
Moriz Wahl
|
66edfaf0c8
|
fix(frontend): tunneled email on right side last transactions
|
2023-01-17 18:09:32 +01:00 |
|
clauspeterhuebner
|
66b5638f41
|
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints
|
2023-01-17 17:19:25 +01:00 |
|
Moriz Wahl
|
7fc7d9a36b
|
Merge pull request #2555 from gradido/test-transaction-page
feat(frontend): test transaction page
|
2023-01-17 17:16:50 +01:00 |
|
Moriz Wahl
|
610fbcc8fb
|
Merge branch 'master' into test-transaction-page
|
2023-01-17 17:05:21 +01:00 |
|
Moriz Wahl
|
fe9c5edf3f
|
Merge pull request #2553 from gradido/statistics-with-field-resolvers
refactor(backend): statistics with field resolvers
|
2023-01-17 17:04:48 +01:00 |
|
Moriz Wahl
|
d3a78e4369
|
Merge branch 'master' into statistics-with-field-resolvers
|
2023-01-17 16:52:59 +01:00 |
|
Alexander Friedland
|
79faae526c
|
Merge pull request #2550 from gradido/2547-normalized-amount-transaction-is-processed-again
fix(frontend): normalized amount transaction if processed again
|
2023-01-17 16:20:56 +01:00 |
|
elweyn
|
c73135e522
|
Change deny to reject.
|
2023-01-17 16:11:14 +01:00 |
|
|
|
73c94f1aa3
|
Merge branch 'master' into test-transaction-page
|
2023-01-17 16:03:54 +01:00 |
|
elweyn
|
d3549ef144
|
Coverage of admin 96%.
|
2023-01-17 16:01:30 +01:00 |
|
Alexander Friedland
|
aadd2149aa
|
Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again
|
2023-01-17 16:00:16 +01:00 |
|
ogerly
|
35997f5499
|
remove unused code
|
2023-01-17 15:59:46 +01:00 |
|
|
|
443a2747e6
|
Merge pull request #2551 from gradido/fix-semaphore-deadlock-on-error
fix(backend): semaphore deadlock
|
2023-01-17 15:55:54 +01:00 |
|
