Commit Graph

960 Commits

Author SHA1 Message Date
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
Philip Häusler 0e2b257342 begin to refactor user shift state 2014-08-24 15:51:42 +02:00
Philip Häusler 25b5096c7e update german translation 2014-08-24 15:51:42 +02:00
Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	themes/theme1.scss
2014-08-24 15:52:25 +02:00
Philip Häusler f9e577352d remove html templates 2014-08-23 19:15:10 +02:00
Felix Favre efe853246f Moved Javascript includes to bottom of layout 2014-08-23 17:31:20 +02:00
Felix Favre 520aed3d32 Changed Next Shift Countdown Format 2014-08-23 17:30:38 +02:00
Felix Favre 3a7893fb33 added moment-countdown js file 2014-08-23 17:30:20 +02:00
Philip Häusler 7f43f3bfe5 remove html templates 2014-08-23 17:24:11 +02:00
Felix Favre 13994b7909 Changed Button Border Color in Dark Theme 2014-08-23 16:32:41 +02:00
Felix Favre c57e450ed2 Changed Angeltypes List Actions to Bootstrap Button Group 2014-08-23 16:25:51 +02:00
Philip Häusler c8f652f57b fix layout 2014-08-23 16:03:46 +02:00
Philip Häusler 6bfa410f90 add moment js 2014-08-23 15:59:18 +02:00
Philip Häusler 66f166399c better preselected angeltypes 2014-08-23 15:47:06 +02:00
Philip Häusler d60c2f0c40 better layout for user register 2014-08-23 15:35:25 +02:00
Philip Häusler 4b1473ad2b ignore sass cache 2014-08-23 14:35:11 +02:00
Philip Häusler 51cecb27e5 better layout for user settings 2014-08-23 14:30:45 +02:00
Philip Häusler f30bc25246 minor bugfixes 2014-08-23 02:47:06 +02:00
Philip Häusler c5331c44fd move language select to the top 2014-08-23 02:16:12 +02:00
Philip Häusler f5a094fd8b add user view, better bootstrap 2014-08-23 01:55:18 +02:00
Philip Häusler 74647e16d3 add basic bootstrap theme 2014-08-22 22:34:13 +02:00
Philip Häusler 721aa7f160 #148 fix wrong password validation message 2014-07-29 20:50:54 +02:00
Philip Häusler b3c4bd52de german language updated 2014-05-13 17:00:56 +02:00
Philip Häusler d394ed2fee notify coordinators about unconfirmed angeltypes 2014-05-13 16:49:09 +02:00
Philip Häusler f1145b8a5e implemented team/angeltype coordinators 2014-05-13 15:51:45 +02:00
Philip Häusler e107dff1ce button style and redirect fixes 2014-05-13 14:44:04 +02:00
Philip Häusler a33fc5e21d router simplification 2014-05-13 11:20:48 +02:00
Philip Häusler 3401c6f8b6 admin import now without template files 2014-03-26 20:04:11 +01:00
Philip Häusler cf20bc1c29 test for existing shifts 2014-03-26 18:51:34 +01:00
Philip Häusler dc7a56f422 fixed angeltype add model 2014-03-24 11:51:51 +01:00
Philip Häusler 0ce1ba5bf1 style rename to engelsystem default 2014-03-23 18:23:47 +01:00
Philip Häusler 3963e4907a german update and style reset 2014-03-23 18:21:58 +01:00
Philip Häusler 13f8a513d4 fix error messages on password recovery 2014-03-12 17:36:55 +01:00
Philip Häusler 462b78a7e7 better integration of angeltypes about 2014-03-09 16:01:41 +01:00
Philip Häusler ab450600d7 better integration of angeltypes about 2014-03-09 16:00:13 +01:00
Philip Häusler f40b78faac angeltypes about section 2014-03-09 13:39:04 +01:00
Philip Häusler 98f355cd86 added angeltype description 2014-03-09 13:12:46 +01:00