1011 Commits

Author SHA1 Message Date
einhornimmond
17c9b9fb8f change port for phpmyadmin because was conflicted with frontend 2021-02-18 15:42:59 +01:00
ogerly
ffe728173c add json data example for admin area 2021-02-18 14:15:49 +01:00
einhornimmond
30d995e48e last fixes, now login-server and community-server are running with docker :) 2021-02-18 14:00:05 +01:00
einhornimmond
9ee72fb8f2 add phpmyadmin for db debugging, fix mariadb code, insert use table at beginning of sql files 2021-02-18 13:27:19 +01:00
einhornimmond
6c648b3f99 remove \ from nginx.conf there where wrong copied from my setup scripts 2021-02-17 20:28:02 +01:00
einhornimmond
7780bdc3c6 create tmp and logs folder and make it accessable, normally composer script does that, but it didn't seems to work inside docker 2021-02-17 20:27:22 +01:00
einhornimmond
7126bb51da Merge branch 'master' of github.com:gradido/gradido 2021-02-17 20:10:54 +01:00
einhornimmond
c14f5d2e89 move nginx out of community_server because normally only on application is running in a docker container 2021-02-17 20:10:34 +01:00
einhornimmond
4d2308eb8a change dockerfile to able to copy app.php from configs 2021-02-17 20:07:22 +01:00
9237df9a27
typo 2021-02-17 19:38:07 +01:00
4602f28958
updated README.md to contain some basic infos 2021-02-17 19:37:16 +01:00
c0c8454d94
epic issue type 2021-02-17 19:12:08 +01:00
f1271305e2
specified issue templates 2021-02-17 19:07:11 +01:00
0b5917f5be
plain issue & pull request templates 2021-02-17 19:04:17 +01:00
einhornimmond
1323f16c17 work on login-server and community-server config 2021-02-17 16:45:53 +01:00
einhornimmond
e4508f2be7 Merge branch 'stage1' of github.com:gradido/gradido_community_server into stage1 2021-02-17 16:44:41 +01:00
einhornimmond
f93b632ef5 correct nginx config 2021-02-17 16:44:22 +01:00
einhornimmond
46daa8fc8a adding my stuff for login_server and community_server 2021-02-16 14:23:53 +01:00
einhornimmond
84d60a111c Merge branch 'stage1' of github.com:gradido/gradido_community_server into stage1 2021-02-16 12:28:34 +01:00
einhornimmond
8c755f83ba Merge branch 'stage0' of ssh://**REDACTED**/~/_cakephp/gradido_single_node into stage1 2021-02-16 12:27:45 +01:00
einhornimmond
644ff4dbd0 remove constraint, because it don't work with mariadb 2021-02-16 10:41:20 +01:00
Dario Rekowski on RockPI
1f875f1c96 change call for csfr token to get 2021-02-16 09:19:54 +00:00
Dario Rekowski on RockPI
138ad755a2 add ajax call for getting csfr token 2021-02-16 08:57:24 +00:00
einhornimmond
ed53ee7cf4 fix folder 2021-02-15 19:06:39 +01:00
einhornimmond
55e9e293af update wrong folder name 2021-02-15 18:35:03 +01:00
einhornimmond
8e04884ab0 add login server config files, insert my docker-compose code 2021-02-15 18:33:14 +01:00
einhornimmond
e450936a9d add infos for creating dbs for login- and community-server 2021-02-15 18:24:47 +01:00
einhornimmond
fb5e804e41 add login-server and community-server from branch stage1 2021-02-15 16:47:34 +01:00
Pauls Jakovels
4e87b8a4aa added gn 2021-02-15 10:01:15 +02:00
einhornimmond
f61fc5065a prevent warnings 2021-02-13 17:43:42 +01:00
einhornimmond
4de85b3e20 add configs for docker build 2021-02-13 17:23:59 +01:00
ogerly
f35b891758 fix add axios and example json for useroverview 2021-02-12 14:35:18 +01:00
Alexander Friedland
775851ec48
Merge pull request #8 from gradido/1-qr-reader
Merge pull request #1 from gradido/master
2021-02-12 08:48:13 +01:00
Alexander Friedland
142431d1a9
Merge pull request #6 from gradido/2-create_a_dockerfile_for_the_frontend_application
[WIP] 2 create a dockerfile for the frontend application
2021-02-12 08:44:26 +01:00
Alexander Friedland
a30946d74b
Merge branch '1-qr-reader' into 2-create_a_dockerfile_for_the_frontend_application 2021-02-12 08:43:30 +01:00
Alexander Friedland
398c0b40c3
delete old Dockerfile 2021-02-12 08:38:00 +01:00
Alexander Friedland
19c1a989a7
Merge pull request #1 from gradido/master
Master - first step
2021-02-12 08:23:45 +01:00
1731988ae7
use ssh instead of http for submodule 2021-02-11 20:13:35 +01:00
einhornimmond
32e178b43b rename insert sql file 2021-02-11 18:24:16 +01:00
ogerly
c86236fd24 docker-compose and frontend update 2021-02-11 15:55:04 +01:00
Alexander Friedland
2e0b9d9aaa
Merge pull request #7 from gradido/add_docker_compose
Add docker compose
2021-02-11 15:51:43 +01:00
Alexander Friedland
03b5b4d00a
Merge branch 'master' into add_docker_compose 2021-02-11 15:51:28 +01:00
ogerly
bbb87c54d5 Add Dockerfile 2021-02-11 15:48:32 +01:00
ogerly
3329da3af4 add submodul frontend 2021-02-11 15:12:16 +01:00
7ed8920f2d
moved images to docu folder 2021-02-11 14:57:36 +01:00
ogerly
2ba566b00a update README for docker 2021-02-11 12:39:27 +01:00
ogerly
509455c4d8 add Dockerfile 2021-02-10 20:54:42 +01:00
Dario Rekowski on RockPI
b782d0f3ab update composer because of error from cakephp 2021-02-10 09:30:16 +00:00
Alexander Friedland
0261535ba4
Update README 2021-02-09 14:07:38 +01:00
Alexander Friedland
447328b2e4
Merge branch '1-qr-reader' into master 2021-02-09 11:22:43 +01:00