5569 Commits

Author SHA1 Message Date
einhorn_b
8f81d81cfc ignore parsed file message.pot 2021-05-03 16:52:17 +02:00
einhorn_b
928cc0044d update parse proto with cmake, only if not exist or newer, change folder, update includes 2021-05-03 16:49:19 +02:00
einhorn_b
d1da7b72b2 update dependencie docker to allow different build types 2021-05-03 15:38:51 +02:00
einhornimmond
397069c932 add validation, check if user has tried to send themself gradidos, correct wrong spelling in ENUM 2021-05-03 15:32:19 +02:00
einhornimmond
c1a89d69c4 fix error with password reset email 2021-05-03 14:56:55 +02:00
einhornimmond
d6420a990b Merge branch 'master' into login_group_add_host 2021-05-03 12:01:02 +02:00
einhornimmond
d14e9b3e74 bugfix 2021-05-03 11:59:09 +02:00
einhornimmond
2e8786b05d update doc 2021-05-03 11:54:59 +02:00
einhornimmond
b88a7dd029 give balance as float value in GDD (not lpnger GDD cent) 2021-05-03 11:51:27 +02:00
ogerly
b12676bc2d css abstände vom rand in mobilen style 2021-05-03 11:41:52 +02:00
Moriz Wahl
1133e2c9b9 removed UserProfile.vue, tests for GddSend.vue 2021-04-30 17:10:21 +02:00
Moriz Wahl
d5ba30df6f renamed KontoOverview to AccountOverview. Moved AccountOverview folder into Pages folder 2021-04-30 15:34:52 +02:00
Moriz Wahl
1dad6dff06
Merge pull request #270 from gradido/test-store
refactor: Test and Clean Up Store
2021-04-30 13:07:37 +02:00
Moriz Wahl
ad89cd7b32 GDT / 10000 2021-04-30 12:39:05 +02:00
23abf89636
Merge pull request #267 from gradido/265-Disable-Settings-Activities
remove links to not work
2021-04-30 12:13:47 +02:00
ogerly
37f3689d7f fix test nabǘabr li elements from 5 to 3 2021-04-30 10:53:09 +02:00
Moriz Wahl
a353d2045c remove store update of GDT 2021-04-30 02:14:18 +02:00
Moriz Wahl
af329e3fdf createUser no longer in store 2021-04-30 01:28:53 +02:00
Moriz Wahl
64864277f0 coverage to 15% 2021-04-30 01:26:29 +02:00
Moriz Wahl
3f5c19c3e5 test and clean up store 2021-04-30 01:17:29 +02:00
83a54e15e8
Merge pull request #269 from gradido/dynamic-balance
change order of session_id
2021-04-29 22:26:11 +02:00
einhornimmond
4d15cda899 change order of session_id 2021-04-29 20:09:37 +02:00
Moriz Wahl
bf0c6098bc
Merge pull request #260 from gradido/dynamic-balance
bug: Dynamic Balance
2021-04-29 19:19:31 +02:00
Moriz Wahl
7713b68855 account balance is rendered dynamically on top of sidebar menu 2021-04-29 18:23:57 +02:00
Moriz Wahl
b7301c1219 Merge branch 'master' into dynamic-balance 2021-04-29 17:28:53 +02:00
Moriz Wahl
ab100d7a78 Merge branch 'dynamic-balance' of github.com:gradido/gradido into dynamic-balance 2021-04-29 17:16:12 +02:00
Moriz Wahl
cf41895459 Merge remote-tracking branch 'origin/login_group_add_host' into dynamic-balance 2021-04-29 17:06:37 +02:00
einhornimmond
312661f338 Merge branch 'community_bug_fix_27_04_2021' into dynamic-balance 2021-04-29 16:32:51 +02:00
einhornimmond
a2902baaad bugfix (but I think I had fixed that in past already) 2021-04-29 16:30:16 +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
a5912f4ac5
Merge pull request #261 from gradido/login_group_add_host
Fix problems with transactions in docker environment
2021-04-29 14:37:17 +02:00
einhornimmond
c3679a9c5b
Merge pull request #250 from gradido/skeema_bugfix
update skeema call to allow also for unsafe db updates
2021-04-29 14:36:19 +02:00
ogerly
30d8111771 yarn lint 2021-04-29 13:31:16 +02:00
Alexander Friedland
42368ca546
Merge pull request #266 from gradido/259-disable-register-flag
turn registration on and off
2021-04-29 12:56:02 +02:00
ogerly
ccf0c9a66b remove links to not work 2021-04-29 12:54:18 +02:00
ogerly
812a1d5f67 turn registration on and off- remove from dockerfile to .env 2021-04-29 12:31:47 +02:00
Alexander Friedland
2d97d6ddd1
Merge pull request #257 from gradido/243-vue-loader-component
243 vue loader component - varante 2
2021-04-29 12:31:02 +02:00
ogerly
d473069d0a turn registration on and off- remove VUE_APP_ 2021-04-29 12:06:55 +02:00
ogerly
7c3b5c72c6 turn registration on and off 2021-04-29 11:46:46 +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
Alexander Friedland
1bb0890e0a
Update frontend/src/views/Pages/Login.vue
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-04-29 06:36:30 +02:00
edd8172a53
Merge pull request #262 from gradido/fix_issue_templates
fix_issue_templates
2021-04-29 01:14:55 +02:00
ce2eac0f45
Merge pull request #253 from gradido/fix_nginx_docker
fix_nginx_docker
2021-04-29 00:22:08 +02:00
684acc523c
rework issue templates since "humanconnection" was still present, simplified all templates while doing this 2021-04-28 19:14:07 +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
59052b1123
fixed sockjs-node calls 2021-04-28 15:37:23 +02:00