7205 Commits

Author SHA1 Message Date
Moriz Wahl
c219a35783 do not use amount filter in status component 2022-03-09 11:22:15 +01:00
ogerly
1bcabd26e8 remove substring in tests, merge master 2022-03-09 11:21:11 +01:00
Moriz Wahl
53611ba51e GDD filter 2022-03-09 11:17:42 +01:00
Moriz Wahl
690e8a817e hack the i18n for tests 2022-03-09 11:17:42 +01:00
Moriz Wahl
6770f010e2 feat: Use Vue Filter for Amounts 2022-03-09 11:17:42 +01:00
Moriz Wahl
437da5eeda feat: Transaction Link Model 2022-03-09 11:05:01 +01:00
ogerly
e1256eddf2 test Data: selected in TransactionForm.spec.js 2022-03-09 11:04:49 +01:00
Moriz Wahl
7ddfeed97d
Merge pull request #1576 from gradido/use-filter-to-display-amounts
feat: Use Vue Filter to Display Gradido Amounts
2022-03-09 10:50:46 +01:00
ogerly
d0885554d6 add locales for TransactionForm.vue 2022-03-09 09:01:01 +01:00
ogerly
a2550cae6a yarn test fixed, resolve date error with substring, add selected 'send' on submit test 2022-03-09 08:51:07 +01:00
ogerly
8545ca1790 yarn lint --fix 2022-03-09 08:23:03 +01:00
ogerly
59bff37ba4 merge master, resolve conflicts 2022-03-09 08:20:51 +01:00
Moriz Wahl
a385f1772c fix test 2022-03-08 18:19:01 +01:00
Moriz Wahl
25288ce835
Merge branch 'master' into use-filter-to-display-amounts 2022-03-08 18:06:42 +01:00
Moriz Wahl
18318404eb Merge branch 'master' into test-login-user-resolver 2022-03-08 18:06:16 +01:00
Moriz Wahl
c5ff18f461 use @paths 2022-03-08 18:04:55 +01:00
Moriz Wahl
8300449324
Merge pull request #1572 from gradido/refactor-backend-relative-paths
refactor: Resolve Relative Paths in Backend
2022-03-08 18:01:21 +01:00
ogerly
41a2b975a4 change lacales in english give away to send 2022-03-08 14:50:14 +01:00
ogerly
dafe98efc6 change lacales verschenken to versenden 2022-03-08 14:50:14 +01:00
Moriz Wahl
3d70dd0955 Merge branch 'master' into use-filter-to-display-amounts 2022-03-08 14:08:02 +01:00
Moriz Wahl
982be8d1ac
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 14:06:52 +01:00
Moriz Wahl
82ebcc0ae9
Merge branch 'master' into test-login-user-resolver 2022-03-08 14:06:21 +01:00
Moriz Wahl
ad44cf74dc
Merge pull request #1571 from gradido/refactor-frontend-directories
refactor: Frontend Directory Structure and Routes
2022-03-08 14:05:48 +01:00
Moriz Wahl
e335a12aee
Merge branch 'master' into use-filter-to-display-amounts 2022-03-08 13:52:26 +01:00
Moriz Wahl
3a51ee645d
Merge branch 'master' into refactor-frontend-directories 2022-03-08 13:48:11 +01:00
Moriz Wahl
881b8a37c2
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 13:46:00 +01:00
Alexander Friedland
13e90a766e
Merge branch 'master' into frontend-generate-link-for-send-gdd 2022-03-08 13:40:07 +01:00
Alexander Friedland
650163c00a
Merge pull request #1578 from gradido/show-community-name-in-creation-transaction
community name in creation transaction is displayed cleanly
2022-03-08 13:39:51 +01:00
ogerly
d29207b4ff yarn lint --fix, yarn locales --fix 2022-03-08 13:24:30 +01:00
ogerly
6cc6c3476a seperate confirm send GDD per link, add function sendTransactionPerLink() 2022-03-08 13:22:47 +01:00
ogerly
18534f3179 add first form version send gdd per link, add locales, add extra submit button 2022-03-08 11:08:30 +01:00
ogerly
680d43b2cd community name in creation transaction is displayed cleanly 2022-03-08 09:41:05 +01:00
Alexander Friedland
412ce993f5
Merge branch 'master' into refactor-backend-relative-paths 2022-03-08 09:33:45 +01:00
Alexander Friedland
6186b314bb
Merge branch 'master' into refactor-frontend-directories 2022-03-08 09:09:59 +01:00
Moriz Wahl
eafa00b3bf less divs 2022-03-08 07:37:28 +01:00
Moriz Wahl
2e75ceb73e remove unnecesesary divs 2022-03-08 07:35:34 +01:00
Moriz Wahl
1c03aa00da refactor display of time passed for decay 2022-03-08 07:27:07 +01:00
Moriz Wahl
2d2369ccaf map transaction typeId to locales 2022-03-08 07:02:58 +01:00
Moriz Wahl
b2d731a641 block for tests 2022-03-08 06:53:36 +01:00
Moriz Wahl
acba22040c add tests for amount filters 2022-03-08 06:51:56 +01:00
Moriz Wahl
938b811d8a render decay with GDD 2022-03-08 06:36:15 +01:00
Moriz Wahl
53338ee223 do not use amount filter in status component 2022-03-08 06:26:23 +01:00
Moriz Wahl
0538b78cd1 fix bugs in Transacrion Components, fix tests for GDD transaction list, use filter in menu and status 2022-03-08 06:21:36 +01:00
Moriz Wahl
f58d1a843b GDD filter 2022-03-08 05:15:58 +01:00
Moriz Wahl
aa8432384e hack the i18n for tests 2022-03-08 04:37:34 +01:00
Moriz Wahl
09de529443 feat: Use Vue Filter for Amounts 2022-03-08 04:21:47 +01:00
clauspeterhuebner
034828a6f8
Merge pull request #1567 from gradido/1170_Send_new_Users_Gradido
Planning: send new users gradido
2022-03-08 01:20:56 +01:00
clauspeterhuebner
c3e2168d17
Merge branch 'master' into 1170_Send_new_Users_Gradido 2022-03-08 00:31:57 +01:00
Moriz Wahl
75a1feb7ee no relative paths in tests 2022-03-07 22:03:54 +01:00
Moriz Wahl
9879c4550e path to models 2022-03-07 21:58:30 +01:00