iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,848 Commits 4 Branches 0 Tags 22 MiB
Commit Graph

261 Commits

Author SHA1 Message Date
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
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) 5d8615a958 moved external libraries into gitmodules 2014-09-08 08:16:09 +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
Felix Favre 88dfb2e3a8 Countdown implementation 2014-08-24 16:44:36 +02:00
Philip Häusler abb6d8bfd8 move moment js to vendor 2014-08-24 16:09:56 +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 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
Philip Häusler 6bfa410f90 add moment js 2014-08-23 15:59:18 +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 d394ed2fee notify coordinators about unconfirmed angeltypes 2014-05-13 16:49:09 +02:00
Philip Häusler e107dff1ce button style and redirect fixes 2014-05-13 14:44:04 +02:00
Philip Häusler 3963e4907a german update and style reset 2014-03-23 18:21:58 +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
Philip Häusler 3162f77eb2 enabled api again 2014-01-05 19:35:23 +01:00
Philip Häusler 316c18f912 removed old user angeltypes 2014-01-05 19:31:17 +01:00
Philip Häusler 5e84539928 rewritten angeltypes and user angeltypes 2014-01-05 19:30:06 +01:00
Philip Häusler 493a29ea88 disable api 2013-12-29 15:24:54 +01:00
Philip Häusler a041e0efbb first api 2013-12-29 15:08:21 +01:00
Philip Häusler c589219a96 freeloader feature 2013-12-27 18:45:27 +01:00
Philip Häusler a5fbc7fbd5 fix news start page bug, not showing always news 2013-12-26 17:31:05 +01:00
Philip Häusler 161c04a206 fix news start page bug, not showing always news 2013-12-26 17:29:29 +01:00
Philip Häusler b34a71e20d fix news start page bug 2013-12-26 17:25:03 +01:00
Philip Häusler fdd4b44c0e fixed button font and added star to shirt size at registration 2013-12-26 14:37:17 +01:00
Philip Häusler 0c98f13eee user password recovery 2013-12-26 13:34:48 +01:00
Philip Häusler 4aa85a3ff2 api export for all shifts completed 2013-12-09 17:17:23 +01:00
Philip Häusler ad5899f028 api export for all shifts 2013-12-09 17:10:07 +01:00
Philip Häusler 821e37c1b2 removed faq feature 2013-12-03 16:28:37 +01:00
Philip Häusler e9565a79ea simplified config 2013-12-03 16:18:22 +01:00
Philip Häusler e475b4f083 prevent shirt and dect message from beeing shown when not logged in 2013-12-01 22:16:29 +01:00
Philip Häusler 988f7509d7 hint for specifying a dect number 2013-12-01 21:06:45 +01:00
Philip Häusler 18b5682363 hint for angels not having a shirt size 2013-12-01 21:01:14 +01:00
Philip Häusler 1e05da6c81 gettext for user sites 2013-11-28 22:40:48 +01:00
Philip Häusler 85d9bf4f9c angel views in english complete 2013-11-25 21:56:56 +01:00
Philip Häusler 813751ac7a language cleanup 2013-11-25 21:07:08 +01:00
Philip Häusler aad54bfe88 basic gettext integration 2013-11-25 21:04:58 +01:00
Philip Häusler 96a263f712 initial gettext integration 2013-11-25 19:12:19 +01:00
Philip Häusler 1f64ebc35e 30c3 design takeover 2013-10-19 16:44:07 +02:00
Philip Häusler 3c4321ff76 30c3 theme 2013-10-13 00:52:44 +02:00
Philip Häusler bfb0cacd54 mysql to mysqli and a lot of cleanup and mvc 2013-09-18 01:38:36 +02:00
Philip Häusler a47b1935cb #119 added basic shift json export support using same pattern like ical export 2013-09-10 14:27:31 +02:00
Philip Häusler 98aac2a429 brought back hour sum on my shifts 2013-01-02 14:17:34 +01:00
Philip Häusler f5f698a2a5 footer correction 2012-12-30 18:06:20 +01:00
Philip Häusler 3d2f6456e0 hint for not arrived angels 2012-12-30 18:04:20 +01:00
Jan-Philipp Litza b26994f518 moved footer to navigation and removed left-padding of headings, reworked credits 2012-12-30 17:13:28 +01:00
Jan-Philipp Litza 15668bad18 More filter functions and bigger filter button 2012-12-30 16:47:36 +01:00
Jan-Philipp Litza d509a10121 Prevent from signing up for colliding shifts servier-side 2012-12-30 12:51:29 +01:00
Jan-Philipp Litza 0dae68a9a3 indicate colliding shifts in new shift view 2012-12-30 12:09:48 +01:00
Jan-Philipp Litza bf226f87dc revert scrollable table because of bad browser implementation and replace by non-fixed header scrolling 2012-12-30 01:55:24 +01:00
Jan-Philipp Litza 6432401d9c limit height of online user list 2012-12-29 14:05:57 +01:00
Jan-Philipp Litza 7c7b2d3b54 polished code and display of shiftview and used more icons 2012-12-29 13:58:59 +01:00
Philip Häusler 263edf58f2 stats for infobeamer/monitor 2012-12-28 22:53:05 +01:00
Philip Häusler 7044c07c00 link to edit page and shift mates on myshifts page 2012-12-28 20:55:13 +01:00
Philip Häusler b8fb31c6c5 impossible merge fail 2012-12-28 17:58:48 +01:00
Philip Häusler c5438d5228 merged shift view fixes 2012-12-28 15:13:28 +01:00
Philip Häusler e61cb06ee8 enable deny/confirm all for restricted angeltypes 2012-12-28 15:09:20 +01:00
Jan-Philipp Litza 378d524fbd polished the table view by offloading "is this shift free" to SQL. Might put too much load on db server, need to evaluate. Also, replaced loads of & with & and simplified some expressions 2012-12-28 03:32:31 +01:00
Jan-Philipp Litza 4c329ecbf9 more CSS an JS voodoo for bugblues table view 2012-12-27 23:05:09 +01:00
Jan-Philipp Litza dd5ca95975 fixes for last commit 2012-12-27 22:49:10 +01:00
Jan-Philipp Litza 13747c62fd more CSS an JS voodoo for bugblues table view 2012-12-27 22:46:41 +01:00
Philip Häusler 622b856298 merge css 2012-12-27 18:08:01 +01:00
Philip Häusler 62e72eda93 simplified shift view 2012-12-27 17:35:42 +01:00
Jan-Philipp Litza 5c8290d880 made the user list a bit nicer 2012-12-27 17:35:42 +01:00
Jan-Philipp Litza 3af1d09d61 reworked admin_user again 2012-12-27 17:32:14 +01:00
Jan-Philipp Litza b01ab50367 Revert "simplified shift view" 
This reverts commit 43970df0f3.
 2012-12-27 16:57:03 +01:00
Philip Häusler f787a2ec70 Merge branch 'master' of https://vcs.wybt.net/engelsystem/git 2012-12-27 16:34:58 +01:00
Philip Häusler 43970df0f3 simplified shift view 2012-12-27 16:34:41 +01:00
Jan-Philipp Litza e12608ee73 made the user list a bit nicer 2012-12-27 16:11:07 +01:00
Philip Häusler 74098af09d #28 finnished logging 2012-12-27 01:35:05 +01:00
Jan-Philipp Litza e0e44fc8c3 added Atom feed for news and meetings 2012-12-26 20:39:54 +01:00
Philip Häusler 0dabaa505e #28 begin log 2012-12-26 14:02:27 +01:00
Philip Häusler 572a986e48 #88 29c3 design success notice 2012-12-10 10:11:17 +01:00
Philip Häusler 734447b40c 29c3 design 2012-12-07 18:00:19 +01:00
Philip Häusler 0b8d31a059 sigint logo 2012-04-17 14:11:59 +02:00
Philip Häusler ccdba91c57 common logo file 2012-04-11 19:43:59 +02:00
Philip Häusler 1633d62772 ical export for available shifts 2011-12-28 14:45:49 +01:00
Jan-Philipp Litza 037f19a137 Give MANY more filter options on shift view 2011-12-27 22:13:17 +01:00
Philip Häusler 8259266297 #44 shiftplan 2011-12-27 15:42:13 +01:00
Philip Häusler 77381ebca8 #44 confirm angel types 2011-12-26 19:28:34 +01:00
Philip Häusler 1852a2a1ae style duplication 2011-12-26 15:58:14 +01:00
Philip Häusler d1078f60fd #44 new register form 2011-12-26 15:55:17 +01:00
root bc471460fc logo/style change 2011-12-25 19:04:58 +01:00
root 60a94627a7 logo/style change 2011-12-25 15:49:05 +01:00
Philip Häusler def9532d6b #44 angeltypes recreated 2011-12-21 23:05:05 +01:00
Philip Häusler 5e5443fad6 #44 angeltypes recreated 2011-12-21 22:20:06 +01:00
Philip Häusler 10b4f94e5b #29 list of currently unemployed angels 2011-12-17 16:25:54 +01:00
Philip Häusler 61d61848a4 #1, #3, angels active and t-shirts 2011-12-17 15:18:13 +01:00
Philip Häusler d786fcde95 28c3 logo 2011-12-13 15:47:56 +01:00
Philip Häusler 4a9b09f0c3 28c3 logo 2011-12-13 15:46:39 +01:00
Philip Häusler 748c3a8b38 28c3 logo 2011-12-13 15:44:56 +01:00
Philip Häusler d4c17f48f5 #35 admin_shifts: escape from preview 2011-10-12 17:02:48 +02:00
Philip Häusler 304af8e8f0 #27 ical export, beginn 2011-10-11 19:47:49 +02:00
Philip Häusler fc90174dd8 joined login+start 2011-09-14 22:19:10 +02:00
Philip Häusler e665d1701f create multiple shifts 2011-09-06 20:45:06 +02:00
Philip Häusler 24e402c6e0 #2 mark angels as arrived 2011-07-19 21:08:19 +02:00
Philip Häusler 3add966f23 #2 needed files and settings for new modul admin_arrive 2011-07-19 19:31:07 +02:00
Philip Häusler 05410ba89a #6 my shifts | cancel my shifts 2011-07-19 19:12:36 +02:00
Philip Häusler 32cdb6b0e1 #6, begin myshifts 2011-07-15 17:50:57 +02:00
Philip Häusler 2f822b8f7d textarea css 2011-07-13 15:59:35 +02:00
Philip Häusler 4f220e30ce #6 prepare for shift entries 2011-07-13 15:17:15 +02:00
Philip Häusler eeff48ad97 #4 import shift names 2011-07-13 14:29:40 +02:00
Philip Häusler a476beafe3 cleanup config 2011-07-12 16:28:17 +02:00
Philip Häusler d3d6d2e3f1 #4 completed import with file-upload and fsock-open method 2011-07-12 16:03:07 +02:00
Philip Häusler f59f0eae9c #4 pentabarf room import 2011-07-11 20:40:27 +02:00
Philip Häusler 377c24e13d secure page selection 2011-06-13 19:04:16 +02:00
Philip Häusler 04973d1fa1 moved public files to public, old and yet untouched files to directories ending with _old 2011-06-13 18:05:51 +02:00