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
8,918 Commits 1 Branch 0 Tags
Commit Graph

8918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
5bfcb3a0dd Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-14 07:17:15 +02:00
Wolfgang Huß
edf41861d0
Update admin/src/components/DeletedUserFormular.spec.js 
Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>
 2022-06-14 07:16:22 +02:00
clauspeterhuebner
cf728ed900
Merge pull request #1957 from gradido/1920-feature-create-contribution-link-table 
1920 feature create contribution link table
 2022-06-13 22:52:09 +02:00
Wolfgang Huß
4e0a2f42a6 Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-13 17:07:00 +02:00
Wolfgang Huß
7082d92873 Fix locales after Moritz and refine hint 2022-06-13 17:06:32 +02:00
Wolfgang Huß
ccac66f3ac Add test for admin changes user role #2 2022-06-13 16:59:23 +02:00
Moriz Wahl
a84f11880f rename migration 0037 to what it acutally does 2022-06-13 12:31:40 +02:00
Moriz Wahl
795d339398 add type definitions, make code required (not null) 2022-06-13 12:23:57 +02:00
Moriz Wahl
83c8f9731e remove duplicate file 2022-06-13 12:05:13 +02:00
Wolfgang Huß
609fe1ad2b Add test for admin changes user role 2022-06-13 12:03:35 +02:00
Moriz Wahl
5121910c83 rename ContributionLinks to ContributionLink, add CL entity to index 2022-06-13 12:03:15 +02:00
Moriz Wahl
5deaf597ed Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-13 12:02:20 +02:00
Wolfgang Huß
7860abb6ef
Merge pull request #1960 from gradido/1948-delete-settings-animationcoin-in-database 
refactor: 🍰 Delete `user_setting` Table From DB
 2022-06-13 11:31:13 +02:00
Wolfgang Huß
947ea44448 Fix unreliable tests, because of 'wrapper = Wrapper()' may not be called before each test 2022-06-13 10:37:03 +02:00
Wolfgang Huß
98f1f48d1d Implement mutation 'setUserRole' in frontend 2022-06-13 10:10:23 +02:00
Wolfgang Huß
d456d9c64a Remove wording rights from localized text 2022-06-13 09:18:41 +02:00
Alexander Friedland
0f61209aae
Merge branch 'master' into 1948-delete-settings-animationcoin-in-database 2022-06-10 07:24:05 +02:00
Claus-Peter Hübner
8a0147c811 shift enum in ticket #1921 2022-06-09 23:54:06 +02:00
Claus-Peter Hübner
d7ff6446d9 evaluate nullable columns vs entity 2022-06-09 23:52:40 +02:00
Claus-Peter Hübner
4c34542e80 rename column description to memo 
Merge remote-tracking branch
'origin/1920-feature-create-contribution-link-table' into
1921-feature-contribution-link-crud-in-admin-resolver
 2022-06-09 23:47:53 +02:00
Claus-Peter Hübner
94a48173e0 remove *.bak files from repo 
Merge remote-tracking branch
'origin/1920-feature-create-contribution-link-table' into
1920-feature-create-contribution-link-table
 2022-06-09 23:20:05 +02:00
Claus-Peter Hübner
2775a2006c Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1920-feature-create-contribution-link-table 2022-06-09 22:58:34 +02:00
Claus-Peter Hübner
e76817ebdb column validFrom NOT NULL 2022-06-09 22:55:52 +02:00
clauspeterhuebner
64c821e53a
Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-09 22:33:16 +02:00
Claus-Peter Hübner
7577f59406 Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1920-feature-create-contribution-link-table 2022-06-09 22:31:13 +02:00
Claus-Peter Hübner
3328c200d8 rework PR comments 2022-06-09 22:28:56 +02:00
clauspeterhuebner
83c66d052a
Update database/entity/0037-add_contribution_links_table/ContributionLinks.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-09 22:27:54 +02:00
clauspeterhuebner
b65aa5cefc
Update database/entity/0037-add_contribution_links_table/ContributionLinks.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-09 22:26:30 +02:00
clauspeterhuebner
114465c234
Update backend/src/config/index.ts 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-06-09 22:24:22 +02:00
Alexander Friedland
871b0f3220
Merge pull request #1969 from gradido/link-about-gradido-locales 
locales link german, english navbar
 2022-06-09 22:18:58 +02:00
Wolfgang Huß
8dc1202305 Fix 'setUserRole' resolver tests 2022-06-09 16:43:40 +02:00
Wolfgang Huß
4b7a643275 Implement 'setUserRole' resolver and write tests (still with errors) 2022-06-09 16:23:01 +02:00
Moriz Wahl
6b03bd96fb
Merge branch 'master' into 1920-feature-create-contribution-link-table 2022-06-09 11:15:17 +02:00
Claus-Peter Hübner
fd352602ec delete value NONE from enum 2022-06-08 21:33:26 +02:00
Claus-Peter Hübner
605a6757a3 change default cycle-value to ONCE 2022-06-08 21:32:42 +02:00
Wolfgang Huß
776f6283b2 Localize selectable roles 2022-06-08 15:15:05 +02:00
Wolfgang Huß
6cc68967e1 Change design and add a little further functionality 2022-06-08 14:42:44 +02:00
Wolfgang Huß
96c168c854 Add 'ChangeUserRoleFormular.vue' to 'SearchUserTable' 2022-06-08 10:49:23 +02:00
Wolfgang Huß
f71bf5da30 Add 'isAdmin' property to 'UserAdmin' and 'AdminResolver', 'searchUsers' 2022-06-08 10:48:03 +02:00
Claus-Peter Hübner
a881103c5f add softdelete feature to contributionlinks 2022-06-07 22:52:08 +02:00
Claus-Peter Hübner
e71725686c change backend config for db-version 0037 2022-06-07 22:21:40 +02:00
Claus-Peter Hübner
698f13078e define enum for ContributionLinks cycles 2022-06-07 22:14:02 +02:00
Claus-Peter Hübner
bb35332e2e change Cycle Type in tabel ContributionLinks 2022-06-07 22:13:27 +02:00
Wolfgang Huß
338c1591cb Cleanup 2022-06-07 11:45:07 +02:00
Wolfgang Huß
6abb399ab9 Removed UserSetting from backend 2022-06-07 11:33:47 +02:00
Wolfgang Huß
d958cfdfde Fix DB_VERSION 2022-06-07 10:33:46 +02:00
Wolfgang Huß
7166f83d84 Merge branch 'master' of github.com:gradido/gradido into 1948-delete-settings-animationcoin-in-database 2022-06-07 10:22:11 +02:00
Claus-Peter Hübner
74bcdaf8c4 add .project and correct .gitignore 2022-06-03 00:06:14 +02:00
ogerly
1e0e6e24b9 locales link german, english navbar 2022-06-02 21:46:18 +02:00
Moriz Wahl
06319f2c66
Merge pull request #1968 from gradido/version-1.9.0 
devops: Release Version 1.9.0
 2022-06-02 15:40:38 +02:00