Commit Graph

1765 Commits

Author SHA1 Message Date
msquare 2c1c00e9c9 Merge branch 'MyIgel-gitlab-build-docker' 2018-09-03 21:43:41 +02:00
Igor Scheller 8e0afd4d59 Merged build-docker-ci to master 2018-09-02 17:56:19 +02:00
msquare a103bc06e2
Merge pull request #452 from MyIgel/rebuild-database
Rebuild database
2018-09-02 16:55:35 +02:00
Igor Scheller 2bebbeb191 Installation: Added migrations for install.sql and update.sql files 2018-08-30 16:07:50 +02:00
Igor Scheller ffd81f22b6 CI: Always add artifacts 2018-08-30 13:33:16 +02:00
Igor Scheller 175c335810 Db::selectOne() should return null if result is empty 2018-08-29 18:11:35 +02:00
Igor Scheller 6ee738f82b Merge branch 'master' into rebuild-database 2018-08-29 16:01:51 +02:00
Nos- bd8ceda683 Revert "Tried to fix inputfields for date, email, tel"
This reverts commit 80f3bb5154a215d9fb5627559fa240acccab09c4.
2018-08-28 18:33:15 +02:00
Nos- ac6361b51b Tried to fix inputfields for date, email, tel 2018-08-28 18:33:15 +02:00
Nos- ee3e4193c5 Commented the german translation according to Issue #312 . 2018-08-28 18:33:15 +02:00
Nos- 5a9a256f26 Improved german translation. 2018-08-28 18:33:15 +02:00
msquare 1090d5e889
Update shifts_controller.php
fix problem when missing needed angeltype entry
2018-08-28 18:28:09 +02:00
Igor Scheller 81890b6570 Build docker image with gitlab 2018-08-21 19:26:10 +02:00
Igor Scheller d93ace2eae Prevent object serialization in session 2018-08-20 21:08:06 +02:00
Igor Scheller d6c8f1a614 Merge branch 'master' to 'rebuild-database' 2018-08-20 21:07:57 +02:00
Igor Scheller bf6efe532c Added trusted proxies 2018-08-19 16:44:33 +02:00
Igor Scheller 6415882b1c docker: compose: Added internal networks 2018-08-19 16:44:33 +02:00
Igor Scheller c3c84a02f3 Made more options configurable over environment variables 2018-08-19 16:44:33 +02:00
Igor Scheller 7c48b69806 Docker: Fixed Dockerfile to build new setup 2018-08-19 16:44:33 +02:00
Igor Scheller fd709f084e Readme: Documented database import and added mail config hint 2018-08-19 16:44:33 +02:00
Igor Scheller 8ed3ed3a77 Moved docker files to contrib, added documentation 2018-08-19 16:44:33 +02:00
marudor d7ba51b3ec more env as variables 2018-08-19 16:44:33 +02:00
marudor a65d92f04e correctly config nginx 2018-08-19 16:44:33 +02:00
marudor 85bf3ee580 rewrite urls to handle php routing 2018-08-19 16:44:33 +02:00
marudor 2391952437 initial Docker stuff 2018-08-19 16:44:33 +02:00
Igor Scheller d243090fea config: allow renaming of config.default.php to config.php
Closes #444 (Problems after installation)
2018-08-12 17:38:36 +02:00
Igor Scheller f46e921b71 Use domain for links to '/' to fix assets URLs on subdirectories 2018-08-12 17:36:52 +02:00
msquare 98b03d5c67
Merge pull request #446 from engelsystem/marudor-master
js codestyle
2018-08-12 13:06:05 +02:00
msquare 2d5aed1fed js codestyle 2018-08-12 13:01:03 +02:00
msquare df30f7d5d8 merge pr #427: Use npm to handle frontend dependencies 2018-08-12 12:42:58 +02:00
Jens Brandt b409d2986f rename hotfix to camelCase 2018-08-12 12:35:40 +02:00
Jens Brandt 7f270c1d26 rename hotfix to english 2018-08-12 12:35:40 +02:00
Jens Brandt a3cf3a0ee1 Hotfix php7 syntax error 2018-08-12 12:35:40 +02:00
msquare d9ebc2daec remove json export all shifts 2018-08-12 12:35:40 +02:00
Bot 28349b69a8 Changed JS to use single quotes instead of double quotes 2018-08-11 22:16:57 +02:00
Igor Scheller 2f41b9e441 Moved deploy.sh to bin folder 2018-08-07 16:54:08 +02:00
msquare c55ae7c319 fix tests for linkTo 2018-08-06 16:53:30 +02:00
msquare 2832fe48ee rename some params (codestyle) 2018-08-06 13:10:53 +02:00
msquare 9496e35711 added comments and renamed short method to url generators 2018-08-06 12:57:48 +02:00
msquare 86b2937078 added comments and renamed short method to url generators 2018-08-06 12:50:34 +02:00
msquare 5a83d4fb8b fix broken css class on main menu angel icon 2018-08-06 12:33:08 +02:00
msquare a3ce3ea23d
Merge pull request #443 from MyIgel/legacy-url-support
UrlGeneratorInterface and "Legacy URL" support
2018-08-06 12:30:30 +02:00
Igor Scheller 6962c2b790 Legacy URL Support 2018-08-05 21:46:05 +02:00
Igor Scheller 3d245660c5 Updated .gitlab-ci.yaml to create a release archive 2018-08-05 17:28:10 +02:00
marudor 7f70b906e8
No hardcoded publicPath for assets 2018-08-05 13:15:37 +02:00
msquare 9ca36bed34
Merge pull request #442 from MyIgel/tests-fix-for-hotfix-431
Fixes tests after #431 (Hotfix php7 syntax error)
2018-08-05 10:59:39 +02:00
Igor Scheller 46e7fc89b4 Fixed tests after #431: Hotfix php7 syntax error 2018-08-04 22:21:13 +02:00
msquare de0ac90675 php version 2018-08-04 11:41:27 +02:00
marudor db16772d01
Explose form Functions as globals 2018-08-03 13:58:33 +02:00
Igor Scheller 608fb3dad6 Updated .gitlab-ci.yaml and other files to build the frontend 2018-08-03 12:56:33 +02:00