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 |
|
marudor
|
ccd061d3cb
|
Correctly expose jquery
|
2018-08-03 11:35:44 +02:00 |
|
msquare
|
3c1bb5c8b4
|
Merge pull request #431 from froscon/hotfix
Hotfix php7 syntax error
|
2018-05-15 15:09:42 +02:00 |
|
Jens Brandt
|
4a5ef5f98a
|
rename hotfix to camelCase
|
2018-05-14 21:21:50 +02:00 |
|
Jens Brandt
|
cfc2493bb5
|
rename hotfix to english
|
2018-05-14 21:08:15 +02:00 |
|
Jens Brandt
|
28fadbd19d
|
Hotfix php7 syntax error
|
2018-05-10 15:29:32 +02:00 |
|
Igor Scheller
|
fb1e604363
|
Added Yarn install
|
2018-05-03 18:06:54 +02:00 |
|
marudor
|
ba4ab7dbc1
|
add documentation, include old custom font again
|
2018-05-03 17:33:49 +02:00 |
|
msquare
|
ae4dbf95ba
|
remove json export all shifts
|
2018-02-21 16:10:13 +01:00 |
|
marudor
|
757d879469
|
changes based on igels review
|
2018-02-08 23:01:43 +01:00 |
|
marudor
|
71b41847e6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/css/theme0.css
# public/css/theme1.css
# public/css/theme2.css
# public/css/theme3.css
# public/css/theme4.css
# public/css/theme5.css
# public/css/theme6.css
|
2018-02-08 22:57:41 +01:00 |
|
msquare
|
6dbec2e2fb
|
remove unused code
|
2018-01-28 14:52:26 +01:00 |
|
msquare
|
197f6629b3
|
Update README.md
|
2018-01-28 14:29:13 +01:00 |
|
msquare
|
0f1da65f2a
|
Merge pull request #421 from MyIgel/master
Prevent empty string after $tokens = explode(' ', $search);
|
2018-01-22 20:48:59 +01:00 |
|
msquare
|
8a553366cc
|
Merge pull request #420 from miadia/patch-2
Fixes issue:#401 for german
|
2018-01-22 20:48:35 +01:00 |