6562 Commits

Author SHA1 Message Date
ogerly
399450af93 remove collaps button from decay type transaction 2022-02-08 15:30:33 +01:00
ogerly
c51fd00be5 rechtschreibfehler fixed 2022-02-08 15:18:04 +01:00
ogerly
b7c215c17c rechtschreibfehler fixed 2022-02-08 15:14:42 +01:00
ogerly
7dadcb1701 rechtschreibfehler fixed 2022-02-08 15:13:54 +01:00
ogerly
3fe99b3de2 yarn locales --fix 2022-02-08 15:10:01 +01:00
ogerly
716de7de46 lacales in befor startblock collaps text 2022-02-08 15:10:01 +01:00
ogerly
55866ef1fe change conflicts fixed 2022-02-08 15:09:48 +01:00
ogerly
9b22b42457 change conflicts fixed 2022-02-08 15:06:26 +01:00
Alexander Friedland
55573ea2ce
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-08 08:31:13 +01:00
Alexander Friedland
b876d8e335
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-08 08:30:38 +01:00
Alexander Friedland
9add338ddd
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-08 08:30:24 +01:00
Alexander Friedland
f92b223d90
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-08 08:30:09 +01:00
Alexander Friedland
64301776fb
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-02-08 08:30:01 +01:00
Alexander Friedland
6526f86e63
Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed 2022-02-08 07:59:43 +01:00
4f37e1f675
Merge pull request #1429 from gradido/fix_community_name_description
fix_community_name_description
2022-02-07 21:55:50 +01:00
b04445c13d
Merge branch 'master' into fix_community_name_description 2022-02-07 19:57:07 +01:00
4743255681
Merge pull request #1406 from gradido/remove_unnecessary_repositories
remove_unnecessary_repositories
2022-02-07 19:56:59 +01:00
Alexander Friedland
8a04d2be51
Merge branch 'master' into fix_community_name_description 2022-02-07 17:04:52 +01:00
ogerly
c9ff626890 style margin-left and margin-right remove from dashboard template ad add on subsites 2022-02-07 17:01:07 +01:00
Alexander Friedland
748953fb39
Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed 2022-02-07 15:46:35 +01:00
8e769e7b0e
Merge branch 'master' into remove_unnecessary_repositories 2022-02-07 13:07:55 +01:00
elweyn
d502b3d052 yarn lint --fix. 2022-02-07 13:05:06 +01:00
Alexander Friedland
533de795df
Merge branch 'master' into 1106-first-transaction-cannot-be-expanded 2022-02-07 13:04:50 +01:00
11e92102e5
Merge pull request #1427 from gradido/clean_database_users
clean_database_users
2022-02-07 13:04:13 +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
c66f4c95a4
Merge branch 'master' into clean_database_users 2022-02-07 12:55:57 +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
53c1a4f808
Merge branch 'master' into 1389-TransactionsTabs-are-not-well-designed 2022-02-07 12:29:46 +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
90ef04b465 yarn lint --fix && yarn locales --fix 2022-02-07 12:22:33 +01:00
elweyn
50c87e8e00 add localize on transactionlist 2022-02-07 12:21:21 +01:00
elweyn
e1abedc8ff add localize first_transaction 2022-02-07 12:18:25 +01:00
elweyn
e1d07e3642 get firstTransaction from Transactionlist, add collaps block for firstTransaction 2022-02-07 12:13:12 +01:00
ogerly
e76bae4585 Add firstTransaction to transactionList transactions query. 2022-02-07 12:01:39 +01:00
ogerly
21da7f4ffb Removed the firstTransaction property initialization in TransactionList. 2022-02-07 11:56:50 +01:00
ogerly
111894bc3e Move case firstTransaction in case their is no previous Transaction. 2022-02-07 11:44:32 +01:00
ogerly
e22c701c88 Add firstTransaction boolean to Transaction. 2022-02-07 11:40:26 +01:00
elweyn
520cb22350 Revert "Add firstTransaction boolean to Transaction."
This reverts commit 8c6aafcedb80e6212fe80d04c60e9340a0a762f6.
2022-02-07 11:38:46 +01:00
ogerly
d3123e00fc Fill firstTransaction in case decay can not be created. 2022-02-07 11:32:56 +01:00
ogerly
8c6aafcedb Add firstTransaction boolean to Transaction. 2022-02-07 11:32:09 +01:00
ogerly
27d4623137 Remove firstTransaction from TransactionList. 2022-02-07 11:31:44 +01:00
ogerly
801033138f Add firstTransaction boolean to TransactionList. 2022-02-07 11:14:07 +01:00
Alexander Friedland
a7544a5151
Merge branch 'master' into refactor_remove_community_server 2022-02-07 10:50:19 +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