einhornimmond
4d15cda899
change order of session_id
2021-04-29 20:09:37 +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
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
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
938ff6c6a4
reverted .htaccess
2021-04-28 14:20:47 +02:00
ogerly
f3357b4a87
add yarn.lock
2021-04-28 13:29:01 +02:00
419c7012e5
Merge pull request #255 from gradido/13_coverage
...
13_coverage
2021-04-28 13:27:35 +02:00
ogerly
13e4bfff1d
clear branch
2021-04-28 13:16:53 +02:00
Moriz Wahl
6cae389a07
add src/LOCALE/message.pot to gitignore
2021-04-28 13:15:03 +02:00
Alexander Friedland
605c3f7614
Apply suggestions from code review
...
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-04-28 13:13:18 +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
ogerly
f94d1e8680
fix yarn lint
2021-04-28 12:53:08 +02:00
ogerly
df28df98d9
spinner on component
2021-04-28 12:52:23 +02:00
c9abc65301
require 13% coverage
2021-04-28 11:13:53 +02:00
ogerly
c5967c3f8d
loading spinner on login
2021-04-28 11:11:48 +02:00
4720391599
nginx fix for vue interface
...
- localhost/vue resolves to frontend
- localhost:3000/vue resolves to frontend in development
- images are resolved properly
- remaining services are reachable as normal
- fixed image path to be relative instead of absolute
- cleaned nginx config
2021-04-28 11:08:41 +02:00
4eb712e217
fixed frontend production docker build & refactored frontend file structure
...
- frontend server runs on port 3000 by default
- frontend production docker build successfully runs & builds
- frontend production docker build is no longer reachable from the outside
- moved server.js in subfolder run/
2021-04-28 11:07:59 +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
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
