719 Commits (f4f6dfefcbbd6b69e5baf0c82b91bfdce7472167)

Author SHA1 Message Date
Philip Häusler 8c518d4c34 add arrival date feature 9 years ago
Philip Häusler 66c7e67a03 remove avatars 9 years ago
Philip Häusler 53737666c6 add bootstrap datepicker 9 years ago
Philip Häusler 993d6a4f59 add cccamp15 design 9 years ago
Philip Häusler 86a4773243 add log entry test 10 years ago
Philip Häusler eddafead49 add function to clear log to model 10 years ago
Philip Häusler 1da5604f47 remove json auth feature (will be covered by api) 10 years ago
Philip Häusler 45c8a68beb deleted counter function - never needed in the last 4 years 10 years ago
Felix Favre c88b1adcfe Merge branch 'master' of github.com:engelsystem/engelsystem 10 years ago
Felix Favre dc2c986522 fix location of session file storage 10 years ago
Philip Häusler c6c0e8f2ff fix test running 10 years ago
Philip Häusler 218b305a3e fix broken session creation 10 years ago
Philip Häusler 0a59089e2b add room model tests 10 years ago
Philip Häusler 284ed12f59 add bootstrap file 10 years ago
Philip Häusler 0cb28c05b1 fix creation of shift types 10 years ago
Philip Häusler 9af229094d display user nicks on shift json export 10 years ago
Philip Häusler 48e4787548 set force active user to active 10 years ago
Philip Häusler ca37de95da fix shift update 10 years ago
Philip Häusler 739eddefd5 better shift sign up restriction 10 years ago
Philip Häusler a470a5f5d3 fix shift creation 10 years ago
Philip Häusler 6bede2fd22 harden the sql queries 10 years ago
Philip Häusler a6ab81b834 fix overfull progress bars 10 years ago
Philip Häusler cb46534569 move shift edit buttons 10 years ago
Philip Häusler 0b70fc2a7f better shift sign up buttons in shift view 10 years ago
Philip Häusler 502a52394e redirect to users page on shift cancel by admin 10 years ago
Philip Häusler 16ce2eb969 begin cleanup of user edit 10 years ago
Philip Häusler 247d9b65c1 remove user angeltype administration from user-edit 10 years ago
Philip Häusler af52251cef angelnames were too fat. 10 years ago
Philip Häusler 582c429fd4 allow admin to sign up more angels than needed again 10 years ago
Philip Häusler 8d6175a273 user cannot signup for full shifts 10 years ago
Philip Häusler af25ca9103 fix broken log nick 10 years ago
Philip Häusler 1ec2783a8e use user nick render 10 years ago
Philip Häusler dc412ba826 sort meetings by date 10 years ago
Philip Häusler 71a23be3d4 fade out for not arrived angels 10 years ago
Philip Häusler 77273425f7 fade out for not arrived angels 10 years ago
Philip Häusler bd48de258a update german translation 10 years ago
Philip Häusler 9007bb6790 sort news by date 10 years ago
Philip Häusler 47b52bc3f6 count confirmed and unconfirmed angels 10 years ago
Philip Häusler 8764be8604 display room per shift in shift table 10 years ago
Philip Häusler fc4a5e0e7a fix shift creation for shifttypes 10 years ago
Philip Häusler 9cabdb1d78 shift edit for shifttypes 10 years ago
Philip Häusler c602d0208f integrate voucher into user state 10 years ago
Philip Häusler 7cb3a772ed integrate vouche into user state 10 years ago
Philip Häusler 8ed077bcec user voucher feature 10 years ago
Philip Häusler 33bafad9b7 fix wrong redirect after shift edit 10 years ago
Philip Häusler 34e2f49875 shift signup improvements for shift view 10 years ago
Philip Häusler 3770ab8271 add import progress 10 years ago
Philip Häusler 0fda4a9181 update german translation 10 years ago
Philip Häusler 342b79ff3f more fixes 10 years ago
Philip Häusler 2d587478a1 fix different bugs with shift types 10 years ago
Philip Häusler 702047de53 add more icons for better shift view 10 years ago
Philip Häusler c12e5336fb display shifts with title 10 years ago
Philip Häusler 6a05c3d9de rewrite create shifts for shifttypes 10 years ago
Philip Häusler 0dbd0ea599 add basic shift view 10 years ago
Felix Favre 2f20540a6b more infos in shift view 10 years ago
Philip Häusler 038bf97178 link to next shift in menu 10 years ago
Philip Häusler d02272afd6 add basic shift view 10 years ago
Philip Häusler a791a75b0a integrate shift type into shifts 10 years ago
Philip Häusler 634a3739b2 better shift type links 10 years ago
Philip Häusler 3f8e5e47c0 add update, delete and view for shift type 10 years ago
Philip Häusler 526167ed11 add create shift type 10 years ago
Philip Häusler c8cc46886b shift type list 10 years ago
Philip Häusler a73e98a8e0 prepare shift types controller and view 10 years ago
Philip Häusler 294a21d163 add shift types model 10 years ago
Philip Häusler 25889920cf prepare for shift types model, add db update 10 years ago
Felix Favre 8a51e5d822 added headings template function
(cherry picked from commit 02457f00b809282d5fa4be19239a33afb3e927c3)
10 years ago
Felix Favre 807e420883 only log if api key was reset on purpose 10 years ago
Felix Favre d2e59e8f86 make FAQ Buttom more visible
fixes #166
10 years ago
Felix Favre b299b0e085 reworked user editing of angeltypes
fixes #170
10 years ago
Felix Favre f20e24f589 shift page styling 10 years ago
Felix Favre c18c0983fc only show "arrived" button if user has rights for it
fixes #172
10 years ago
Felix Favre be1bb5fbeb add simple search to log view 10 years ago
Philip Häusler 388dd0e136 display date 10 years ago
Philip Häusler 9125f7e5ab show 10000 log entries 10 years ago
Philip Häusler f39df75b4e list user buttons size 10 years ago
Felix Favre ed001633e6 Own Shifts ignore the filled filter.
issue #134
10 years ago
Felix Favre 3e958227aa fix shift collision display 10 years ago
Felix Favre e9bbd967ff add freeload info to shiftentry update log
issue #28
10 years ago
Felix Favre 5b3d0d302f on api-key reset also log the username 10 years ago
Felix Favre bc6aa9a209 responsify create room form 10 years ago
Felix Favre 1cc84a967a change default selection 10 years ago
Philip Häusler 7e650920d3 dont send mails for my own actions 10 years ago
Philip Häusler 1f572918ff include all mailers 10 years ago
Philip Häusler a4a4a0aecc fix missing ; 10 years ago
Philip Häusler f4fa7f5d33 union shift update model 10 years ago
Felix Favre 07b9de84c5 use mail helpers for shift delete and shift change 10 years ago
Felix Favre 8f918422f4 mailer functions for shift delete,assign,remove 10 years ago
Felix Favre 5b3e5750eb Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
	includes/model/ShiftEntry_model.php
10 years ago
Felix Favre 09ef38ff35 change shift mail function 10 years ago
Felix Favre 4b490167ac added User.Nick to ShiftEntries_by_shift function 10 years ago
Philip Häusler b75700ee1b add shift delete model 10 years ago
Philip Häusler d26f8aa12c add shift update model 10 years ago
Philip Häusler fa0e38ebff add shift create model 10 years ago
Philip Häusler 156db1eadd add shift entry update model 10 years ago
Philip Häusler 0a74ab94a8 add shift entry delete model 10 years ago
Philip Häusler 514d2aca64 add function to list users subscribed to a shift 10 years ago
Philip Häusler 9176261762 add shift entry create model 10 years ago
Felix Favre 09e65d1a84 Merge branch 'master' of github.com:engelsystem/engelsystem 10 years ago
Felix Favre 9e0cc40e6d added shift mailer 10 years ago
Philip Häusler 663526246b add settings button to user page 10 years ago
Felix Favre e9ae329be4 added another theme 10 years ago
Felix Favre 8bcce0e003 change button size in user_news 10 years ago
Felix Favre 6ade63f11d change popover sybol based on message 10 years ago
Felix Favre 69878fa458 changes to messages popover 10 years ago
Felix Favre 45ac884474 Merge branch 'master' of github.com:engelsystem/engelsystem 10 years ago
Felix Favre 921449f3ef more styling 10 years ago
Philip Häusler a48fd8fc37 change hint color on urgency 10 years ago
Philip Häusler d34fae3c40 move hints to toolbar 10 years ago
Philip Häusler 8261933bec try to prevent hint duplication 10 years ago
Felix Favre 40d83367bb beautify messages form 10 years ago
Felix Favre b97154d19e form_element helper now supports empty labels 10 years ago
Felix Favre 703de07a63 remove striped table from shift view 10 years ago
Felix Favre 2f445eb90c Merge branch 'master' of github.com:engelsystem/engelsystem 10 years ago
Felix Favre 3973236f6e css and layout fixes. font path fix 10 years ago
Philip Häusler 10d7fce163 fix wrong angel type alarm 10 years ago
Philip Häusler 481e52cf77 add email shiftinfo checkbox/flag 10 years ago
Philip Häusler 57a92dbdcd add opt-in bool for shiftinfo mails and remove icq from users 10 years ago
Felix Favre 191ba6e1b1 replace all the remaining old icons with glyphicons 10 years ago
Felix Favre 524acb15ba use the new very cool glyph button 10 years ago
Felix Favre de65cd64e1 add very cool button_glyph helper 10 years ago
Felix Favre 2654fcf228 use glyph_bool in admin_active view 10 years ago
Felix Favre 67bca99571 Use more Striped Tables
issue #159
10 years ago
illuxio 90a5e5ec14 Update User_view.php
Fix Nickname and DECT bug in settings.
10 years ago
Philip Häusler 4516cbe5d6 renamed mysql provider to mysqli, updated system requirements, fixes #145 10 years ago
Robert Oehlmann a42ba2f5a1 Fixed field assignments in shift entry creation form 10 years ago
Robert Oehlmann c4039f72bb Fixed shift duration calculation
Fixes issue #136
10 years ago
Robert Oehlmann 4edaa26911 Fixed shift edit/delete URLs in new layout 10 years ago
Philip Häusler 785fd45d3a fix register privilege 10 years ago
Philip Häusler 4931fbb372 replace icons with glyphicons 10 years ago
Philip Häusler bd2a8b441f clear up mvc for user list 10 years ago
Philip Häusler 1d9e1c467c user list rewritten 10 years ago
Philip Häusler 0f77edc4fb hint for disabled registration 10 years ago
Philip Häusler e4a042c8c3 clear userlist 10 years ago
Philip Häusler f06e4a0f47 move user messages to menu icon right 10 years ago
Philip Häusler 07b6541204 move language to submenu 10 years ago
Philip Häusler 094715e6ee optimize navbar for 1024 px width 10 years ago
Philip Häusler 50fea6d371 fix session security issue (same session on multiple instances) 10 years ago
Philip Häusler 46575d90c2 pulled complete menu to the top (go for mobile...) 10 years ago
Philip Häusler 1785c38698 fix login layout and add mobile nav 10 years ago
Philip Häusler 4414358cf5 fix wrong nick and api sql query 10 years ago
Philip Häusler 2716c63648 fix wrong username on angeltype confirm 10 years ago
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php 10 years ago
Philip Häusler 9adaeaa97a shift state text update 10 years ago
Philip Häusler fbdb8ae472 move new messages badge 10 years ago
Philip Häusler 53a10de5cf move json and ical export buttons 10 years ago
Philip Häusler 3da1748e84 correct shift state strings 10 years ago
Philip Häusler da6eaae215 refactor shift state 10 years ago
Philip Häusler 0e2b257342 begin to refactor user shift state 10 years ago
Philip Häusler 25b5096c7e update german translation 10 years ago
Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	themes/theme1.scss
10 years ago
Philip Häusler f9e577352d remove html templates 10 years ago
Felix Favre 520aed3d32 Changed Next Shift Countdown Format 10 years ago
Philip Häusler 7f43f3bfe5 remove html templates 10 years ago
Felix Favre c57e450ed2 Changed Angeltypes List Actions to Bootstrap Button Group 10 years ago
Philip Häusler 66f166399c better preselected angeltypes 10 years ago
Philip Häusler d60c2f0c40 better layout for user register 10 years ago
Philip Häusler 51cecb27e5 better layout for user settings 10 years ago
Philip Häusler f30bc25246 minor bugfixes 10 years ago
Philip Häusler c5331c44fd move language select to the top 10 years ago
Philip Häusler f5a094fd8b add user view, better bootstrap 10 years ago
Philip Häusler 74647e16d3 add basic bootstrap theme 10 years ago
Philip Häusler 721aa7f160 #148 fix wrong password validation message 10 years ago
Philip Häusler d394ed2fee notify coordinators about unconfirmed angeltypes 11 years ago
Philip Häusler f1145b8a5e implemented team/angeltype coordinators 11 years ago
Philip Häusler e107dff1ce button style and redirect fixes 11 years ago
Philip Häusler a33fc5e21d router simplification 11 years ago
Philip Häusler 3401c6f8b6 admin import now without template files 11 years ago
Philip Häusler cf20bc1c29 test for existing shifts 11 years ago
Philip Häusler dc7a56f422 fixed angeltype add model 11 years ago
Philip Häusler 0ce1ba5bf1 style rename to engelsystem default 11 years ago
Philip Häusler 3963e4907a german update and style reset 11 years ago
Philip Häusler 13f8a513d4 fix error messages on password recovery 11 years ago
Philip Häusler 462b78a7e7 better integration of angeltypes about 11 years ago
Philip Häusler ab450600d7 better integration of angeltypes about 11 years ago
Philip Häusler f40b78faac angeltypes about section 11 years ago
Philip Häusler 98f355cd86 added angeltype description 11 years ago
Philip Häusler 82c0d2acc2 controller comments 11 years ago
Philip Häusler b35a32ef52 completed api comments 11 years ago
Philip Häusler 239c2b1684 reviewed cookies api 11 years ago
Philip Häusler 71feeee3f2 innodb and foreign keys 11 years ago
Philip Häusler 27ff879f51 cookie-0007-API-getRoom-show-real-rooms.patch 11 years ago
Philip Häusler 6664433fab cookie-0006-API-add-cmd-sendMessage.patch 11 years ago
Philip Häusler 9dc5dbe3b6 cookie-0005-API-add-getApiKey.patch 11 years ago
Philip Häusler 316c18f912 removed old user angeltypes 11 years ago
Philip Häusler 5e84539928 rewritten angeltypes and user angeltypes 11 years ago
Philip Häusler d921cf903e tshirt sum 11 years ago
Philip Häusler 8c2157c546 shirt statistics 11 years ago
Philip Häusler 8fa78b55ac first api new files 11 years ago
Philip Häusler a041e0efbb first api 11 years ago
Philip Häusler 124cf64d4f try to fix ical, but still broken 11 years ago
Philip Häusler f2b0756296 user hover displays angeltypes 11 years ago
Philip Häusler 0a4bd66c5f removed email and age from user list 11 years ago
Philip Häusler 1174b11c0a display freeloads in angel list 11 years ago
Philip Häusler 299652e070 fix broken ical export 11 years ago
Philip Häusler 400dc093c6 force active function fix 11 years ago
Philip Häusler a9fb05b128 force active function 11 years ago
Philip Häusler 8ce67793df form text fields now make htmlspecialchars 11 years ago
Philip Häusler 9da2ff6f9f #137 fixed xss on login 11 years ago
Philip Häusler 9d709b2a73 freeloader fix, admins should edit user shifts 11 years ago
Philip Häusler c589219a96 freeloader feature 11 years ago
Philip Häusler 2c41fcdc09 display max 10000 log entries (1000 before) 11 years ago
Philip Häusler fdd4b44c0e fixed button font and added star to shirt size at registration 11 years ago
Philip Häusler 0c98f13eee user password recovery 11 years ago
Philip Häusler e46528ff21 #134 removed empty line at the end of admin log php 11 years ago
Philip Häusler ec4f173a61 admin import uses now msg functions 11 years ago
Philip Häusler 7df8b967f3 fixed count taken shifts entries 11 years ago
Philip Häusler a0ec1130a6 needed angeltypes corrected loading by room or special needs 11 years ago
Philip Häusler 3bc9d09f7a api all shifts export should only show needed angeltypes with count greater than 0 11 years ago
Philip Häusler 4aa85a3ff2 api export for all shifts completed 11 years ago
Philip Häusler ad5899f028 api export for all shifts 11 years ago
Philip Häusler 9a1ffdf198 fixed wrong lock icon paths 11 years ago
Philip Häusler 821e37c1b2 removed faq feature 11 years ago
Philip Häusler e9565a79ea simplified config 11 years ago
Philip Häusler d5b0311061 german translation update 11 years ago
Philip Häusler c1539ef5bb display stored dect number in settings 11 years ago
Philip Häusler ef66360f69 fix angeltype assign error 11 years ago
Philip Häusler 347a861da0 register with default config theme 11 years ago
Philip Häusler 33785f45a2 missing start and end shift in session 11 years ago
Philip Häusler e60b0df2ec gettext some german translation 11 years ago
Philip Häusler c8041fa27f template cleanup 11 years ago
Philip Häusler 1e05da6c81 gettext for user sites 11 years ago
Philip Häusler 8a5915594f gettext for admin active 11 years ago
Philip Häusler 7d3239f3fe forgot to add the new views 11 years ago
Philip Häusler 85d9bf4f9c angel views in english complete 11 years ago
Philip Häusler 813751ac7a language cleanup 11 years ago
Philip Häusler aad54bfe88 basic gettext integration 11 years ago
Philip Häusler 96a263f712 initial gettext integration 11 years ago
Philip Häusler 3c4321ff76 30c3 theme 11 years ago
Philip Häusler bfb0cacd54 mysql to mysqli and a lot of cleanup and mvc 11 years ago
Philip Häusler d50cc21f50 #119 extended json shift information for angeltypes and taken places 11 years ago
Philip Häusler fb8241039b #119 added links to json export 11 years ago
Philip Häusler a47b1935cb #119 added basic shift json export support using same pattern like ical export 11 years ago
Philip Häusler 98aac2a429 brought back hour sum on my shifts 12 years ago
Philip Häusler a573b4e325 replaced header with redirect function 12 years ago
Philip Häusler 8fd5ffb335 cleanup user myshifts 12 years ago
Philip Häusler dd4530d760 User Nick function, enhanced log with some links 12 years ago
Jan-Philipp Litza b26994f518 moved footer to navigation and removed left-padding of headings, reworked credits 12 years ago
Jan-Philipp Litza b32ade0a34 Fix new shift time filter and show dates for longer shift tables 12 years ago
Jan-Philipp Litza 3efe63fa10 fix #49: "Array" after preview in mass-shift-generation 12 years ago
Jan-Philipp Litza de695c0fe4 make shifts filterable by timespan instead of days and enable new view for arbitrary timespans 12 years ago
Jan-Philipp Litza 0d47caa09b simplified stats generation 12 years ago
Jan-Philipp Litza f91e00adc7 fix bug in signing off from shifts 12 years ago
Jan-Philipp Litza 7e44546f5c use bin icon instead of cross for deletion 12 years ago
Jan-Philipp Litza d509a10121 Prevent from signing up for colliding shifts servier-side 12 years ago
Jan-Philipp Litza 0dae68a9a3 indicate colliding shifts in new shift view 12 years ago
Jan-Philipp Litza bf226f87dc revert scrollable table because of bad browser implementation and replace by non-fixed header scrolling 12 years ago
Philip Häusler 38366b0285 fix admin user angeltypes, preventing from deleting all permissions 12 years ago
Philip Häusler 1f764e20a3 fixed strange hour sum impossible 12 years ago
Philip Häusler b7b8b142e3 fixed strange hour sum 12 years ago
Philip Häusler a7c44d8dce fixed strange hour sum 12 years ago