Hannes Heine
|
7d62db39bb
|
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear
|
2021-12-13 04:31:33 +01:00 |
|
Alexander Friedland
|
1180f28d21
|
Merge branch 'master' into 533-Refactor-menu-remove-tim
|
2021-12-12 11:06:59 +01:00 |
|
|
|
acb1aefd42
|
Merge pull request #1176 from gradido/database_docker_fixes
database_docker_fixes
|
2021-12-12 05:18:40 +01:00 |
|
|
|
3d0cdf5562
|
Merge branch 'master' into database_docker_fixes
|
2021-12-12 04:50:27 +01:00 |
|
Alexander Friedland
|
5370a969b5
|
Merge branch 'master' into 533-Refactor-menu-remove-tim
|
2021-12-11 23:38:36 +01:00 |
|
|
|
34521aaeb1
|
Merge pull request #1184 from gradido/naming_conventions_pending_tasks
naming_conventions_pending_tasks
|
2021-12-11 23:04:12 +01:00 |
|
Hannes Heine
|
610d9cf039
|
Merge branch 'master' into 1145-refactor-admin-resolver-from-master
|
2021-12-11 11:11:53 +01:00 |
|
ogerly
|
7bd952a14a
|
remove shallowMount from Navbar.vue
|
2021-12-11 10:31:10 +01:00 |
|
ogerly
|
2cf7de2e4b
|
test watch function for visible
|
2021-12-11 10:27:47 +01:00 |
|
ogerly
|
b7a1b2da69
|
sidebar change paddings for b-nav
|
2021-12-11 09:42:39 +01:00 |
|
ogerly
|
1dff467b10
|
Add style .bg-lightgrey in AccountOverview.vue
|
2021-12-11 09:38:32 +01:00 |
|
Hannes Heine
|
f58f61fd41
|
Merge branch 'master' into onboarding_process
|
2021-12-11 06:27:51 +01:00 |
|
Hannes Heine
|
1b9f432c71
|
Merge branch 'master' into test-admin-creation
|
2021-12-11 06:23:49 +01:00 |
|
Hannes Heine
|
1080c9d341
|
Merge branch 'master' into database_docker_fixes
|
2021-12-11 06:18:28 +01:00 |
|
Hannes Heine
|
508bb774de
|
Update Login.vue
Correct own typo
|
2021-12-11 06:17:45 +01:00 |
|
ogerly
|
ea1352d571
|
more tests for Navbar.vue, yarn lint --fix
|
2021-12-10 19:16:53 +01:00 |
|
Alexander Friedland
|
d4a7ee63e0
|
Merge branch 'master' into Error-handling-in-GddTransactionList
|
2021-12-10 17:52:45 +01:00 |
|
|
|
fba757228c
|
renamed pendingCreations into loginPendingTasksAdmin as to our naming conventions
|
2021-12-10 17:03:34 +01:00 |
|
ogerly
|
cb2c5173f1
|
test: renders text saying that there are no transactions
|
2021-12-10 15:22:36 +01:00 |
|
ogerly
|
0bb3b04436
|
remove error text for decay not found.
|
2021-12-10 15:22:36 +01:00 |
|
|
|
a9b922505d
|
Merge branch 'master' into 533-Refactor-menu-remove-tim
|
2021-12-10 15:04:09 +01:00 |
|
|
|
f752960e81
|
Merge pull request #1180 from gradido/fix_i18n
fix_i18n
|
2021-12-10 14:51:54 +01:00 |
|
|
|
83a2269a42
|
Update frontend/src/views/Pages/Login.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-10 14:51:10 +01:00 |
|
Alexander Friedland
|
7f50f82bb5
|
Merge branch 'master' into Error-handling-in-GddTransactionList
|
2021-12-10 14:40:02 +01:00 |
|
|
|
5683f4bbd3
|
Merge branch 'master' into fix_i18n
|
2021-12-10 14:39:03 +01:00 |
|
Alexander Friedland
|
e924948c65
|
Merge branch 'master' into 533-Refactor-menu-remove-tim
|
2021-12-10 14:38:58 +01:00 |
|
|
|
8f143824c5
|
Merge pull request #1178 from gradido/fix_corrupted_sender_balance
fix_corrupted_sender_balance
|
2021-12-10 14:38:12 +01:00 |
|
Hannes Heine
|
9b90b42953
|
Merge branch 'master' into wrong_login_is_not_password_reset
|
2021-12-10 12:58:31 +01:00 |
|
Alexander Friedland
|
04819a1156
|
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-10 12:55:32 +01:00 |
|
Alexander Friedland
|
49c192ebbf
|
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-10 12:55:19 +01:00 |
|
Alexander Friedland
|
0aa2154abd
|
Update frontend/src/components/Menu/Navbar.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-10 12:55:03 +01:00 |
|
Alexander Friedland
|
11fc0c16e9
|
Update frontend/src/components/Menu/Navbar.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-10 12:54:38 +01:00 |
|
Alexander Friedland
|
1b873dd2b9
|
Merge branch 'master' into fix_i18n
|
2021-12-10 12:53:46 +01:00 |
|
elweyn
|
0a3db57b7f
|
Remove SideBar test, side bar remove changed the dashboard-plugin
|
2021-12-10 12:51:22 +01:00 |
|
ogerly
|
47f8ce38b1
|
change error text for transactionCount is FALSE or undefind
|
2021-12-10 12:48:46 +01:00 |
|
ogerly
|
ae317a95db
|
yarn lint, yarn locales --fixed
|
2021-12-10 12:19:07 +01:00 |
|
ogerly
|
3abbb6def1
|
error handling gddTransactionList locales fixed
|
2021-12-10 12:17:49 +01:00 |
|
ogerly
|
1d2fc1a9f4
|
error handling icon, text and position
|
2021-12-10 12:10:47 +01:00 |
|
elweyn
|
cb3c600216
|
Adding decay calculation to the creation.
|
2021-12-10 12:10:38 +01:00 |
|
elweyn
|
40dff50364
|
state-balance balanceDate can't get the date of the last transaction cause creation is a new transaction.
|
2021-12-10 11:54:00 +01:00 |
|
ogerly
|
e91314f695
|
merge master
|
2021-12-10 11:00:37 +01:00 |
|
ogerly
|
118dd886b8
|
test for reactivitat DashboardLayout_gdd.spec.js
|
2021-12-10 10:26:24 +01:00 |
|
ogerly
|
7cbafbdee3
|
test props elopageUri
|
2021-12-10 10:08:06 +01:00 |
|
Hannes Heine
|
9b36c4db46
|
Merge branch 'master' into fix_corrupted_sender_balance
|
2021-12-10 10:05:36 +01:00 |
|
ogerly
|
b874abb4f8
|
getElopageLink to data and props elopageUri
|
2021-12-10 10:03:53 +01:00 |
|
Hannes Heine
|
4aaaec18c6
|
Merge pull request #1181 from gradido/fix-state-user-transaction-handling
Withdrew * 10000 and / 10000 since we need to store the full value.
|
2021-12-10 09:51:10 +01:00 |
|
ogerly
|
d6b32b6ba5
|
remove target text from b-navbar-toggle, yarn lint --fix
|
2021-12-10 09:40:56 +01:00 |
|
ogerly
|
0fff9798e1
|
yarn lint --fix
|
2021-12-10 09:37:17 +01:00 |
|
ogerly
|
b9b28a37a3
|
sidebar test all navbar-items
|
2021-12-10 09:36:48 +01:00 |
|
ogerly
|
057debeee8
|
navbar test all navbar-items
|
2021-12-10 09:33:44 +01:00 |
|
