Commit Graph

503 Commits

Author SHA1 Message Date
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