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

685 Commits

Author SHA1 Message Date
Philip Häusler 5742306095 fix wrong user shift edit link 2015-08-13 09:13:13 +02:00
Philip Häusler 2823c0e438 fix angel list with multiple vouchers 2015-08-12 23:47:06 +02:00
Philip Häusler 803c0a552f make multiple vouchers possible 2015-08-12 23:44:39 +02:00
Philip Häusler 681d52fe0f fix frab import problem on creating rooms 2015-08-12 20:43:22 +02:00
Philip Häusler 18585285a3 fix user update problem 2015-08-11 12:04:22 +02:00
Philip Häusler 1dcd6c0f3f fix loggin on setting rooms angeltypes 2015-08-09 17:56:03 +02:00
Philip Häusler c06573bb87 add maintenance mode 2015-08-09 17:46:57 +02:00
Philip Häusler bc0354fbff responsive resizing for graphs is broken -> turn off 2015-07-27 17:36:42 +02:00
Philip Häusler 1a0ccddbe9 show number of user angel types to confirm in hint 2015-07-27 17:20:05 +02:00
Philip Häusler 6376b90e9f introduce table buttons to angeltype view 2015-07-27 17:14:41 +02:00
Philip Häusler 386a3c3298 remove duplication from unconfirmed angeltypes hint 2015-07-27 17:05:16 +02:00
Philip Häusler bae55f78fd swap chart and table 2015-07-18 21:34:14 +02:00
Philip Häusler d414c455a2 responsive chart 2015-07-18 21:32:50 +02:00
Philip Häusler 46f0636f2f arrival statistics 2015-07-18 21:27:30 +02:00
Philip Häusler 18644cac7a fixes #196: make users planned arrival date editable in user settings and show it in their own profile 2015-07-15 21:53:19 +02:00
Philip Häusler 4aec1b1536 fix doubleclick bug on user hint popover 2015-07-12 20:06:34 +02:00
Philip Häusler 8c518d4c34 add arrival date feature 2015-07-12 14:45:58 +02:00
Philip Häusler 66c7e67a03 remove avatars 2015-07-12 13:51:39 +02:00
Philip Häusler 53737666c6 add bootstrap datepicker 2015-07-12 13:45:47 +02:00
Philip Häusler 993d6a4f59 add cccamp15 design 2015-07-12 12:44:09 +02:00
Philip Häusler 86a4773243 add log entry test 2015-06-07 20:42:01 +02:00
Philip Häusler eddafead49 add function to clear log to model 2015-06-07 20:12:18 +02:00
Philip Häusler 1da5604f47 remove json auth feature (will be covered by api) 2015-06-07 20:11:50 +02:00
Philip Häusler 45c8a68beb deleted counter function - never needed in the last 4 years 2015-06-07 19:40:51 +02:00
Felix Favre c88b1adcfe Merge branch 'master' of github.com:engelsystem/engelsystem 2015-06-07 15:06:24 +02:00
Felix Favre dc2c986522 fix location of session file storage 2015-06-07 15:05:59 +02:00
Philip Häusler c6c0e8f2ff fix test running 2015-06-07 13:45:47 +02:00
Philip Häusler 218b305a3e fix broken session creation 2015-06-07 13:33:59 +02:00
Philip Häusler 0a59089e2b add room model tests 2015-05-14 17:20:46 +02:00
Philip Häusler 284ed12f59 add bootstrap file 2015-05-14 16:37:12 +02:00
Philip Häusler 0cb28c05b1 fix creation of shift types 2015-01-10 11:12:02 +01:00
Philip Häusler 9af229094d display user nicks on shift json export 2015-01-05 13:58:34 +01:00
Philip Häusler 48e4787548 set force active user to active 2015-01-05 13:58:24 +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 a470a5f5d3 fix shift creation 2014-12-28 13:57:50 +01:00
Philip Häusler 6bede2fd22 harden the sql queries 2014-12-28 13:44:56 +01:00
Philip Häusler a6ab81b834 fix overfull progress bars 2014-12-28 01:35:36 +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 502a52394e redirect to users page on shift cancel by admin 2014-12-27 23:38:23 +01:00
Philip Häusler 16ce2eb969 begin cleanup of user edit 2014-12-27 21:55:24 +01:00
Philip Häusler 247d9b65c1 remove user angeltype administration from user-edit 2014-12-27 21:48:08 +01:00
Philip Häusler af52251cef angelnames were too fat. 2014-12-27 21:32:02 +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 af25ca9103 fix broken log nick 2014-12-26 22:03:35 +01:00
Philip Häusler 1ec2783a8e use user nick render 2014-12-26 19:26:53 +01:00
Philip Häusler dc412ba826 sort meetings by date 2014-12-26 19:22:03 +01:00
Philip Häusler 71a23be3d4 fade out for not arrived angels 2014-12-26 19:11:26 +01:00
Philip Häusler 77273425f7 fade out for not arrived angels 2014-12-26 18:59:32 +01:00
Philip Häusler bd48de258a update german translation 2014-12-26 18:51:06 +01:00
Philip Häusler 9007bb6790 sort news by date 2014-12-26 18:39:16 +01:00
Philip Häusler 47b52bc3f6 count confirmed and unconfirmed angels 2014-12-26 16:57:58 +01:00
Philip Häusler 8764be8604 display room per shift in shift table 2014-12-26 14:31:37 +01:00
Philip Häusler fc4a5e0e7a fix shift creation for shifttypes 2014-12-26 02:34:57 +01:00
Philip Häusler 9cabdb1d78 shift edit for shifttypes 2014-12-26 02:27:54 +01:00
Philip Häusler c602d0208f integrate voucher into user state 2014-12-26 01:57:15 +01:00
Philip Häusler 7cb3a772ed integrate vouche into user state 2014-12-26 01:56:16 +01:00
Philip Häusler 8ed077bcec user voucher feature 2014-12-26 01:49:59 +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 3770ab8271 add import progress 2014-12-22 20:30:29 +01:00
Philip Häusler 0fda4a9181 update german translation 2014-12-22 20:25:19 +01:00
Philip Häusler 342b79ff3f more fixes 2014-12-22 20:18:34 +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 6a05c3d9de rewrite create shifts for shifttypes 2014-12-22 17:55:20 +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 038bf97178 link to next shift in menu 2014-12-19 22:59:18 +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
Philip Häusler 634a3739b2 better shift type links 2014-12-17 16:08:04 +01:00
Philip Häusler 3f8e5e47c0 add update, delete and view for shift type 2014-12-17 14:59:41 +01:00
Philip Häusler 526167ed11 add create shift type 2014-12-17 14:59:41 +01:00
Philip Häusler c8cc46886b shift type list 2014-12-17 14:59:41 +01:00
Philip Häusler a73e98a8e0 prepare shift types controller and view 2014-12-17 14:59:41 +01:00
Philip Häusler 294a21d163 add shift types model 2014-12-17 14:59:41 +01:00
Philip Häusler 25889920cf prepare for shift types model, add db update 2014-12-17 14:59:40 +01:00
Felix Favre 8a51e5d822 added headings template function 
(cherry picked from commit 02457f00b809282d5fa4be19239a33afb3e927c3)
 2014-12-16 03:39:43 +01:00
Felix Favre 807e420883 only log if api key was reset on purpose 2014-12-16 00:54:50 +01:00
Felix Favre d2e59e8f86 make FAQ Buttom more visible 
fixes #166
 2014-12-16 00:36:24 +01:00
Felix Favre b299b0e085 reworked user editing of angeltypes 
fixes #170
 2014-12-16 00:16:10 +01:00
Felix Favre f20e24f589 shift page styling 2014-12-15 23:09:06 +01:00
Felix Favre c18c0983fc only show "arrived" button if user has rights for it 
fixes #172
 2014-12-15 21:31:40 +01:00
Felix Favre be1bb5fbeb add simple search to log view 2014-12-15 21:23:57 +01:00
Philip Häusler 388dd0e136 display date 2014-12-15 19:08:40 +01:00
Philip Häusler 9125f7e5ab show 10000 log entries 2014-12-15 19:07:53 +01:00
Philip Häusler f39df75b4e list user buttons size 2014-12-15 18:36:12 +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
Felix Favre e9bbd967ff add freeload info to shiftentry update log 
issue #28
 2014-12-12 23:40:36 +01:00
Felix Favre 5b3d0d302f on api-key reset also log the username 2014-12-12 23:39:54 +01:00
Felix Favre bc6aa9a209 responsify create room form 2014-12-12 22:55:56 +01:00
Felix Favre 1cc84a967a change default selection 2014-12-12 22:41:35 +01:00
Philip Häusler 7e650920d3 dont send mails for my own actions 2014-12-07 20:42:54 +01:00
Philip Häusler 1f572918ff include all mailers 2014-12-07 20:29:01 +01:00
Philip Häusler a4a4a0aecc fix missing ; 2014-12-07 19:47:36 +01:00
Philip Häusler f4fa7f5d33 union shift update model 2014-12-07 19:47:02 +01:00
Felix Favre 07b9de84c5 use mail helpers for shift delete and shift change 2014-12-07 19:44:59 +01:00
Felix Favre 8f918422f4 mailer functions for shift delete,assign,remove 2014-12-07 19:43:48 +01:00
Felix Favre 5b3e5750eb Merge branch 'master' of github.com:engelsystem/engelsystem 
Conflicts:
	includes/model/ShiftEntry_model.php
 2014-12-07 18:04:03 +01:00
Felix Favre 09ef38ff35 change shift mail function 2014-12-07 18:01:45 +01:00
Felix Favre 4b490167ac added User.Nick to ShiftEntries_by_shift function 2014-12-07 18:01:05 +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 fa0e38ebff add shift create model 2014-12-07 17:34:29 +01:00
Philip Häusler 156db1eadd add shift entry update model 2014-12-07 17:13:14 +01:00
Philip Häusler 0a74ab94a8 add shift entry delete model 2014-12-07 17:07:19 +01:00
Philip Häusler 514d2aca64 add function to list users subscribed to a shift 2014-12-07 16:54:13 +01:00
Philip Häusler 9176261762 add shift entry create model 2014-12-07 16:54:13 +01:00
Felix Favre 09e65d1a84 Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-07 16:38:45 +01:00
Felix Favre 9e0cc40e6d added shift mailer 2014-12-07 16:38:31 +01:00
Philip Häusler 663526246b add settings button to user page 2014-12-07 16:15:20 +01:00
Felix Favre e9ae329be4 added another theme 2014-12-07 15:43:25 +01:00
Felix Favre 8bcce0e003 change button size in user_news 2014-12-07 00:10:47 +01:00
Felix Favre 6ade63f11d change popover sybol based on message 2014-12-07 00:10:09 +01:00
Felix Favre 69878fa458 changes to messages popover 2014-12-07 00:09:38 +01:00
Felix Favre 45ac884474 Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-06 22:46:40 +01:00
Felix Favre 921449f3ef more styling 2014-12-06 22:46:23 +01:00
Philip Häusler a48fd8fc37 change hint color on urgency 2014-12-06 22:31:42 +01:00
Philip Häusler d34fae3c40 move hints to toolbar 2014-12-06 22:26:56 +01:00
Philip Häusler 8261933bec try to prevent hint duplication 2014-12-06 21:40:16 +01:00
Felix Favre 40d83367bb beautify messages form 2014-12-06 20:02:47 +01:00
Felix Favre b97154d19e form_element helper now supports empty labels 2014-12-06 20:01:47 +01:00
Felix Favre 703de07a63 remove striped table from shift view 2014-12-06 19:49:16 +01:00
Felix Favre 2f445eb90c Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-06 19:02:26 +01:00
Felix Favre 3973236f6e css and layout fixes. font path fix 2014-12-06 19:02:02 +01:00
Philip Häusler 10d7fce163 fix wrong angel type alarm 2014-12-06 18:55:24 +01:00
Philip Häusler 481e52cf77 add email shiftinfo checkbox/flag 2014-12-06 18:37:39 +01:00
Philip Häusler 57a92dbdcd add opt-in bool for shiftinfo mails and remove icq from users 2014-12-06 18:37:39 +01:00
Felix Favre 191ba6e1b1 replace all the remaining old icons with glyphicons 2014-12-06 18:16:18 +01:00
Felix Favre 524acb15ba use the new very cool glyph button 2014-12-06 17:42:29 +01:00
Felix Favre de65cd64e1 add very cool button_glyph helper 2014-12-06 17:41:16 +01:00
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
illuxio 90a5e5ec14 Update User_view.php 
Fix Nickname and DECT bug in settings.
 2014-11-25 17:30:17 +01:00
Philip Häusler 4516cbe5d6 renamed mysql provider to mysqli, updated system requirements, fixes #145 2014-11-04 11:22:32 +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
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 50fea6d371 fix session security issue (same session on multiple instances) 2014-09-20 18:31:59 +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 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
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php 2014-09-08 08:38:08 +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
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 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 520aed3d32 Changed Next Shift Countdown Format 2014-08-23 17:30:38 +02:00
Philip Häusler 7f43f3bfe5 remove html templates 2014-08-23 17:24:11 +02:00
Felix Favre c57e450ed2 Changed Angeltypes List Actions to Bootstrap Button Group 2014-08-23 16:25:51 +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 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 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
Philip Häusler 82c0d2acc2 controller comments 2014-01-07 16:19:35 +01:00
Philip Häusler b35a32ef52 completed api comments 2014-01-07 15:56:31 +01:00
Philip Häusler 239c2b1684 reviewed cookies api 2014-01-07 15:50:16 +01:00
Philip Häusler 71feeee3f2 innodb and foreign keys 2014-01-05 20:04:09 +01:00
Philip Häusler 27ff879f51 cookie-0007-API-getRoom-show-real-rooms.patch 2014-01-05 19:35:01 +01:00
Philip Häusler 6664433fab cookie-0006-API-add-cmd-sendMessage.patch 2014-01-05 19:34:17 +01:00
Philip Häusler 9dc5dbe3b6 cookie-0005-API-add-getApiKey.patch 2014-01-05 19:33:52 +01:00
Philip Häusler 316c18f912 removed old user angeltypes 2014-01-05 19:31:17 +01:00