Moriz Wahl
|
cf41895459
|
Merge remote-tracking branch 'origin/login_group_add_host' into dynamic-balance
|
2021-04-29 17:06:37 +02:00 |
|
Moriz Wahl
|
4bfd57099a
|
Merge remote-tracking branch 'origin/community_bug_fix_27_04_2021' into dynamic-balance
|
2021-04-29 15:17:03 +02:00 |
|
einhornimmond
|
2b19eabca6
|
move insert scripts to prevent confusion, delete also old not used stuff from community_server
|
2021-04-29 11:39:16 +02:00 |
|
einhornimmond
|
803faf3b95
|
Merge branch 'login_group_add_host' of github.com:gradido/gradido into login_group_add_host
|
2021-04-29 11:16:34 +02:00 |
|
einhornimmond
|
f00ccc72dd
|
move from unfinished version to refined version
|
2021-04-29 11:16:18 +02:00 |
|
einhorn_b
|
a295a0b399
|
some more bugfixes
|
2021-04-28 18:09:30 +02:00 |
|
einhorn_b
|
b92d4ecff2
|
fix building error with proto
|
2021-04-28 17:34:37 +02:00 |
|
einhornimmond
|
bacc254638
|
add host to group to allow login-server making json-request to community-server in docker environment
|
2021-04-28 16:53:19 +02:00 |
|
|
|
419c7012e5
|
Merge pull request #255 from gradido/13_coverage
13_coverage
|
2021-04-28 13:27:35 +02:00 |
|
Moriz Wahl
|
6cae389a07
|
add src/LOCALE/message.pot to gitignore
|
2021-04-28 13:15:03 +02:00 |
|
einhornimmond
|
4d7401deb3
|
Merge pull request #244 from gradido/login_add_language_to_json_user
add language as fields which will be returned with user-object
|
2021-04-28 12:58:42 +02:00 |
|
einhornimmond
|
d84eb6b213
|
Merge pull request #252 from gradido/community_update_doc
add short description for target date in creation transaction
|
2021-04-28 12:58:14 +02:00 |
|
einhornimmond
|
3fe7909bc5
|
Merge pull request #251 from gradido/community_fix_mysql_error
fix error "Integrity constraint violation: 1052 Column 'id' in where …
|
2021-04-28 12:57:11 +02:00 |
|
|
|
c9abc65301
|
require 13% coverage
|
2021-04-28 11:13:53 +02:00 |
|
Alexander Friedland
|
4818aa1cab
|
Merge pull request #246 from gradido/clicks-on-button
Clicks on button
|
2021-04-28 09:00:36 +02:00 |
|
Moriz Wahl
|
ed0a0bdd16
|
Merge remote-tracking branch 'origin/login_fix_pending_task_default' into dynamic-balance
|
2021-04-27 23:37:43 +02:00 |
|
einhornimmond
|
c838e16c04
|
fix bug with missing default values
|
2021-04-27 23:25:27 +02:00 |
|
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 |
|
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
|
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 |
|
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 |
|
|
|
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 |
|
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
|
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 |
|
