9538 Commits

Author SHA1 Message Date
Claus-Peter Hübner
3ad89dab71 Federation Review-2 2022-04-06 03:14:32 +02:00
Claus-Peter Hübner
5ead0e7a21 Federation Review-2 and gradido-core brainstorming 2022-04-06 03:13:56 +02:00
Moriz Wahl
9c9cc631ee
Merge branch 'master' into fix_config_default_reset_password 2022-04-05 15:51:43 +02:00
Moriz Wahl
1b17653770
Merge branch 'master' into fix-elopage-status 2022-04-05 15:51:14 +02:00
Alexander Friedland
08ff60f55b
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-05 15:28:22 +02:00
Moriz Wahl
69dae586d8 check that recipient user has activated account in send coins 2022-04-05 15:12:36 +02:00
Moriz Wahl
f3948b39be pass context object to hasElopage query 2022-04-05 14:50:45 +02:00
Moriz Wahl
affd8a6859 update browser list for unit tests 2022-04-05 14:50:08 +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
Moriz Wahl
7dbf8fe010
Merge branch 'master' into fix_config_default_reset_password 2022-04-05 14:33:29 +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
676beda15f
also adjust bare_metal deployment .env.dist 2022-04-05 12:25:40 +02:00
79013f3aa8
fixed config dist version to properly reflect new password reset url 2022-04-05 12:22:52 +02:00
Alexander Friedland
fd5dca7eba
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-05 09:43:18 +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
826dbf6380
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-04-05 09:43:01 +02:00
Claus-Peter Hübner
09b2f3f9c3 gradido where did you go - first ideas 2022-04-05 02:26:43 +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
227f81f35a
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-04 22:10:11 +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
4ada891a89 remove only 2022-04-04 13:05:21 +02:00
ogerly
998514c62b out commend toast test success used 2022-04-04 13:05:21 +02:00
Alexander Friedland
98ae90c05e
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-04 11:32:36 +02:00
ogerly
0642b19791 fixed test for navigator.clipboard 2022-04-04 11:16:32 +02:00