Commit Graph

1799 Commits

Author SHA1 Message Date
Igor Scheller d0abc27c07 Merge remote-tracking branch 'MyIgel/translations' 2018-09-15 14:58:31 +02:00
Igor Scheller 13d2786b7b Moved scripts/copyAssets.js to resources folder and fixed formatting 2018-09-10 22:49:51 +02:00
marudor fc9fb14498 Asset step & script 2018-09-10 22:49:50 +02:00
Igor Scheller 8456a3cf6f Moved emojis to assets 2018-09-10 22:49:46 +02:00
Igor Scheller c1a1180d1f Moved frontend, templates and lang to resources 2018-09-10 18:22:48 +02:00
Igor Scheller 4bf3a68f43 Fixed assets rendering 2018-09-10 14:40:33 +02:00
Igor Scheller 222c9fed7d Merge remote-tracking branch 'MyIgel/templating' 2018-09-09 12:11:12 +02:00
msquare 2d6bca1357 Merge branch 'MyIgel-routing' 2018-09-07 20:50:31 +02:00
Igor Scheller ce6d0fd13b tests: fixed array() return 2018-09-04 21:44:34 +02:00
Igor Scheller b52444af8a Merge remote-tracking branch 'MyIgel/routing' 2018-09-04 21:13:28 +02:00
msquare b320fc7790 Merge branch 'MyIgel-rebuild-psr7' 2018-09-04 18:24:11 +02:00
Igor Scheller 36dafdb68a Merge remote-tracking branch 'MyIgel/rebuild-psr7' 2018-09-03 22:55:54 +02:00
Igor Scheller 9f1ee0c6c6 Fixups and cleanup for GitLab CI 2018-09-03 22:09:07 +02:00
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 5456fea503 $bugfixes 2018-08-29 23:46:32 +02:00
Igor Scheller 8257864829 Added translation support for twig templates
See https://twig-extensions.readthedocs.io/en/latest/i18n.html for documentation
2018-08-29 23:46:32 +02:00
Bot e8f8fc7f5f Replaced gettext translation `_()` with `__()` that uses the Translator class 2018-08-29 23:46:32 +02:00
Igor Scheller a2c47304d8 Added generic error pages 2018-08-29 23:46:32 +02:00
Igor Scheller 3a11641647 Updated LegacyMiddleware to use Translator class 2018-08-29 23:46:32 +02:00
Igor Scheller acfe72cb91 Removed translation from config file 2018-08-29 23:46:32 +02:00
Igor Scheller 427315195b Moved translation/internationalization to Helpers\Translator class 2018-08-29 23:46:31 +02:00
Igor Scheller df6360044b Added Twig template functions 2018-08-29 23:46:31 +02:00
Igor Scheller bb3d16d273 Added Twig template renderer, closes #338 2018-08-29 23:46:11 +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 a1bc763a16 Added nikic/fast-route as routing dispatcher 2018-08-25 21:48:39 +02:00
Igor Scheller 73c9d923e7 Renamed RoutingServiceProvider to Http\UrlGeneratorServiceProvider 2018-08-22 03:10:08 +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 b0e7bc0df2 Made Engelsystem\Http\Request PSR-7 ServerRequestInterface compatible 2018-08-20 17:43:15 +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