Commit Graph

896 Commits

Author SHA1 Message Date
Felix Favre 2654fcf228 use glyph_bool in admin_active view 2014-12-06 17:30:35 +01:00
Felix Favre 67bca99571 Use more Striped Tables
issue #159
2014-12-06 17:15:22 +01:00
msquare 82ad127fc9 Merge pull request #160 from robofish/questionFix
Fixed database schema to allow questions again
2014-11-25 18:38:18 +01:00
msquare 17c41d821c Merge pull request #161 from robofish/master
Fix Nickname and DECT bug in user view
2014-11-25 18:37:07 +01:00
Robert Oehlmann 946e3292d0 Merge pull request #1 from illuxio/patch-1
Fix Nickname and DECT bug in settings.
2014-11-25 17:33:06 +01:00
illuxio 90a5e5ec14 Update User_view.php
Fix Nickname and DECT bug in settings.
2014-11-25 17:30:17 +01:00
gnomus 2732ae7f4f Change Development Platform Link to Github 2014-11-24 18:54:38 +01:00
Robert Oehlmann 48c8ddaa44 Fixed database schema
The answer fields in Questions are now NULL by default. The previous
defaults would not fullfill the forein key contraints on line 493 of
install.sql and thus the creation of new (yet unanswered) questions was
not possible.
2014-11-20 23:19:36 +01:00
Philip Häusler 4516cbe5d6 renamed mysql provider to mysqli, updated system requirements, fixes #145 2014-11-04 11:22:32 +01:00
Philip Häusler 06efffb9c8 improved readme 2014-11-04 11:16:42 +01:00
Philip Häusler 330dc2f2e0 updated git url 2014-11-04 11:14:06 +01:00
Philip Häusler 36a82afc9e new markdown readme 2014-11-04 11:13:19 +01:00
msquare d2e5cce373 Merge pull request #158 from robofish/shiftEntryFormFix
Fixed shift entry form
2014-11-04 11:06:01 +01:00
msquare 428d5d70cb Merge pull request #157 from robofish/shiftDurationFix
Fixed shift duration calculation
2014-11-04 11:00:54 +01:00
Robert Oehlmann a42ba2f5a1 Fixed field assignments in shift entry creation form 2014-11-03 19:37:47 +01:00
Robert Oehlmann c4039f72bb Fixed shift duration calculation
Fixes issue #136
2014-11-03 19:28:43 +01:00
msquare b221b362dc Merge pull request #156 from robofish/editUrlFix
Fixed shift edit/delete URLs in new layout
2014-11-03 16:17:37 +01:00
Robert Oehlmann 4edaa26911 Fixed shift edit/delete URLs in new layout 2014-11-03 08:51:23 +01:00
Philip Häusler 785fd45d3a fix register privilege 2014-09-28 19:47:57 +02:00
Philip Häusler 4931fbb372 replace icons with glyphicons 2014-09-28 19:44:53 +02:00
Philip Häusler bd2a8b441f clear up mvc for user list 2014-09-28 15:01:02 +02:00
Philip Häusler 1d9e1c467c user list rewritten 2014-09-28 14:50:08 +02:00
Philip Häusler 0f77edc4fb hint for disabled registration 2014-09-28 14:14:04 +02:00
Philip Häusler e4a042c8c3 clear userlist 2014-09-24 15:36:26 +02:00
Philip Häusler f06e4a0f47 move user messages to menu icon right 2014-09-24 15:24:32 +02:00
Philip Häusler 07b6541204 move language to submenu 2014-09-24 15:11:50 +02:00
Philip Häusler 094715e6ee optimize navbar for 1024 px width 2014-09-24 15:03:41 +02:00
Philip Häusler 086ddc2248 better application name 2014-09-20 18:35:36 +02:00
Philip Häusler 50fea6d371 fix session security issue (same session on multiple instances) 2014-09-20 18:31:59 +02:00
Philip Häusler dd3de2d47d hightlight free and occupied shifts like pre bootstrap 2014-09-08 14:46:12 +02:00
Philip Häusler 46575d90c2 pulled complete menu to the top (go for mobile...) 2014-09-08 14:45:41 +02:00
Philip Häusler 8a0bd3d55c several fixes
- syntax error in index.php
- switched from sass to less because of bootstrap submodule
2014-09-08 14:12:42 +02:00
Philip Häusler 1785c38698 fix login layout and add mobile nav 2014-09-08 13:57:36 +02:00
Philip Häusler 4414358cf5 fix wrong nick and api sql query 2014-09-08 13:57:36 +02:00
Philip Häusler 2716c63648 fix wrong username on angeltype confirm 2014-09-08 13:57:36 +02:00
msquare 213d4580d9 Merge pull request #1 from mortzu/master
Kleinere Codeanpassungen
2014-09-08 13:56:22 +02:00
Moritz Kaspar Rudert (mortzu) 0cbac227d9 fixed file system permissions 2014-09-08 08:42:45 +02:00
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php 2014-09-08 08:38:08 +02:00
Moritz Kaspar Rudert (mortzu) da49eeda6e merged gitignore files 2014-09-08 08:17:19 +02:00
Moritz Kaspar Rudert (mortzu) 5d8615a958 moved external libraries into gitmodules 2014-09-08 08:16:09 +02:00
Felix Favre 64a341e084 Merge branch 'master' of github.com:planetcyborg/engelsystem 2014-08-24 16:55:35 +02:00
Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	templates/layout.html
2014-08-24 16:55:26 +02:00
Philip Häusler 9adaeaa97a shift state text update 2014-08-24 16:48:12 +02:00
Philip Häusler fbdb8ae472 move new messages badge 2014-08-24 16:46:30 +02:00
Felix Favre 88dfb2e3a8 Countdown implementation 2014-08-24 16:44:36 +02:00
Felix Favre 1f43c46a2c Added moment-countdown inclue 2014-08-24 16:44:05 +02:00
Philip Häusler 53a10de5cf move json and ical export buttons 2014-08-24 16:36:10 +02:00
Philip Häusler 3da1748e84 correct shift state strings 2014-08-24 16:22:43 +02:00
Philip Häusler abb6d8bfd8 move moment js to vendor 2014-08-24 16:09:56 +02:00
Philip Häusler da6eaae215 refactor shift state 2014-08-24 16:08:12 +02:00