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
|
7 years ago |
|
msquare
|
6dbec2e2fb
|
remove unused code
|
7 years ago |
|
msquare
|
197f6629b3
|
Update README.md
|
7 years ago |
|
msquare
|
0f1da65f2a
|
Merge pull request #421 from MyIgel/master
Prevent empty string after $tokens = explode(' ', $search);
|
7 years ago |
|
msquare
|
8a553366cc
|
Merge pull request #420 from miadia/patch-2
Fixes issue:#401 for german
|
7 years ago |
|
msquare
|
2e1c2cf3b5
|
remove br between shift filter checkboxes
|
7 years ago |
|
msquare
|
46431e4408
|
Merge pull request #417 from jbeyerstedt/feature/collapse-filters
shifts view: add button to collapse the filters
|
7 years ago |
|
msquare
|
5ab7084896
|
fix icon font
|
7 years ago |
|
msquare
|
7278d379cd
|
Merge pull request #416 from jbeyerstedt/feature/mobile-ui
shifts view: change breakpoints to fit more on smaller screens
|
7 years ago |
|
Igor Scheller
|
235266ec53
|
Added basic database migration functionality
|
7 years ago |
|
Igor Scheller
|
e44ba84561
|
Refactoring: moved application bootstrapping to bootstrap.php
|
7 years ago |
|
Igor Scheller
|
78cddecef3
|
DatabaseServiceProvider: Added unit tests
|
7 years ago |
|
Igor Scheller
|
0d154365a2
|
models: return null on empty result
|
7 years ago |
|
Igor Scheller
|
646ffc1910
|
$bugfixes...
|
7 years ago |
|
Bot
|
5227fe6a94
|
Formatting
|
7 years ago |
|
Igor Scheller
|
fe58e4f422
|
database: updated checks for selectOne
|
7 years ago |
|
Igor Scheller
|
0e8cc2f0a7
|
database: integrated illuminate/database do Db class, removed unused methods
|
7 years ago |
|
Igor Scheller
|
d4b36e9bad
|
Added Illuminate/Database
|
7 years ago |
|
Igor Scheller
|
e0b58d2a7d
|
Added illuminate/support and Fluent Interface to Config
|
7 years ago |
|
Igor Scheller
|
b2e5b5c44d
|
Prevent empty string after $tokens = explode(' ', $search);
|
7 years ago |
|
marudor
|
7af09433de
|
Merge branch 'master' of https://github.com/engelsystem/engelsystem
|
7 years ago |
|
marudor
|
7f722314e4
|
frontend stuff with babel and webpack
|
7 years ago |
|
mia
|
75c282992a
|
Fixes issue:#401 for german
|
7 years ago |
|
Jannik Beyerstedt
|
d3fd3c427d
|
shifts view: add button to collapse the filters
|
7 years ago |
|
Jannik Beyerstedt
|
d012468529
|
shifts view: change breakpoints to fit more on smaller screens
|
7 years ago |
|
msquare
|
ddadaada9d
|
Merge pull request #415 from miadia/patch-1
Fixes issue:#401
|
7 years ago |
|
mia
|
c83771ed62
|
Fixes #401
Display "shift started" instead of "shift starts" when shift has already started.
|
7 years ago |
|
msquare
|
73ed2308c1
|
use user tshirt count
|
7 years ago |
|
msquare
|
b3ca550ed0
|
simplify t-shirt statistics
|
7 years ago |
|
msquare
|
0314ba19e3
|
make got t-shirt always available
|
7 years ago |
|
msquare
|
c961269bb7
|
better hour formatting
|
7 years ago |
|
msquare
|
d66dc43aec
|
fix worklog entry view
|
7 years ago |
|
msquare
|
372f474dbc
|
Merge pull request #407 from engelsystem/feature-work-log
Feature work log
|
7 years ago |
|
msquare
|
4579509b0e
|
update german translation
|
7 years ago |
|
msquare
|
ee9fbda098
|
add work date to work log
|
7 years ago |
|
msquare
|
d95e488893
|
add work log creator infor
|
7 years ago |
|
msquare
|
be3652b44a
|
fix work log logs
|
7 years ago |
|
msquare
|
86a38a3372
|
add user work log entries feature
|
7 years ago |
|
msquare
|
e7b0e9934d
|
add shift filter buttons at the top
|
7 years ago |
|
msquare
|
14584b9611
|
small improvements of user view
|
7 years ago |
|
msquare
|
be6bd2f3d3
|
small improvements of user view
|
7 years ago |
|
msquare
|
3993e553d1
|
small improvements of user view
|
7 years ago |
|
msquare
|
b59d17918e
|
small improvements of user view
|
7 years ago |
|
msquare
|
1a22a6d410
|
there are no 5xl shirts
|
7 years ago |
|
msquare
|
b2c54d8e54
|
fair distribution of shirt sizes
|
7 years ago |
|
msquare
|
c3b8fa892d
|
tshirt-score for forced active
|
7 years ago |
|
msquare
|
8c64532902
|
fix ical export description
|
7 years ago |
|
msquare
|
84954a5812
|
fix merge
|
7 years ago |
|
msquare
|
5792c96eaa
|
fix own button
|
7 years ago |
|
msquare
|
752ccdc482
|
merge
|
7 years ago |