elweyn
|
d502b3d052
|
yarn lint --fix.
|
2022-02-07 13:05:06 +01:00 |
|
Hannes Heine
|
d332c07643
|
Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area
|
2022-02-07 12:57:27 +01:00 |
|
|
|
c0ac84b975
|
Merge pull request #1431 from gradido/remove_gradido_node
remove_gradido_node
|
2022-02-07 12:50:31 +01:00 |
|
|
|
347db4d62d
|
Merge branch 'master' into remove_gradido_node
|
2022-02-07 12:38:28 +01:00 |
|
Alexander Friedland
|
3f89dc1e3b
|
Merge pull request #1423 from gradido/1400-No-GDD-value-when-reloading-User-Profile
add updateTransactions function for GDD balance if reload page
|
2022-02-07 12:28:23 +01:00 |
|
elweyn
|
346ca8fc35
|
Merge conflict resolved.
|
2022-02-07 10:45:27 +01:00 |
|
|
|
d3e5e48d3f
|
missing updated gitmodules
|
2022-02-07 10:40:20 +01:00 |
|
ogerly
|
c66e459572
|
Add hasElopage for each user to the graphql query searchUsers.
|
2022-02-07 10:40:15 +01:00 |
|
ogerly
|
4dc4f30097
|
Add hasElopage to the UserAdmin model.
|
2022-02-07 10:39:01 +01:00 |
|
ogerly
|
3806beb01e
|
Add hasElopage flag to user entity for the admin user search.
|
2022-02-07 10:38:35 +01:00 |
|
ogerly
|
555420a568
|
Remove unused imports, extract hasElopageBuys to utility.
|
2022-02-07 10:36:43 +01:00 |
|
ogerly
|
9d79e35f36
|
Refactor hasElopageBuys method to a utility method.
|
2022-02-07 10:34:54 +01:00 |
|
|
|
7c20c981d8
|
removed node server (was never used)
|
2022-02-07 08:15:56 +01:00 |
|
Hannes Heine
|
80956bcee9
|
Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area
|
2022-02-05 17:23:02 +01:00 |
|
Alexander Friedland
|
e109406b43
|
Merge branch 'master' into 1400-No-GDD-value-when-reloading-User-Profile
|
2022-02-05 00:07:14 +01:00 |
|
Alexander Friedland
|
a1f73514dd
|
Merge pull request #1424 from gradido/1390-Display-Error-when-navigating-to-send-Form-without-any-GDD
1390 display error when navigating to send form without any gdd
|
2022-02-05 00:06:43 +01:00 |
|
Alexander Friedland
|
7d1e51d4ee
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:37:14 +01:00 |
|
Alexander Friedland
|
c4a64ebee0
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:37:08 +01:00 |
|
Alexander Friedland
|
75bb45a847
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:37:00 +01:00 |
|
Alexander Friedland
|
fd21680072
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:53 +01:00 |
|
Alexander Friedland
|
99b0fdadb4
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:48 +01:00 |
|
Alexander Friedland
|
4c51fa9803
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:42 +01:00 |
|
Alexander Friedland
|
86fdb62aef
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:36 +01:00 |
|
Alexander Friedland
|
3fe94e31fb
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:28 +01:00 |
|
Alexander Friedland
|
5d119ee739
|
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-02-04 19:36:21 +01:00 |
|
Alexander Friedland
|
4aac522f89
|
Merge branch 'master' into 1390-Display-Error-when-navigating-to-send-Form-without-any-GDD
|
2022-02-04 18:44:15 +01:00 |
|
Alexander Friedland
|
45338b37f3
|
Merge branch 'master' into 1400-No-GDD-value-when-reloading-User-Profile
|
2022-02-04 18:44:10 +01:00 |
|
Alexander Friedland
|
7410ee9cdf
|
Merge pull request #1413 from gradido/1393-have-an-delete-button-for-the-search-input
have an delete button for the search input
|
2022-02-04 18:43:44 +01:00 |
|
Alexander Friedland
|
bf73a719a3
|
Merge branch 'master' into 1400-No-GDD-value-when-reloading-User-Profile
|
2022-02-04 18:32:29 +01:00 |
|
Alexander Friedland
|
09fc84c1ae
|
Merge branch 'master' into 1393-have-an-delete-button-for-the-search-input
|
2022-02-04 18:29:22 +01:00 |
|
Alexander Friedland
|
5a77abee51
|
Merge pull request #1422 from gradido/1418-Reset-All-Selected-Users-in-Mass-Creation
reset all selected users in mass creation
|
2022-02-04 18:28:50 +01:00 |
|
Alexander Friedland
|
8b3a116acd
|
Merge branch 'master' into 1390-Display-Error-when-navigating-to-send-Form-without-any-GDD
|
2022-02-04 18:06:13 +01:00 |
|
Moriz Wahl
|
544b4da370
|
remove artifacts
|
2022-02-04 17:02:40 +01:00 |
|
Moriz Wahl
|
a39efaafcd
|
coverage admin interface to 93%
|
2022-02-04 17:00:42 +01:00 |
|
Moriz Wahl
|
301ceb38a8
|
test creation confitmation by clicks instead of emits
|
2022-02-04 16:59:54 +01:00 |
|
Moriz Wahl
|
93522285f3
|
Merge branch '1418-Reset-All-Selected-Users-in-Mass-Creation' of github.com:gradido/gradido into 1418-Reset-All-Selected-Users-in-Mass-Creation
|
2022-02-04 16:42:06 +01:00 |
|
Moriz Wahl
|
3c72779574
|
Test for user table in component folder
|
2022-02-04 16:41:53 +01:00 |
|
ogerly
|
d3ebdddd6f
|
add tests disabled true or false if balance 0.00 GDD or 100.00 GDD
|
2022-02-04 16:41:08 +01:00 |
|
ogerly
|
3fe2b8e026
|
yarn locales --fix
|
2022-02-04 15:52:14 +01:00 |
|
ogerly
|
46f7894d29
|
add localized
|
2022-02-04 15:49:33 +01:00 |
|
Alexander Friedland
|
fa049aef25
|
Merge branch 'master' into 1418-Reset-All-Selected-Users-in-Mass-Creation
|
2022-02-04 15:43:03 +01:00 |
|
Alexander Friedland
|
d905851d91
|
Merge branch 'master' into 1400-No-GDD-value-when-reloading-User-Profile
|
2022-02-04 15:42:56 +01:00 |
|
Alexander Friedland
|
ad07ef2247
|
Merge branch 'master' into 1393-have-an-delete-button-for-the-search-input
|
2022-02-04 15:42:19 +01:00 |
|
|
|
eade597505
|
Merge pull request #1411 from gradido/combine_user_tables
combine_user_tables
|
2022-02-04 15:41:30 +01:00 |
|
|
|
b73098014f
|
Merge branch 'master' into combine_user_tables
|
2022-02-04 15:34:34 +01:00 |
|
ogerly
|
8531a2e425
|
yarn lint
|
2022-02-04 15:20:52 +01:00 |
|
ogerly
|
b50a552fad
|
disable form if balance <= 0, and show danger info text
|
2022-02-04 15:14:43 +01:00 |
|
Moriz Wahl
|
317067ab96
|
improve test
|
2022-02-04 14:41:24 +01:00 |
|
Alexander Friedland
|
7010dce6bf
|
Merge branch 'master' into 1393-have-an-delete-button-for-the-search-input
|
2022-02-04 14:18:27 +01:00 |
|
Alexander Friedland
|
6ff965c808
|
Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area
|
2022-02-04 14:18:13 +01:00 |
|
