Commit Graph

1965 Commits

Author SHA1 Message Date
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
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 235266ec53 Added basic database migration functionality 2018-01-16 21:47:21 +01:00
Igor Scheller e44ba84561 Refactoring: moved application bootstrapping to bootstrap.php 2018-01-16 19:56:05 +01:00
Igor Scheller 78cddecef3 DatabaseServiceProvider: Added unit tests 2018-01-15 23:31:19 +01:00
Igor Scheller 0d154365a2 models: return null on empty result 2018-01-14 23:07:34 +01:00
Igor Scheller 646ffc1910 $bugfixes... 2018-01-14 18:50:37 +01:00
Bot 5227fe6a94 Formatting 2018-01-14 18:09:34 +01:00
Igor Scheller fe58e4f422 database: updated checks for selectOne 2018-01-14 17:47:26 +01:00
Igor Scheller 0e8cc2f0a7 database: integrated illuminate/database do Db class, removed unused methods 2018-01-14 13:32:57 +01:00
Igor Scheller d4b36e9bad Added Illuminate/Database 2018-01-14 02:59:39 +01:00
Igor Scheller e0b58d2a7d Added illuminate/support and Fluent Interface to Config 2018-01-14 01:45:23 +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