10976 Commits

Author SHA1 Message Date
ogerly
1823bc3611 add methods 'showQrCodeButton', add data 'showQrcode' 2022-04-21 17:47:55 +02:00
ogerly
b2623cc83e add locales 'qrCode' 2022-04-21 17:46:43 +02:00
ogerly
0e8ca5b410 fixed yarn lint 2022-04-21 16:40:30 +02:00
ogerly
e154373694 add locales 'qrCode' 2022-04-21 16:39:19 +02:00
ogerly
bbec1306d0 change modal structure 2022-04-21 16:38:14 +02:00
Moriz Wahl
839d52748b test reopening of transaction link details 2022-04-21 14:08:22 +02:00
Moriz Wahl
eb2b0e951e reset transaction link arrays after click 2022-04-21 14:04:04 +02:00
efcd75717a
updated backend required database version 2022-04-21 13:49:29 +02:00
7b86c4bc24
admin use decimal instead of float for pending creations in graphql queries 2022-04-21 13:49:29 +02:00
56ed35d692
backend fix types for admin_pending_creations is now decimal 2022-04-21 13:49:29 +02:00
c3c3e556a0
convert admin_pending_creations to decimal 2022-04-21 13:49:29 +02:00
6da5348764
lint fix 2022-04-21 13:47:17 +02:00
39775868ee
federation image created for federation planning 2022-04-21 13:41:55 +02:00
74c0e3826b
adjust test 2022-04-21 13:35:57 +02:00
c6a4650866
remove code from trasnsactionLinkList query, adjusted test to have full URL in apollo mock 2022-04-21 13:34:47 +02:00
d836fb5375
remove code from TransactionLink 2022-04-21 13:30:51 +02:00
febe57ce13
remove code from graphql query, just use code 2022-04-21 13:28:21 +02:00
f9efc3fa06
use link instead of url, do not use v-model, use value to not allow mutate prop 2022-04-21 13:22:52 +02:00
00e03af7f3
increase backend config version v6 2022-04-21 13:19:01 +02:00
19f2686b6e
Merge branch 'master' into 1637-generate-link-backend
# Conflicts:
#	frontend/src/components/ClipboardCopy.vue
#	frontend/src/components/GddSend/TransactionResultLink.vue
#	frontend/src/components/TransactionLinks/TransactionLink.vue
#	frontend/src/components/Transactions/TransactionLinkSummary.spec.js
2022-04-21 13:14:52 +02:00
Wolfgang Huß
e67a04b30f Renamed filterDeletedUser to filterByDeleted
- Clarify logic.
2022-04-21 11:21:14 +02:00
Moriz Wahl
50bddf49e4 fix test for User.isAdmin as nullable date 2022-04-21 11:16:14 +02:00
Wolfgang Huß
0bf18a4f2b Revert unintenionally renamimngs 2022-04-21 11:08:28 +02:00
Moriz Wahl
fa6fbe38c8 User.isAdmin as nullable Date 2022-04-21 11:05:51 +02:00
Wolfgang Huß
206737581f Fix logic of filterByActivated
- Fix test with this.
2022-04-21 11:05:13 +02:00
Moriz Wahl
ba648c67a9 entity model users.isAdmin as nullable date 2022-04-21 11:01:23 +02:00
Moriz Wahl
863ecfa474 migrate is_admin column in users as datetime with default null 2022-04-21 10:58:22 +02:00
Wolfgang Huß
0c0bfe1a10 Rename to filterByActivated and filterByDeleted 2022-04-21 10:52:11 +02:00
Wolfgang Huß
4f4d464b53 Fix unintentionally destroyed test 2022-04-21 10:19:39 +02:00
Wolfgang Huß
3f502ea37a Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page
# Conflicts:
#	frontend/src/pages/Login.spec.js
#	frontend/src/pages/Login.vue
2022-04-21 10:15:31 +02:00
Wolfgang Huß
d63303c75c Refine error messages a bit more detailed 2022-04-21 10:02:48 +02:00
Moriz Wahl
d5ca07e1fe
Merge branch 'master' into eliminate-server-user-table 2022-04-21 10:00:54 +02:00
Wolfgang Huß
180d8b4e8d Put faulty deleted toaster in ForgotPassword page back 2022-04-21 09:56:07 +02:00
Wolfgang Huß
f245a3703c Refactor test for Login page 2022-04-21 09:51:47 +02:00
Wolfgang Huß
097d33fb97 Refactor Login page 2022-04-21 09:40:34 +02:00
Wolfgang Huß
13b5e02c24 Removed comment after Ulf's suggestion 2022-04-21 09:16:07 +02:00
Wolfgang Huß
3dddbabb99 Fix error after Ulf's hint 2022-04-21 09:09:54 +02:00
Wolfgang Huß
ef6b3c78df Fix translation of ForgotPassword login button text 2022-04-21 08:46:57 +02:00
Wolfgang Huß
621786c91d Rename after suggestion emailChecked withActivated and deletedAt to withDeleted 2022-04-21 07:54:41 +02:00
Wolfgang Huß
9761b4afa6 Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted 2022-04-21 07:23:03 +02:00
Claus-Peter Hübner
f03ce8a826 Merge branch '1793-feature-concept-of-business-event-protocol' of github.com:gradido/gradido into 1793-feature-concept-of-business-event-protocol 2022-04-21 02:03:58 +02:00
Claus-Peter Hübner
587677832a rework PR comment 2022-04-21 01:48:26 +02:00
Claus-Peter Hübner
6642abd4d3 rework PR comments 2022-04-21 01:42:16 +02:00
clauspeterhuebner
601bff92b3
Merge branch 'master' into 1793-feature-concept-of-business-event-protocol 2022-04-21 01:28:33 +02:00
Alexander Friedland
1576787e57
Merge pull request #1809 from gradido/1731-Fix-Startblock-Layouting
1731 style startDecayStartblock, style Adapted across pages
2022-04-20 15:05:50 +02:00
Wolfgang Huß
0e0b5aef09 Refactor Message props 2022-04-20 14:58:54 +02:00
Alexander Friedland
58d0cf21b5
Merge branch 'master' into 1731-Fix-Startblock-Layouting 2022-04-20 14:44:10 +02:00
Wolgang Huß
3e98657c1f fixed tests for pagenation 2022-04-20 14:40:37 +02:00
Wolgang Huß
c0b56de91a remove unused computed code 2022-04-20 14:40:37 +02:00
Moriz Wahl
86cf4e9a8a
Merge branch 'master' into eliminate-server-user-table 2022-04-20 14:14:26 +02:00