Commit Graph

769 Commits (29128763fd7f4b1f300fbc7014b9e6608c5d21a4)

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