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

9903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
3e1e493ad0
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-11 13:32:55 +02:00
Hannes Heine
10ad232a47
Merge pull request #2123 from gradido/2117-list-contribution-links-for-all-users 
Add RIGHTS.LIST_CONTRIBUTION_LINKS to ROLE_USER
 2022-08-11 11:35:41 +02:00
Hannes Heine
186eaf238a
Merge branch 'master' into 2117-list-contribution-links-for-all-users 2022-08-11 11:17:29 +02:00
Wolfgang Huß
ef8c8619f3 Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests 2022-08-11 11:16:21 +02:00
Wolfgang Huß
9d5325c199 Fix date tests 
Co-Authored-By: elweyn <heine.hannes@gmail.com>
 2022-08-11 11:12:55 +02:00
Alexander Friedland
afe9a53a5c
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-11 10:59:55 +02:00
Alexander Friedland
826bd6892d
Update frontend/src/components/Menu/Navbar.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-11 10:59:20 +02:00
Alexander Friedland
cd28695844
Merge pull request #2122 from gradido/2121-Translate-locales-to-Spanish 
2121 translate locales to spanish
 2022-08-11 10:58:52 +02:00
Wolfgang Huß
59f415bd0a Add some comments for trying to fullfil Moriz suggestion 2022-08-11 08:50:40 +02:00
Wolfgang Huß
24c763c00f Remove comments in favor of an issue 2022-08-10 16:54:51 +02:00
Moriz Wahl
f98f38773d fix missing translations 2022-08-10 15:57:30 +02:00
Moriz Wahl
6d2cbfbab1 add number and date formats for locale es 2022-08-10 15:57:13 +02:00
Wolfgang Huß
2aff9d7f41 Merge branch 'master' of github.com:gradido/gradido into 2091-refactor-contribution-form-logic-and-write-tests 
# Conflicts:
#	frontend/src/components/Contributions/ContributionForm.vue
 2022-08-10 14:39:25 +02:00
Hannes Heine
e7c989da60
Merge branch 'master' into 2116-retrieve-admin-and-moderators 2022-08-10 11:31:09 +02:00
elweyn
c46f2f241e Create resolver method to query admin and moderator users. 2022-08-10 11:28:21 +02:00
elweyn
304732bdad Add model for AdminUser 2022-08-10 11:27:27 +02:00
elweyn
d0d4b151dc Add rights and roles to query admins and moderators. 2022-08-10 11:27:05 +02:00
Claus-Peter Hübner
22ad836f9d add new requirements from architecture mtg 2022-08-10 02:28:08 +02:00
Claus-Peter Hübner
0aafa02498 Merge remote-tracking branch 'origin/master' into 2072-feature-usecase-contribution-messaging 2022-08-10 00:05:34 +02:00
Claus-Peter Hübner
cd71bf7661 linting 2022-08-09 23:59:13 +02:00
Claus-Peter Hübner
2b4e94ef66 add gradidoID-Test during createUser 2022-08-09 23:41:39 +02:00
Claus-Peter Hübner
35da60c572 change User to create a gradidoID as uuidv4 during createUser 2022-08-09 23:36:00 +02:00
Claus-Peter Hübner
9533254618 upgrade DB-Version 2022-08-09 23:33:58 +02:00
Claus-Peter Hübner
14229edf59 install uuid package 2022-08-09 20:52:07 +02:00
Claus-Peter Hübner
37c5015079 add gradidoId in users table 2022-08-09 20:50:10 +02:00
Claus-Peter Hübner
7686c80546 install uuid package 2022-08-09 20:11:58 +02:00
Alexander Friedland
6ee5734499
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:26:10 +02:00
Alexander Friedland
a72c6cc827
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:25:38 +02:00
Alexander Friedland
dce0038169
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:25:29 +02:00
Alexander Friedland
200af0ebd7
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:25:09 +02:00
Alexander Friedland
81fd9910aa
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:24:56 +02:00
Alexander Friedland
99d23990dd
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:24:07 +02:00
Alexander Friedland
36e86438b1
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:23:57 +02:00
Alexander Friedland
05fb34fc80
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:23:45 +02:00
Alexander Friedland
262bde615c
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:23:35 +02:00
Alexander Friedland
a1a103bb6d
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:23:14 +02:00
Alexander Friedland
7e94822d94
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:23:01 +02:00
Alexander Friedland
08b439a53d
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:22:47 +02:00
Alexander Friedland
506ba5b625
Update frontend/src/locales/es.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-09 14:22:36 +02:00
ogerly
0284ecb926 add missing values 2022-08-09 08:54:04 +02:00
Alexander Friedland
bd8dcbc013
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-08 20:03:17 +02:00
Alexander Friedland
1b012365f1
Merge branch 'master' into 2121-Translate-locales-to-Spanish 2022-08-08 20:02:55 +02:00
Alexander Friedland
eed27a82d5
Merge pull request #2115 from gradido/2112-Thousand-separator-problem 
add formatter on input amount replace point and comma
 2022-08-08 17:08:16 +02:00
ogerly
3a2f27f519 refactor amount to string in ContributionForm, fix thousand error 2022-08-08 16:57:14 +02:00
ogerly
1fbea40c4d remove regex 2022-08-08 15:27:42 +02:00
Alexander Friedland
adef450bd0
Update ContributionForm.vue 2022-08-08 15:24:50 +02:00
Alexander Friedland
dbbec33f73
Merge branch 'master' into 2112-Thousand-separator-problem 2022-08-08 15:11:58 +02:00
Alexander Friedland
87db1c36ce
Merge branch 'master' into 2119-New-menu-item-GDT 2022-08-08 15:11:54 +02:00
Alexander Friedland
5273edace6
Merge branch 'master' into 2121-Translate-locales-to-Spanish 2022-08-08 15:11:48 +02:00
Alexander Friedland
2548a4f38f
Merge pull request #2114 from gradido/2113-Delete-textarea-info-message 
remove required from form.memo
 2022-08-08 15:11:02 +02:00