Commit Graph

1704 Commits

Author SHA1 Message Date
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
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
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
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
msquare 2e1c2cf3b5 remove br between shift filter checkboxes 2018-01-22 20:45:31 +01:00
msquare 46431e4408
Merge pull request #417 from jbeyerstedt/feature/collapse-filters
shifts view: add button to collapse the filters
2018-01-22 20:39:08 +01:00
msquare 5ab7084896 fix icon font 2018-01-22 20:35:21 +01:00
msquare 7278d379cd
Merge pull request #416 from jbeyerstedt/feature/mobile-ui
shifts view: change breakpoints to fit more on smaller screens
2018-01-22 20:33:44 +01:00
Igor Scheller b2e5b5c44d Prevent empty string after $tokens = explode(' ', $search); 2018-01-03 01:47:34 +01:00
marudor 7af09433de Merge branch 'master' of https://github.com/engelsystem/engelsystem 2018-01-03 01:19:36 +01:00
marudor 7f722314e4 frontend stuff with babel and webpack 2018-01-03 01:19:31 +01:00
mia 75c282992a
Fixes issue:#401 for german 2018-01-02 20:52:55 +00:00
Jannik Beyerstedt d3fd3c427d shifts view: add button to collapse the filters 2018-01-01 22:16:41 +01:00
Jannik Beyerstedt d012468529 shifts view: change breakpoints to fit more on smaller screens 2018-01-01 22:12:26 +01:00
msquare ddadaada9d
Merge pull request #415 from miadia/patch-1
Fixes issue:#401
2018-01-01 18:54:40 +01:00
mia c83771ed62
Fixes #401
Display "shift started" instead of "shift starts" when shift has already started.
2018-01-01 16:55:59 +00:00
msquare 73ed2308c1 use user tshirt count 2017-12-30 13:59:41 +01:00
msquare b3ca550ed0 simplify t-shirt statistics 2017-12-30 13:40:24 +01:00
msquare 0314ba19e3 make got t-shirt always available 2017-12-30 13:37:26 +01:00
msquare c961269bb7 better hour formatting 2017-12-30 12:07:10 +01:00
msquare d66dc43aec fix worklog entry view 2017-12-29 19:08:57 +01:00
msquare 372f474dbc
Merge pull request #407 from engelsystem/feature-work-log
Feature work log
2017-12-29 19:06:23 +01:00
msquare 4579509b0e update german translation 2017-12-29 19:03:58 +01:00
msquare ee9fbda098 add work date to work log 2017-12-29 18:57:11 +01:00
msquare d95e488893 add work log creator infor 2017-12-29 17:37:08 +01:00
msquare be3652b44a fix work log logs 2017-12-29 17:30:54 +01:00
msquare 86a38a3372 add user work log entries feature 2017-12-29 17:19:27 +01:00
msquare e7b0e9934d add shift filter buttons at the top 2017-12-29 16:20:30 +01:00
msquare 14584b9611 small improvements of user view 2017-12-29 13:18:28 +01:00
msquare be6bd2f3d3 small improvements of user view 2017-12-29 13:13:45 +01:00
msquare 3993e553d1 small improvements of user view 2017-12-29 13:12:56 +01:00
msquare b59d17918e small improvements of user view 2017-12-29 13:09:35 +01:00
msquare 1a22a6d410 there are no 5xl shirts 2017-12-29 12:43:20 +01:00
msquare b2c54d8e54 fair distribution of shirt sizes 2017-12-28 15:08:48 +01:00
msquare c3b8fa892d tshirt-score for forced active 2017-12-27 20:30:05 +01:00
msquare 8c64532902 fix ical export description 2017-12-27 15:06:39 +01:00
msquare 84954a5812 fix merge 2017-12-27 14:54:15 +01:00
msquare 5792c96eaa fix own button 2017-12-27 14:51:08 +01:00
msquare 752ccdc482 merge 2017-12-27 14:44:44 +01:00
msquare e0ce3168e2
Merge pull request #397 from MyIgel/master
Filter angel types based on account settings, closes  #362
2017-12-27 14:41:07 +01:00
Bot b00743d6d3 Formatting 2017-12-27 13:50:53 +01:00