Commit Graph

1979 Commits (25bf0d8f873f80401f27cf0723548f5b1396de85)
 

Author SHA1 Message Date
Robert Oehlmann 4edaa26911 Fixed shift edit/delete URLs in new layout
Philip Häusler 785fd45d3a fix register privilege
Philip Häusler 4931fbb372 replace icons with glyphicons
Philip Häusler bd2a8b441f clear up mvc for user list
Philip Häusler 1d9e1c467c user list rewritten
Philip Häusler 0f77edc4fb hint for disabled registration
Philip Häusler e4a042c8c3 clear userlist
Philip Häusler f06e4a0f47 move user messages to menu icon right
Philip Häusler 07b6541204 move language to submenu
Philip Häusler 094715e6ee optimize navbar for 1024 px width
Philip Häusler 086ddc2248 better application name
Philip Häusler 50fea6d371 fix session security issue (same session on multiple instances)
Philip Häusler dd3de2d47d hightlight free and occupied shifts like pre bootstrap
Philip Häusler 46575d90c2 pulled complete menu to the top (go for mobile...)
Philip Häusler 8a0bd3d55c several fixes
- syntax error in index.php
- switched from sass to less because of bootstrap submodule
Philip Häusler 1785c38698 fix login layout and add mobile nav
Philip Häusler 4414358cf5 fix wrong nick and api sql query
Philip Häusler 2716c63648 fix wrong username on angeltype confirm
msquare 213d4580d9 Merge pull request from mortzu/master
Kleinere Codeanpassungen
Moritz Kaspar Rudert (mortzu) 0cbac227d9 fixed file system permissions
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php
Moritz Kaspar Rudert (mortzu) da49eeda6e merged gitignore files
Moritz Kaspar Rudert (mortzu) 5d8615a958 moved external libraries into gitmodules
Felix Favre 64a341e084 Merge branch 'master' of github.com:planetcyborg/engelsystem
Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	templates/layout.html
Philip Häusler 9adaeaa97a shift state text update
Philip Häusler fbdb8ae472 move new messages badge
Felix Favre 88dfb2e3a8 Countdown implementation
Felix Favre 1f43c46a2c Added moment-countdown inclue
Philip Häusler 53a10de5cf move json and ical export buttons
Philip Häusler 3da1748e84 correct shift state strings
Philip Häusler abb6d8bfd8 move moment js to vendor
Philip Häusler da6eaae215 refactor shift state
Philip Häusler 0e2b257342 begin to refactor user shift state
Philip Häusler 25b5096c7e update german translation
Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	themes/theme1.scss
Philip Häusler f9e577352d remove html templates
Felix Favre efe853246f Moved Javascript includes to bottom of layout
Felix Favre 520aed3d32 Changed Next Shift Countdown Format
Felix Favre 3a7893fb33 added moment-countdown js file
Philip Häusler 7f43f3bfe5 remove html templates
Felix Favre 13994b7909 Changed Button Border Color in Dark Theme
Felix Favre c57e450ed2 Changed Angeltypes List Actions to Bootstrap Button Group
Philip Häusler c8f652f57b fix layout
Philip Häusler 6bfa410f90 add moment js
Philip Häusler 66f166399c better preselected angeltypes
Philip Häusler d60c2f0c40 better layout for user register
Philip Häusler 4b1473ad2b ignore sass cache
Philip Häusler 51cecb27e5 better layout for user settings
Philip Häusler f30bc25246 minor bugfixes