7868 Commits

Author SHA1 Message Date
elweyn
2cc7a6dee6 Fixing tests since we now use link and code. 2022-04-06 19:16:30 +02:00
elweyn
41b35f2c5e Add link to the TransactionLink and change code by link in frontend. 2022-04-06 18:45:27 +02:00
elweyn
d984ff2582 Add COMMUNITY_REDEEM_LINK to the config. 2022-04-06 18:44:19 +02:00
elweyn
ff24798767 Add free line after import. 2022-04-06 11:10:09 +02:00
elweyn
54f5a0123f Remove the base url from the frontend. 2022-04-06 11:03:22 +02:00
elweyn
e49892d69c Changed the value of code so that it get's the configured COMMUNITY_URL and redeem/ from the backend. 2022-04-06 10:56:27 +02:00
Alexander Friedland
c54ec6cf6a
Merge pull request #1677 from gradido/503-Transaction-List-Pagination-Pages-clickable
503 transaction list pagination pages clickable
2022-04-05 14:49:37 +02:00
Moriz Wahl
6a5ad7e6b5 Merge branch '503-Transaction-List-Pagination-Pages-clickable' of github.com:gradido/gradido into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 14:35:46 +02:00
Moriz Wahl
e942cd2069 remove unused locale due to deletion of pagination component 2022-04-05 14:35:35 +02:00
Alexander Friedland
e819c1868d
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 13:50:46 +02:00
Moriz Wahl
ddeb936634 remove unused pagination component 2022-04-05 13:30:06 +02:00
Moriz Wahl
f8412acb5e improve tests 2022-04-05 13:27:43 +02:00
Alexander Friedland
22d10deea6
Merge pull request #1722 from gradido/1706-After-unsuccessful-sending-email-is-cleared
if no recipientEmail else form.email
2022-04-05 13:12:26 +02:00
Moriz Wahl
a6b5dddc61 email is restored after clicking back from transaction confirmation 2022-04-05 13:01:33 +02:00
Alexander Friedland
066f898805
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-04-05 09:43:09 +02:00
Alexander Friedland
13de1d07e0
Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared 2022-04-04 22:58:12 +02:00
Alexander Friedland
3da5b458c2
Merge pull request #1728 from gradido/1727-Change-button-text-and-observe-spelling
1727 change button text and observe spelling
2022-04-04 22:55:57 +02:00
Alexander Friedland
51d4e855b4
Merge branch 'master' into 1727-Change-button-text-and-observe-spelling 2022-04-04 22:41:19 +02:00
Alexander Friedland
4225388d60
Merge pull request #1730 from gradido/1729-load-spinner-if-pending-balance
1729 load spinner if pending balance
2022-04-04 22:41:07 +02:00
Alexander Friedland
ea62b1afaa
Merge branch 'master' into 1729-load-spinner-if-pending-balance 2022-04-04 22:09:20 +02:00
Alexander Friedland
9b47bf3c40
Merge branch 'master' into 1727-Change-button-text-and-observe-spelling 2022-04-04 22:08:53 +02:00
Alexander Friedland
39f4be9606
Merge pull request #1724 from gradido/1723-remembered-and-selected-accordingly-send-per-link
transaction type remains when jumping from the verification back
2022-04-04 22:07:27 +02:00
ogerly
1b88c23b05 fixed test for pagination 2022-04-04 17:59:57 +02:00
ogerly
04d55d7a1e fixed lint 2022-04-04 16:36:58 +02:00
ogerly
197305b81e change text button edit to back 2022-04-04 16:26:59 +02:00
ogerly
d45d8cd02b fixed test TransactionForm.spec.js 2022-04-04 16:18:10 +02:00
ogerly
41fe52fcc9 fixed lint 2022-04-04 16:17:18 +02:00
ogerly
7ad9aae50a change variable radio_selected to radioSelected 2022-04-04 16:16:41 +02:00
Alexander Friedland
a47f0ac218
Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared 2022-04-04 13:34:19 +02:00
Alexander Friedland
035d10753e
Merge branch 'master' into 1727-Change-button-text-and-observe-spelling 2022-04-04 13:33:37 +02:00
Alexander Friedland
33bcb859b9
Merge branch 'master' into 1729-load-spinner-if-pending-balance 2022-04-04 13:33:03 +02:00
Alexander Friedland
c00efbfcb8
Merge branch 'master' into 1723-remembered-and-selected-accordingly-send-per-link 2022-04-04 13:32:50 +02:00
Alexander Friedland
e6ed76e6b4
Merge pull request #1726 from gradido/1725-text-for-toast-expand-link-copied
text for toast expand link copied
2022-04-04 13:28:29 +02:00
Alexander Friedland
cc340d2718
Update frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-04 13:17:16 +02:00
Alexander Friedland
16aa988558
Update frontend/src/components/Status.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-04 13:16:09 +02:00
Alexander Friedland
5b1f8d1164
Update frontend/src/components/Status.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-04 13:16:00 +02:00
Alexander Friedland
e3f76d6d35
Update frontend/src/components/GddSend/TransactionForm.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-04-04 13:08:58 +02:00
ogerly
2f6ed90f15 fixed test for pending animation icon 2022-04-03 13:02:53 +02:00
ogerly
f1555b4a27 fixed yarn lint 2022-04-03 12:55:52 +02:00
ogerly
a5546826a5 delete unused text 2022-04-03 12:55:18 +02:00
ogerly
f33c9694ad if pending status true load spinner 2022-04-03 12:53:24 +02:00
ogerly
75d339903e change text from button.btn-success to button.btn-primary 2022-04-03 12:05:56 +02:00
ogerly
0569680b35 change button[type=reset] text from reset to cancel 2022-04-03 12:05:07 +02:00
ogerly
d446afacbc change button.btn-success to button.btn-primary 2022-04-03 12:03:56 +02:00
ogerly
00bb4a1abc fixed yarn lint 2022-04-03 11:57:54 +02:00
ogerly
a0bdecbe1a change text button 2022-04-03 11:56:49 +02:00
ogerly
b6b8baf2f8 fixed tests, change selected to radio_selected 2022-04-03 11:13:09 +02:00
ogerly
307f1092d5 text for toast expand link copied 2022-04-03 11:03:01 +02:00
ogerly
67f922fcd4 transaction type remains when jumping from the verification back 2022-04-03 10:46:38 +02:00
ogerly
f01f28cc82 if no recipientEmail else form.email 2022-04-03 09:48:21 +02:00