IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,160 Commits 1 Branch 0 Tags
Commit Graph

10160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
febe57ce13
remove code from graphql query, just use code 2022-04-21 13:28:21 +02:00
Ulf Gebhardt
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
Ulf Gebhardt
00e03af7f3
increase backend config version v6 2022-04-21 13:19:01 +02:00
Ulf Gebhardt
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
Ulf Gebhardt
daa07b780a
Merge pull request #1750 from gradido/frontend_community_info_bake_in 
Refactor: Frontend bake in community info
 2022-04-20 14:03:18 +02:00
Moriz Wahl
28b9c4ea63
Merge branch 'master' into eliminate-server-user-table 2022-04-20 14:00:26 +02:00
Moriz Wahl
fd509bd216
Merge branch 'master' into frontend_community_info_bake_in 2022-04-20 13:48:01 +02:00
Moriz Wahl
29ec984289 fix test 2022-04-20 13:46:02 +02:00
Ulf Gebhardt
90f0b532e1
remove community to store tests 2022-04-20 13:38:56 +02:00
Wolfgang Huß
95746a7324 Refactor Message tests 2022-04-20 13:31:50 +02:00
Moriz Wahl
7a388d5ee6
Merge pull request #1806 from gradido/load-transaction-links-on-click 
fix: Load Transaction Link Details on Click
 2022-04-20 13:19:09 +02:00
Moriz Wahl
7af7ee09e5
Merge branch 'master' into load-transaction-links-on-click 2022-04-20 13:11:27 +02:00
Moriz Wahl
e3a807ed95
Merge branch 'master' into eliminate-server-user-table 2022-04-20 13:08:43 +02:00
Moriz Wahl
efd6bfce51
Merge pull request #1790 from gradido/deploy-seed-in-backend 
devops: Deploy Seed in Backend
 2022-04-20 13:08:02 +02:00
Moriz Wahl
3e660fcfa9
Merge branch 'master' into deploy-seed-in-backend 2022-04-20 12:59:45 +02:00
Moriz Wahl
9f950011a4
Merge pull request #1780 from gradido/refactor-balance-model 
refactor: Balance Model and Decay Rounding
 2022-04-20 12:59:30 +02:00
Moriz Wahl
28065efd43 update README 2022-04-20 12:54:33 +02:00
Moriz Wahl
324de93814 update/remove comments 2022-04-20 12:51:34 +02:00
Moriz Wahl
0da6cc6298
Merge branch 'master' into refactor-balance-model 2022-04-20 12:48:50 +02:00
Wolfgang Huß
b65cd0fd03 Refactor PasswordForgotten site 2022-04-20 12:47:01 +02:00