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

7801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
einhornimmond
e82d4d6598 add short description for target date in creation transaction 2021-04-27 19:44:50 +02:00
einhornimmond
41a5b269fc add some more 2021-04-27 19:33:44 +02:00
einhornimmond
67326c7840 fix error "Integrity constraint violation: 1052 Column 'id' in where clause is ambiguous" 2021-04-27 19:19:32 +02:00
einhornimmond
fea2c176b4 update skeema call to allow also for unsafe db updates 2021-04-27 18:58:19 +02:00
Moriz Wahl
c69845d4ca Merge remote-tracking branch 'origin/community_bug_fix_27_04_2021' into dynamic-balance 2021-04-27 16:29:50 +02:00
Moriz Wahl
a24b231547 rename method to update balance 2021-04-27 16:29:45 +02:00
Dario Rekowski on RockPI
8ba26803bc fix bug with object instead of array 2021-04-27 14:19:12 +00:00
Moriz Wahl
cd9d25aa12 setup for dynamic handling of user balance 2021-04-27 16:05:24 +02:00
ogerly
1571506d45 yarn lint 2021-04-27 14:03:07 +02:00
ogerly
e94e04adb5 clicks auf button 2021-04-27 14:02:20 +02:00
Alexander Friedland
b66ee2d527
Merge pull request #231 from gradido/change-css 
Change css
 2021-04-27 13:55:44 +02:00
einhornimmond
5ac4d7661a added publisher_id field to user 
- it can be retrieved with getUserInfos
- it can be changed with updateUserInfos
 2021-04-27 13:54:06 +02:00
einhornimmond
fb1449a69b add language as fields which will be returned with user-object 2021-04-27 13:14:38 +02:00
Alexander Friedland
dbc3277fcf
ok 2021-04-27 11:56:37 +02:00
ogerly
8d27ce4cb4 remove .pointer:hover 2021-04-27 11:53:58 +02:00
Moriz Wahl
2ebf1d70a4
Merge pull request #212 from gradido/reset-password 
feat: Reset Password
 2021-04-27 11:49:24 +02:00
ogerly
a784a698b8 Merge branch 'master' of https://github.com/gradido/gradido 2021-04-27 11:47:26 +02:00
Alexander Friedland
c30a419820
Merge pull request #228 from gradido/221-Mouse_Pointer_on_Hover_over_Clickable_Items 
fix bug #221
 2021-04-27 11:24:33 +02:00
einhorn_b
68f3c3736d update modules 2021-04-27 11:04:04 +02:00
einhornimmond
018f71e5f2
Merge pull request #227 from gradido/fix_login_empty_reply_group_id_0 
fix empty reply by empty group_id
 2021-04-27 10:56:43 +02:00
ogerly
1813b9917c Merge branch 'master' of https://github.com/gradido/gradido 2021-04-27 09:50:21 +02:00
ogerly
bb23e178cd href to css pointer 2021-04-27 09:38:06 +02:00
ogerly
ca865958eb add toggle() methode 2021-04-27 09:27:26 +02:00
ogerly
7e5495bd34 href to css cursor pointer 2021-04-27 09:21:00 +02:00
Ulf Gebhardt
4fe9b0c772
Merge pull request #226 from gradido/bugfix_22_04_21 
Bugfix 22 04 21
 2021-04-27 01:51:18 +02:00
Moriz Wahl
c9cabd5bed undo changes on dockerfile debug 2021-04-27 01:02:34 +02:00
Moriz Wahl
1fde044403 Revert "Revert "update login-server build, allow create user without group"" 
This reverts commit 5de88f3a42dda18d734e9dd5de499634155725d0.
 2021-04-27 00:58:28 +02:00
Moriz Wahl
a0dc2531ff password can be reseted 2021-04-27 00:32:38 +02:00
einhorn_b
bd2c065cab Merge branch 'login_build_without_conan' of /home/einhornimmond/code/gradido_conan_remove into login_build_without_conan 2021-04-27 00:05:49 +02:00
einhorn_b
604755db15 rebuilding debug build strategie for minimum space and time requirements for user 2021-04-27 00:05:40 +02:00
Moriz Wahl
cd7f864a49 Merge branch 'master' into reset-password 2021-04-26 23:21:48 +02:00
Moriz Wahl
5ae77c8eed merge master 2021-04-26 18:33:34 +02:00
ogerly
92ba58858d fix bug #221 2021-04-26 14:23:18 +02:00
ogerly
19243b9a27 new clone und docker-compose up build 2021-04-26 12:56:01 +02:00
einhorn_b
0255465b5c test and fix login release docker build 2021-04-23 22:39:56 +02:00
einhorn_b
c3022a8849 update release build 2021-04-23 21:20:32 +02:00
einhorn_b
a398d4f975 build without conan 2021-04-23 20:59:11 +02:00
einhorn_b
7f7b363c9c fix empty reply by empty group_id 2021-04-23 17:21:23 +02:00
einhornimmond
75be488fab
Merge pull request #225 from gradido/rollback_use_prebuild_dependencies 
Rollback use prebuild dependencies
 2021-04-23 14:40:28 +02:00
einhorn_b
2fa088c232 Merge branch 'master' into bugfix_22_04_21 2021-04-23 14:12:57 +02:00
einhorn_b
f9a8e8979c Merge branch 'master' of github.com:gradido/gradido 2021-04-23 14:10:00 +02:00
einhorn_b
e3e968b24f fix exception for unlock on false place, maybe from merging stage1 with stage2 2021-04-23 14:09:43 +02:00
Ulf Gebhardt
e859dc5e8d
Merge pull request #199 from gradido/docu 
Docu
 2021-04-22 22:48:16 +02:00
einhorn_b
c704ca1a95 fix some missed out things 2021-04-22 20:06:04 +02:00
einhorn_b
c458e226fb remove conan volume because no used here 2021-04-22 19:10:06 +02:00
einhorn_b
c463a15db2 use again prebuild dependencies, but with code mounted from filesystem 2021-04-22 19:09:04 +02:00
Moriz Wahl
5de88f3a42 Revert "update login-server build, allow create user without group" 
This reverts commit db15f9c4381fa2ac9c1cc88b9ecaf74cac394240.
 2021-04-22 19:04:32 +02:00
einhorn_b
8e1d1aa0ae fix handlung of empty transactions list 2021-04-22 17:00:20 +02:00
einhorn_b
0c68dbde9d fixing wrong var name 2021-04-22 16:56:05 +02:00
einhorn_b
33f9c58268 fix } which don't belong there 2021-04-22 16:52:14 +02:00