Hannes Heine
|
3860822058
|
Merge branch 'master' into adminCreateMultiplePendingCreations
|
2021-12-20 13:40:59 +01:00 |
|
|
|
7d31e5b154
|
Merge pull request #1195 from gradido/fix_optin_code_regeneration
fix_optin_code_regeneration
|
2021-12-20 13:11:35 +01:00 |
|
|
|
ce973d1e78
|
Merge branch 'master' into fix_optin_code_regeneration
|
2021-12-20 12:36:48 +01:00 |
|
Hannes Heine
|
04bea42261
|
Merge branch 'master' into adminCreateMultiplePendingCreations
|
2021-12-20 09:11:47 +01:00 |
|
Alexander Friedland
|
fe6f093847
|
Merge pull request #1149 from gradido/1078-GDD-Calculate-Decay-Tool-clear
1057 display gdd balance when sending
|
2021-12-17 13:17:40 +01:00 |
|
Alexander Friedland
|
96e5362cb4
|
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear
|
2021-12-17 12:23:10 +01:00 |
|
Hannes Heine
|
523696748a
|
Merge pull request #1164 from gradido/1145-refactor-admin-resolver-from-master
1145 refactor admin resolver from master
|
2021-12-16 20:06:12 +01:00 |
|
Hannes Heine
|
6ba0c16776
|
Merge branch 'master' into 1145-refactor-admin-resolver-from-master
|
2021-12-16 13:00:01 +01:00 |
|
Alexander Friedland
|
b846fac6ed
|
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear
|
2021-12-16 12:53:42 +01:00 |
|
Alexander Friedland
|
ef50176ba0
|
Merge pull request #1183 from gradido/Error-handling-in-GddTransactionList
Error handling in GddTransactionList.vue
|
2021-12-16 12:52:55 +01:00 |
|
|
|
8edd750912
|
fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired
|
2021-12-16 12:30:04 +01:00 |
|
elweyn
|
52acec0820
|
Tests for SendOverview send transaction steps
|
2021-12-16 12:11:16 +01:00 |
|
ogerly
|
de7549596e
|
error query set individually
|
2021-12-16 09:45:51 +01:00 |
|
Alexander Friedland
|
ab3b4f40bb
|
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-12-15 07:55:34 +01:00 |
|
Alexander Friedland
|
d1de2b5820
|
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-12-15 07:55:17 +01:00 |
|
Alexander Friedland
|
ca0f122f4e
|
Update frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-12-15 07:55:08 +01:00 |
|
Alexander Friedland
|
ada332e8a2
|
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear
|
2021-12-14 13:05:05 +01:00 |
|
ogerly
|
725e5a29e9
|
add propsData in SendOverview.spec.js, yarn lint --fix
|
2021-12-14 12:48:24 +01:00 |
|
ogerly
|
17d16df87c
|
yarn locales --fix
|
2021-12-14 11:24:56 +01:00 |
|
ogerly
|
e03534108e
|
Status component removed from SendOverview
|
2021-12-14 11:24:04 +01:00 |
|
ogerly
|
00c2c85306
|
Send transaction confirm, new amount structured
|
2021-12-14 11:22:30 +01:00 |
|
Alexander Friedland
|
4530e53ce7
|
Merge branch 'master' into Error-handling-in-GddTransactionList
|
2021-12-14 10:01:28 +01:00 |
|
ogerly
|
1cc35170e9
|
yarn lint --fix
|
2021-12-14 09:48:12 +01:00 |
|
ogerly
|
6ab394d46f
|
english translations for the test
|
2021-12-14 09:47:37 +01:00 |
|
ogerly
|
4cfd2206fe
|
test no transactions, test transaction is empty
|
2021-12-14 09:44:52 +01:00 |
|
Alexander Friedland
|
0818ddcf66
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-12-14 09:12:49 +01:00 |
|
Alexander Friedland
|
96dc03e0df
|
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-12-14 09:12:40 +01:00 |
|
Hannes Heine
|
07d4bcf258
|
Merge branch 'master' into 1145-refactor-admin-resolver-from-master
|
2021-12-14 08:06:30 +01:00 |
|
Hannes Heine
|
1e62972a91
|
Merge pull request #1182 from gradido/fix-coin-creation-balanceDate-entry
state-balance balanceDate can't get the date of the last transaction
|
2021-12-13 17:14:03 +01:00 |
|
Hannes Heine
|
ae8636de09
|
Merge branch 'master' into fix-coin-creation-balanceDate-entry
|
2021-12-13 17:05:41 +01:00 |
|
Moriz Wahl
|
136dc97af1
|
Merge pull request #1186 from gradido/frontend-refactor-and-tests
feat: Frontend Refactor and Tests
|
2021-12-13 16:17:10 +01:00 |
|
Moriz Wahl
|
d2fb2e86e2
|
coverage frontend to 94%
|
2021-12-13 15:29:04 +01:00 |
|
Moriz Wahl
|
041c5a7024
|
Test global directives
|
2021-12-13 12:29:26 +01:00 |
|
Moriz Wahl
|
c9581196da
|
test admin and setVisible methods, test elopage links
|
2021-12-13 12:16:13 +01:00 |
|
Moriz Wahl
|
fa245d0b64
|
feat: Frontend Tests and Optimization
|
2021-12-13 11:52:20 +01:00 |
|
Hannes Heine
|
8d88e72246
|
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear
|
2021-12-13 11:36:16 +01:00 |
|
Hannes Heine
|
54ecb92d6c
|
Merge branch 'master' into 1145-refactor-admin-resolver-from-master
|
2021-12-13 11:34:30 +01:00 |
|
Hannes Heine
|
f58225df4f
|
Merge branch 'master' into fix-coin-creation-balanceDate-entry
|
2021-12-13 11:27:46 +01:00 |
|
elweyn
|
fb001b8886
|
Change emplacement of receivedDate after possible errors so we don't create the object when we don't need it.
|
2021-12-13 11:26:30 +01:00 |
|
elweyn
|
284984c296
|
When creating coins we store the receivedDate at the start of the call and write this value in each date field.
|
2021-12-13 11:24:09 +01:00 |
|
elweyn
|
a0f6ec65d8
|
Merge master resolve merge conflict.
|
2021-12-13 11:19:06 +01:00 |
|
Moriz Wahl
|
64109b2903
|
Merge pull request #1167 from gradido/database-without-nodemon
fix: No Nodemon in Database Scripts
|
2021-12-13 10:22:12 +01:00 |
|
Alexander Friedland
|
236df67746
|
Merge branch 'master' into Error-handling-in-GddTransactionList
|
2021-12-13 10:14:07 +01:00 |
|
Moriz Wahl
|
ef4b13ff37
|
Merge branch 'master' into database-without-nodemon
|
2021-12-13 10:12:52 +01:00 |
|
Moriz Wahl
|
6f1d99c7a3
|
Merge pull request #1172 from gradido/test-admin-creation
feat: Test Creation in Admin Interface
|
2021-12-13 10:12:17 +01:00 |
|
Moriz Wahl
|
92b481b4e0
|
Merge branch 'test-admin-creation' of github.com:gradido/gradido into test-admin-creation
|
2021-12-13 10:03:15 +01:00 |
|
Moriz Wahl
|
21247cecbd
|
Merge branch 'master' into test-admin-creation
|
2021-12-13 10:02:54 +01:00 |
|
Moriz Wahl
|
4c3b10b893
|
Update admin/src/pages/Creation.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2021-12-13 09:55:05 +01:00 |
|
Alexander Friedland
|
2e51781ac8
|
Merge pull request #1162 from gradido/533-Refactor-menu-remove-tim
533 refactor menu remove tim
|
2021-12-13 08:42:59 +01:00 |
|
Alexander Friedland
|
50effee00b
|
no async
|
2021-12-13 08:02:18 +01:00 |
|
