Commit Graph

920 Commits

Author SHA1 Message Date
Philip Häusler 666bb3919c Merge branch 'master' of https://vcs.wybt.net/engelsystem/git 2011-12-27 22:21:32 +01:00
Philip Häusler 8c1f9e7057 admin_room rewrite 2011-12-27 22:21:24 +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 e0ffeb1005 registration fix 2011-12-27 14:40:16 +01:00
Philip Häusler 9b46a83870 registration fix 2011-12-27 14:13:16 +01:00
Jan-Philipp Litza d3b51174b6 performance improvements for displaying shifts 2011-12-27 13:50:07 +01:00
Philip Häusler c925f19a96 registration fix 2011-12-27 13:34:04 +01:00
Philip Häusler b707f55250 registration fix 2011-12-27 13:30:51 +01:00
Philip Häusler 60810251e5 ical reset fix 2011-12-26 21:23:27 +01:00
Philip Häusler 043a1203d4 bugfixes with angeltype (TID removed) 2011-12-26 20:51:08 +01:00
Philip Häusler 80f355a94f #44 edit user <- user_angeltypes 2011-12-26 19:58:05 +01:00
Philip Häusler 77381ebca8 #44 confirm angel types 2011-12-26 19:28:34 +01:00
Philip Häusler b3d4d7dc52 #44 user angel types -> user_settings, cleanup 2011-12-26 18:29:45 +01:00
Philip Häusler 9e8d3aca6c #44 user angel types -> user_settings 2011-12-26 18:28:57 +01:00
Philip Häusler 278dc8e5b0 changed angel types table layout 2011-12-26 16:25:39 +01:00
Philip Häusler d0bb9fbbeb Merge branch 'master' of https://vcs.wybt.net/engelsystem/git 2011-12-26 16:09:15 +01:00
Jan-Philipp Litza 7154097581 database update script 2011-12-26 16:04:54 +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 60a94627a7 logo/style change 2011-12-25 15:49:05 +01:00
Angelo Cuccato 07bc29128c fix import with fsockopen 2011-12-23 22:34:54 +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 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 471cbad391 #37 schichten von fremen usern einsehen können, für dispatcher 2011-11-09 08:47:58 +01:00
Philip Häusler d4c17f48f5 #35 admin_shifts: escape from preview 2011-10-12 17:02:48 +02:00
Philip Häusler a06ffd2e49 #27 ical export, key reset 2011-10-11 22:24:33 +02:00
Philip Häusler f8ec85e4c6 #27 ical export, link explained 2011-10-11 22:18:36 +02:00
Philip Häusler 304af8e8f0 #27 ical export, beginn 2011-10-11 19:47:49 +02: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 8a5f510da2 fix issue #34, edit rights of righless users 2011-09-26 16:04:30 +02:00
Jan-Philipp Litza 01463f0ac0 make shift creation more comfortable by automatically selecting mode on changes to the according fields and remembering entries if error occurs 2011-09-16 12:22:03 +02:00
Jan-Philipp Litza 2ad0124eb0 Merge branch 'master' of https://vcs.wybt.net/engelsystem/git 2011-09-14 23:11:34 +02:00
Jan-Philipp Litza 01bd4e33de remove statistics from angel list which used includes_old functions 2011-09-14 23:11:15 +02:00
Philip Häusler 95e9e7b147 translated user_shifts to german 2011-09-14 23:05:43 +02:00
Philip Häusler 6a84dadf1a fixed news table name 2011-09-14 22:59:25 +02:00
Jan-Philipp Litza e9193a7161 fix typo and remove some globals 2011-09-14 22:53:27 +02:00
Philip Häusler 1342dc49cf translated *_question to german 2011-09-14 22:50:16 +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 a5c6ad4393 translated some pages to german 2011-09-14 22:32:13 +02:00
Philip Häusler 3c33e23c3c admin_news privilege for writing news too 2011-09-14 22:23:29 +02:00
Philip Häusler fc90174dd8 joined login+start 2011-09-14 22:19:10 +02:00
Philip Häusler 0eb9830818 shift name is now optional 2011-09-12 23:09:30 +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 b399227956 #5 fixed shift calculation 2011-09-12 14:43:13 +02:00
Philip Häusler 024c5ff2e2 #5 preview for shifts to be created 2011-09-11 23:01:39 +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
Philip Häusler 82522881d4 begin form validation 2011-09-06 21:05:09 +02:00
Philip Häusler e665d1701f create multiple shifts 2011-09-06 20:45:06 +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 c3a9e66c32 #2 search function for arrived angels 2011-07-19 21:18:14 +02:00
Philip Häusler 24e402c6e0 #2 mark angels as arrived 2011-07-19 21:08:19 +02:00
Philip Häusler e8c035e166 #6 edit my shift comment 2011-07-19 19:56:15 +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 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
Philip Häusler eeff48ad97 #4 import shift names 2011-07-13 14:29:40 +02:00
Philip Häusler 02e187a4ec #24 made t-shirt-size optional for angels 2011-07-12 16:17:18 +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 4e802b2127 #4 pentabarf xml import done 2011-07-11 22:41:58 +02:00
Philip Häusler 5597e23ae1 #4 pentabarf import cleanup 2011-07-11 22:04:20 +02:00
Philip Häusler f058a07a5e #4 pentabarf shift import 2011-07-11 21:58:06 +02:00
Philip Häusler f59f0eae9c #4 pentabarf room import 2011-07-11 20:40:27 +02:00
Philip Häusler 3d15b591e3 cleanup, security sql fixes 2011-06-13 19:34:01 +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
Philip Häusler 89fd736f36 #4 xml parsing 2011-06-13 17:54:05 +02:00
Philip Häusler dafbb0c10e #4 begin pentabarf-import 2011-06-12 17:07:55 +02:00
Philip Häusler 80a1a65aef tmp commit 2011-06-11 17:01:41 +02:00
Daniel Friesel e715245e12 More sql escapes 2011-06-10 10:30:51 +02:00
Daniel Friesel 5d9335fe18 admin_questions: More templates + sql fixes 2011-06-03 20:24:36 +02:00
Philip Häusler 200053d720 Merge branch 'spezial_includes_camp' of ssh://git.planetcyborg.de/home/git/projects/engelsystem into spezial_includes_camp 2011-06-03 17:54:39 +02:00
Daniel Friesel 3a041d4ef3 user_wakeup: Whoops. Fixes. 2011-06-03 17:26:48 +02:00
Daniel Friesel c7657ca7ff user_wakeup: Cleanup, use template 2011-06-03 17:24:52 +02:00
Philip Häusler 586272ccec begin pentabarf import 2011-06-03 16:52:57 +02:00
Philip Häusler 7bee3ce4d2 config cleanup, removed unused files 2011-06-03 16:30:00 +02:00
Philip Häusler 7a6f4b2750 wake-up calls 2011-06-03 16:22:33 +02:00
Philip Häusler 225398d87d json auth service complete 2011-06-03 15:30:17 +02:00
Philip Häusler f6ad58750d fixed faq 2011-06-03 15:08:05 +02:00
Philip Häusler ded7bcb0b4 debug -> admin log 2011-06-03 14:48:05 +02:00
Philip Häusler 7e91f4821a recentchanges -> admin log 2011-06-03 14:44:01 +02:00
Philip Häusler e7a25448f2 admin language / translation 2011-06-03 14:38:12 +02:00
Daniel Friesel 75a7755041 user_messages: Initial (unfinished) cleanup 2011-06-03 11:46:46 +02:00
Daniel Friesel 70de7e5a1d guest_login: Cleanup, fix sql injection 2011-06-03 11:34:54 +02:00
Daniel Friesel 554bd796dc includes/sys_auth: Add sql_escape, just to be safe 2011-06-03 11:24:22 +02:00
Daniel Friesel 93dd7113b1 admin_groups minor cleanup 2011-06-03 11:17:09 +02:00
Daniel Friesel 5113776a42 include/pages/admin_faq cleanup 2011-06-03 11:09:25 +02:00
Philip Häusler bad34a0b26 user management 2011-06-03 08:12:53 +02:00
Philip Häusler 6b155db36c user management 2011-06-03 07:44:50 +02:00
Philip Häusler 11e274a6fe user meetings 2011-06-03 06:47:35 +02:00
Philip Häusler 35fe4b3ed6 admin user 2011-06-03 06:40:29 +02:00
Philip Häusler 9941d2a7a7 admin news 2011-06-03 05:49:56 +02:00
Philip Häusler 9325d7a78a news refined 2011-06-03 05:21:11 +02:00
Philip Häusler 91f6e7bbaf news refined 2011-06-03 05:12:50 +02:00
Philip Häusler d5d3db847e cleanup, preparation 2011-06-03 01:40:25 +02:00
Philip Häusler 626b9a81f3 admin faq 2011-06-03 01:03:39 +02:00
Philip Häusler 32b3ce5f90 admin questions 2011-06-03 00:22:11 +02:00
Philip Häusler 576c9680cf Merge branch 'spezial_includes_camp' of ssh://git.planetcyborg.de/home/git/projects/engelsystem into spezial_includes_camp 2011-06-02 23:46:53 +02:00
Philip Häusler 0d6499f7f1 user questions 2011-06-02 23:45:54 +02:00
Daniel Friesel cb1736d180 include/pages/admin_angel_types: Cleanup; add strip_request_item function 2011-06-02 23:41:50 +02:00
Philip Häusler 3afd05636e admin groups 2011-06-02 22:40:08 +02:00
Philip Häusler c0b15dfe0d user messages 2011-06-02 21:38:19 +02:00
Philip Häusler d381f57951 user settings 2011-06-02 20:18:01 +02:00
Philip Häusler 72d8f6bb13 fix news 2011-06-02 18:06:28 +02:00
Philip Häusler 5c00fea42e admin angel types done 2011-06-02 17:49:15 +02:00
Philip Häusler 1c38d62127 admin angel types done 2011-06-02 17:48:27 +02:00
Philip Häusler 8297d3ba41 begin angel types 2011-06-02 17:30:17 +02:00
Philip Häusler ded660adb6 menu seperated 2011-06-02 17:15:03 +02:00
Philip Häusler de66e87c6f fix register 2011-06-02 17:09:19 +02:00
Philip Häusler 0d351f4791 admin rooms 2011-06-02 16:56:45 +02:00
Philip Häusler 5a935f413d news 2011-06-02 01:45:46 +02:00
Philip Häusler 134272dd93 news 2011-06-02 01:45:19 +02:00
Philip Häusler 06497b3a53 cleanup 2011-06-02 01:18:08 +02:00
Philip Häusler 10683c4759 counter 2011-06-02 01:09:03 +02:00
Philip Häusler c90fdf75a2 rewrite 2011-06-02 01:02:15 +02:00
Philip Häusler a3be028928 rewrite 2011-06-02 00:48:29 +02:00
Moritz helios Rudert 841bf6a1ca i love this system 2011-06-01 19:42:57 +02:00
Philip Häusler 0ee418ffa2 mysql utf-8 2011-06-01 18:23:01 +02:00
Philip Häusler 208c76fcb2 html5, css rewrite 2011-06-01 18:16:47 +02:00
Philip Häusler 54aa90e641 html5, css rewrite 2011-06-01 17:51:39 +02:00
Philip Häusler ac8dbe835e html5, css rewrite 2011-06-01 17:41:49 +02:00
Philip Häusler d163b9921b rebase, new flags 2011-06-01 17:28:03 +02:00
Philip Häusler bf64254625 fixed menu and credits link 2011-06-01 15:37:41 +02:00
Philip Häusler ee3080a861 credit page 2011-06-01 15:25:05 +02:00
Philip Häusler 9ee8020871 footer :) 2011-06-01 15:06:09 +02:00
Philip Häusler 6ebee2c46b bootstrapping 2011-06-01 14:30:29 +02:00
Philip Häusler 550467697f html5 2011-06-01 13:36:24 +02:00
Moritz helios Rudert 75448045cf fixes 2011-06-01 12:13:39 +02:00
root 12e0b0d809 local changes for spezial includes camp-version 2011-05-26 00:53:42 +02:00
Angelo Cuccato 50030ff31f fix waring 2010-12-29 20:19:47 +01:00
Angelo Cuccato 1e47799384 check link before show 2010-11-23 10:28:02 +01:00
Angelo Cuccato 3b6e2b24b1 change table style 2010-11-08 23:42:21 +01:00
Angelo Cuccato 0059fd16dd add Statistics 2010-11-08 23:38:31 +01:00
Angelo Cuccato 4cd6081353 bugfix link to user informations 2010-11-07 14:45:28 +01:00
Angelo Cuccato 0c046a784a fix user picture url handling 2010-11-06 16:29:54 +01:00
Angelo Cuccato 2ca2400b77 clean url handling 2010-08-31 21:16:16 +02:00
Angelo Cuccato 2e6deee575 update database 2010-02-02 22:36:51 +01:00
Angelo Cuccato 93e0fc9705 add group functions 2010-01-13 00:07:42 +01:00
Angelo Cuccato 1006eee444 add some asterisk config settings, add room selection 2009-12-27 23:27:32 +01:00
cookie cdcea4b449 bugfix in counter
git-svn-id: svn://svn.cccv.de/engel-system@335 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-29 19:04:43 +00:00
cookie d2b7899c60 append user flags for DECT calls
git-svn-id: svn://svn.cccv.de/engel-system@332 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-28 16:07:20 +00:00
cookie e8fb449c56 optical typos
git-svn-id: svn://svn.cccv.de/engel-system@330 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-26 12:15:38 +00:00
cookie c98edb47e9 changes for php5
git-svn-id: svn://svn.cccv.de/engel-system@329 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-26 12:12:44 +00:00
cookie e71ae4ec90 little typo in FAQ counter
git-svn-id: svn://svn.cccv.de/engel-system@327 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-24 08:43:28 +00:00
cookie 9eb3850fc8 typo in style ;-)
git-svn-id: svn://svn.cccv.de/engel-system@324 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-22 20:09:31 +00:00
cookie bc4d92f3c4 implement ical export, bugfix schichtplan_beamer.php was not shown, add doku
git-svn-id: svn://svn.cccv.de/engel-system@323 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-22 19:55:00 +00:00
cookie 2c23d9a7ae expant the dbUpadte funktion, now will update the number of engel shifts (typo)
git-svn-id: svn://svn.cccv.de/engel-system@322 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-21 22:06:33 +00:00
cookie 0e31515334 expant the dbUpadte funktion, now will update the number of engel shifts
git-svn-id: svn://svn.cccv.de/engel-system@321 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-21 21:56:21 +00:00
cookie fad6bf645e fix pic link
git-svn-id: svn://svn.cccv.de/engel-system@320 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-21 20:26:03 +00:00
ichdasich 5c8991ed5d further fixup for php5 in includes/funktion_xml.php, special thanks to mxey for this contribution
git-svn-id: svn://svn.cccv.de/engel-system@319 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-14 01:03:32 +00:00
ichdasich f22f5194e2 minor fixes for php5 compability
git-svn-id: svn://svn.cccv.de/engel-system@318 29ba0400-6e00-0410-a75a-ca02368028f8
2008-12-13 23:10:00 +00:00
ichdasich 41dee8c9c3 fixes in ../includes
git-svn-id: svn://svn.cccv.de/engel-system@300 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-27 19:29:08 +00:00
ichdasich edeb637de1 final pic-fixes
git-svn-id: svn://svn.cccv.de/engel-system@293 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-26 17:29:39 +00:00
ichdasich 3f35e47a32 minor fixes
git-svn-id: svn://svn.cccv.de/engel-system@292 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-26 17:27:48 +00:00
ichdasich a9c549870d first pic-includes fixed
git-svn-id: svn://svn.cccv.de/engel-system@291 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-26 17:24:03 +00:00
ichdasich 4f7aae82f8 removed obsolete files in ../includes/
git-svn-id: svn://svn.cccv.de/engel-system@285 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-14 23:50:17 +00:00
ichdasich 83a90af930 fixed most of the files in http-root and includes
git-svn-id: svn://svn.cccv.de/engel-system@282 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-10 15:43:25 +00:00
ichdasich b00d5b96c6 moved /inc to ../includes
git-svn-id: svn://svn.cccv.de/engel-system@281 29ba0400-6e00-0410-a75a-ca02368028f8
2008-09-10 03:42:44 +00:00