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

239 Commits

Author SHA1 Message Date
msquare 6ff5e7997a split user_shifts into different functions 2016-10-02 21:19:03 +02:00
msquare d5d2acc7d8 improve code style 2016-10-01 10:48:19 +02:00
msquare 3738d071f8 remove long array syntax 2016-09-30 17:08:20 +02:00
msquare f05f1a3cd4 rename to 2016-09-29 12:08:12 +02:00
msquare 91dafb19ec prohibit inline control structures on pages 2016-09-29 10:53:17 +02:00
msquare 191328d703 fix method names, quotes, duplication in forms.js 2016-08-21 20:14:09 +02:00
msquare 53ad1b5110 fix codacy unused code 2016-08-21 18:00:39 +02:00
Felix Favre 73208016bf change date format in shift table 
fixes #202
 2015-08-26 15:03:53 +02:00
Felix Favre e4bd324801 changed all y-m-d date formats to Y-m-d date formats 
part of #202
 2015-08-26 15:00:48 +02:00
Philip Häusler bc84710e9d wording 2015-08-14 17:40:58 +02:00
Philip Häusler 723961c19e User shift admins see free and occupied shifts by default 2015-08-13 11:22:25 +02:00
Philip Häusler 9af229094d display user nicks on shift json export 2015-01-05 13:58:34 +01:00
Philip Häusler ca37de95da fix shift update 2014-12-28 14:56:02 +01:00
Philip Häusler 739eddefd5 better shift sign up restriction 2014-12-28 14:20:16 +01:00
Philip Häusler 6bede2fd22 harden the sql queries 2014-12-28 13:44:56 +01:00
Philip Häusler cb46534569 move shift edit buttons 2014-12-28 01:30:29 +01:00
Philip Häusler 0b70fc2a7f better shift sign up buttons in shift view 2014-12-28 01:27:41 +01:00
Philip Häusler 582c429fd4 allow admin to sign up more angels than needed again 2014-12-27 00:15:41 +01:00
Philip Häusler 8d6175a273 user cannot signup for full shifts 2014-12-26 23:48:16 +01:00
Philip Häusler 71a23be3d4 fade out for not arrived angels 2014-12-26 19:11:26 +01:00
Philip Häusler 8764be8604 display room per shift in shift table 2014-12-26 14:31:37 +01:00
Philip Häusler 9cabdb1d78 shift edit for shifttypes 2014-12-26 02:27:54 +01:00
Philip Häusler 33bafad9b7 fix wrong redirect after shift edit 2014-12-26 01:26:17 +01:00
Philip Häusler 34e2f49875 shift signup improvements for shift view 2014-12-25 22:23:18 +01:00
Philip Häusler 2d587478a1 fix different bugs with shift types 2014-12-22 20:06:37 +01:00
Philip Häusler 702047de53 add more icons for better shift view 2014-12-22 18:22:54 +01:00
Philip Häusler c12e5336fb display shifts with title 2014-12-22 18:06:58 +01:00
Philip Häusler 0dbd0ea599 add basic shift view 2014-12-19 23:04:26 +01:00
Felix Favre 2f20540a6b more infos in shift view 2014-12-19 23:02:50 +01:00
Philip Häusler d02272afd6 add basic shift view 2014-12-19 22:41:55 +01:00
Philip Häusler a791a75b0a integrate shift type into shifts 2014-12-17 17:22:35 +01:00
Felix Favre 807e420883 only log if api key was reset on purpose 2014-12-16 00:54:50 +01:00
Felix Favre f20e24f589 shift page styling 2014-12-15 23:09:06 +01:00
Felix Favre ed001633e6 Own Shifts ignore the filled filter. 
issue #134
 2014-12-13 01:56:29 +01:00
Felix Favre 3e958227aa fix shift collision display 2014-12-13 00:34:27 +01:00
Philip Häusler b75700ee1b add shift delete model 2014-12-07 17:48:35 +01:00
Philip Häusler d26f8aa12c add shift update model 2014-12-07 17:41:40 +01:00
Philip Häusler 0a74ab94a8 add shift entry delete model 2014-12-07 17:07:19 +01:00
Philip Häusler 9176261762 add shift entry create model 2014-12-07 16:54:13 +01:00
Felix Favre 703de07a63 remove striped table from shift view 2014-12-06 19:49:16 +01:00
Felix Favre 191ba6e1b1 replace all the remaining old icons with glyphicons 2014-12-06 18:16:18 +01:00
Felix Favre 67bca99571 Use more Striped Tables 
issue #159
 2014-12-06 17:15:22 +01:00
Robert Oehlmann a42ba2f5a1 Fixed field assignments in shift entry creation form 2014-11-03 19:37:47 +01:00
Robert Oehlmann 4edaa26911 Fixed shift edit/delete URLs in new layout 2014-11-03 08:51:23 +01:00
Philip Häusler 4931fbb372 replace icons with glyphicons 2014-09-28 19:44:53 +02:00
Philip Häusler 094715e6ee optimize navbar for 1024 px width 2014-09-24 15:03:41 +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 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 cf20bc1c29 test for existing shifts 2014-03-26 18:51:34 +01:00
Philip Häusler 13f8a513d4 fix error messages on password recovery 2014-03-12 17:36:55 +01:00
Philip Häusler f40b78faac angeltypes about section 2014-03-09 13:39:04 +01:00
Philip Häusler c589219a96 freeloader feature 2013-12-27 18:45:27 +01:00
Philip Häusler 9a1ffdf198 fixed wrong lock icon paths 2013-12-03 16:44:04 +01:00
Philip Häusler 821e37c1b2 removed faq feature 2013-12-03 16:28:37 +01:00
Philip Häusler d5b0311061 german translation update 2013-12-02 22:42:29 +01:00
Philip Häusler 33785f45a2 missing start and end shift in session 2013-12-01 20:06:41 +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 aad54bfe88 basic gettext integration 2013-11-25 21:04:58 +01:00
Philip Häusler d50cc21f50 #119 extended json shift information for angeltypes and taken places 2013-09-10 14:54:16 +02:00
Philip Häusler fb8241039b #119 added links to json export 2013-09-10 14:45:41 +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 a573b4e325 replaced header with redirect function 2012-12-30 18:27:45 +01:00
Philip Häusler dd4530d760 User Nick function, enhanced log with some links 2012-12-30 17:58:23 +01:00
Jan-Philipp Litza b32ade0a34 Fix new shift time filter and show dates for longer shift tables 2012-12-30 16:02:23 +01:00
Jan-Philipp Litza de695c0fe4 make shifts filterable by timespan instead of days and enable new view for arbitrary timespans 2012-12-30 15:06:52 +01:00
Jan-Philipp Litza 7e44546f5c use bin icon instead of cross for deletion 2012-12-30 12:52:01 +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 2d0b2542c9 a few fixes and polishes in myshifts, shifts and menu 2012-12-29 14:41:09 +01:00
Jan-Philipp Litza 7c7b2d3b54 polished code and display of shiftview and used more icons 2012-12-29 13:58:59 +01:00
Jan-Philipp Litza 01c9d1a810 hotfix: show completely free shifts when searching for free shifts 2012-12-28 18:45:26 +01:00
Philip Häusler ff99dd5b71 fixed merge fail - reconstructed new shift view 2012-12-28 17:54:06 +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 cc8f117ed1 fix remembering of new-style-setting and fix a bug with signing up for shifts after they startet 2012-12-28 03:53:08 +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
Philip Häusler 76efad3c5b fix duplicating user angel types 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 a0ec26126e fix duplicating user angel types 2012-12-27 21:24:44 +01:00
Philip Häusler 88134641b8 made angel types usable 2012-12-27 18:03:58 +01:00
Philip Häusler 242408b71c fixed shift view bug 2012-12-27 17:35:42 +01:00
Philip Häusler 62e72eda93 simplified shift view 2012-12-27 17:35:42 +01:00
Philip Häusler 1cf84a87be fix bad html at user_shifts 2012-12-27 15:00:21 +01:00
Philip Häusler 670cd715c5 #28 logging doku 2012-12-27 02:44:21 +01:00
Philip Häusler 9293cea5a1 Merge branch 'dev' of https://vcs.wybt.net/engelsystem/git into dev 2012-12-27 02:07:59 +01:00
Philip Häusler 7c42769ab8 #28 finnished logging 2012-12-27 01:35:05 +01:00
Jan-Philipp Litza 0c9dccacfb allow angels to sign up for shifts whose types are not selected as preferred in settings and auto-prefer these types 2012-12-26 23:15:08 +01:00
Philip Häusler fd199ea3a0 fix user shift joined nicknames 2012-12-23 14:50:03 +01:00
Philip Häusler 2d5449f213 sort angeltypes on user shifts 2012-12-12 23:15:57 +01:00
Philip Häusler 95880bb7d6 #77 bugblue-layout fix 2012-12-12 23:03:36 +01:00
Philip Häusler 6a30868814 #77 bugblue-layout fix 2012-12-12 22:57:04 +01:00
Philip Häusler b3df228845 #77 bugblue-one-day-calendar-layout-patch 2012-12-12 22:56:51 +01:00
Jan-Philipp Litza 697b756c4e more translations and fixes 2012-12-12 01:02:55 +01:00
Jan-Philipp Litza 910af3eaf7 fixes for the last commit 2012-12-12 00:45:29 +01:00
Jan-Philipp Litza a007a23d75 fix #91 (SQL error in shift filter) and translate "shifts" and "my shifts" a lot 2012-12-12 00:22:30 +01:00
Philip Häusler 9e7c2dfeca shift join right fuckup 2012-12-03 22:47:08 +01:00
Philip Häusler 505ad98e33 #51 fix problems with changing needed angeltypes in rooms 2012-05-19 17:50:09 +02:00
Philip Häusler 0114edc0ca #53 edit shifts where already somebody subscribed 2012-05-19 17:05:04 +02:00
Philip Häusler bc03069017 #56 fixed problem with editing angels rights and angels can not subscribe running oder ended shifs now 2012-05-19 16:41:00 +02:00
Philip Häusler 4eaa0d10ea sort filter days 2012-05-17 17:18:34 +02:00
Philip Häusler 046c9e9caf fix some php warnings 2012-04-17 14:11:40 +02:00
Philip Häusler e8cc1e7b4f more redirects - better flow when configuring shifts and shift entries 2011-12-29 15:58:28 +01:00
Philip Häusler b864f2c5b1 cleanup old unused files, display tshirt size in admin_active 2011-12-29 14:58:50 +01:00
Philip Häusler 8968763ff3 provide more information (multiple rooms) in available shifts 2011-12-29 14:47:04 +01:00
Philip Häusler cf3960aeba shiftplan ical export 2011-12-29 00:35:23 +01: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
Jan-Philipp Litza d3b51174b6 performance improvements for displaying shifts 2011-12-27 13:50:07 +01:00
Philip Häusler 043a1203d4 bugfixes with angeltype (TID removed) 2011-12-26 20:51:08 +01:00
Philip Häusler d1078f60fd #44 new register form 2011-12-26 15:55:17 +01:00
Philip Häusler ce7f071c38 #44 angeltypes recreated 2011-12-21 23:18:57 +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 471cbad391 #37 schichten von fremen usern einsehen können, für dispatcher 2011-11-09 08:47:58 +01:00
Philip Häusler 1854e1455a #5 begin edit shifts feature, completed 2011-10-11 18:55:26 +02:00
Philip Häusler b47b6ed7e4 #5 begin edit shifts feature, simplified needed angels 2011-10-11 18:35:29 +02:00
Philip Häusler 403c11047b #5 begin edit shifts feature 2011-10-11 18:29:26 +02:00
Philip Häusler 402dc172b6 fixed shift length display 2011-09-29 14:38:23 +02:00
Philip Häusler 95e9e7b147 translated user_shifts to german 2011-09-14 23:05:43 +02:00
Philip Häusler 8e35c721d7 user_shifts fixed error with empty shifts table 2011-09-14 22:45:15 +02:00
Philip Häusler ddf309717b #5 delete shifts 2011-09-12 18:32:45 +02:00
Philip Häusler d63e7e9aad #5 fixed user_shifts needed angel types calculation 2011-09-12 14:57:52 +02:00
Philip Häusler 4303b05d08 form validation for creating shifts (admin_shifts) and changed database layout 2011-09-07 23:30:05 +02:00
root 28b50acb88 user_shifts: 15 freie noch kommende schichten anzeigen (und nicht bereits vergangene) 2011-08-13 14:37:54 +02:00
Philip Häusler e8c035e166 #6 edit my shift comment 2011-07-19 19:56:15 +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 4ee429a27b #6, shift registration and shift entry administration 2011-07-14 20:57:02 +02:00
Philip Häusler 80bff6bab6 angel shift signup 2011-07-14 19:53:26 +02:00
Philip Häusler 2bf28a3505 #6 prepare for shift entries, verify 2011-07-13 15:55:27 +02:00
Philip Häusler 4f220e30ce #6 prepare for shift entries 2011-07-13 15:17:15 +02:00
Philip Häusler 1bb1997e04 #6 browse shifts 2011-07-13 15:01:17 +02:00
Philip Häusler 526b9783aa #6 angels shifts 2011-07-13 14:30:19 +02:00