kontakt
/
engelsystem
3
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity
2,412 Commits
2 Branches
0 Tags
19 MiB
Commit Graph

697 Commits (36ba619d5a5528e529104e5ab7a59c070bbc5ab1)

Author SHA1 Message Date
Philip Häusler 522546795b search only for nickname on active angel page
Philip Häusler 4684d708fb better shift cancel messages and workflow
Philip Häusler 99d36e47b8 redirect to other users page on shift cancel
Philip Häusler 897053e049 redirect to users profile page after marking as arrived or not arrived
Philip Häusler 667466b9d0 add minutes to start and end of talks for frab import
Philip Häusler 28edf6bd48 make register log entry include link to userpage
Philip Häusler 3790818baf fix user delete log entry
Max Weller 0dc8da68f4 display room number in admin_rooms edit form
Felix Favre 73208016bf change date format in shift table 
fixes
Felix Favre e4bd324801 changed all y-m-d date formats to Y-m-d date formats 
part of
Felix Favre 2df2398b87 add more information to ical export 
fixes
Philip Häusler 128ee0911f fix wrong data at arrival statistics
Philip Häusler c4ee004095 rework arrival stat graphs and tables
gnomus b3aa6cc473 Change Register form E-Mailfield to form_email
Philip Häusler cac86ef509 add planned date of departure
Philip Häusler bc84710e9d wording
Philip Häusler 28788e6702 put shirt statistics into one table
Philip Häusler e8daa4d2ce add table of needed shirts to user active page
Philip Häusler fc0d97344e made shift creation angeltypes smaller (like room editing)
Philip Häusler 42150cc6e9 add log entry for deleting own shift entries
Philip Häusler 3d7e378b67 change default end date on creating shifts
Philip Häusler 1cd6a4f4f6 keep the show all users checkbox
Philip Häusler f9fb12c7f1 show all forced active angels
Philip Häusler 34be996f22 add possibility to show already done shifts in admin active view
Philip Häusler 1c9a3fa89e fix group rights management
Philip Häusler 723961c19e User shift admins see free and occupied shifts by default
Philip Häusler df526fa2bf fix problem with beeing informed about shift changes
Philip Häusler 681d52fe0f fix frab import problem on creating rooms
Philip Häusler 1dcd6c0f3f fix loggin on setting rooms angeltypes
Philip Häusler bc0354fbff responsive resizing for graphs is broken -> turn off
Philip Häusler bae55f78fd swap chart and table
Philip Häusler d414c455a2 responsive chart
Philip Häusler 46f0636f2f arrival statistics
Philip Häusler 18644cac7a fixes : make users planned arrival date editable in user settings and show it in their own profile
Philip Häusler 8c518d4c34 add arrival date feature
Philip Häusler 66c7e67a03 remove avatars
Philip Häusler 218b305a3e fix broken session creation
Philip Häusler 0a59089e2b add room model tests
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 6bede2fd22 harden the sql queries
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 582c429fd4 allow admin to sign up more angels than needed again
Philip Häusler 8d6175a273 user cannot signup for full shifts
Philip Häusler dc412ba826 sort meetings by date
Philip Häusler 71a23be3d4 fade out for not arrived angels
Philip Häusler 9007bb6790 sort news by date
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 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 d02272afd6 add basic shift view
Philip Häusler a791a75b0a integrate shift type into shifts
Felix Favre 807e420883 only log if api key was reset on purpose
Felix Favre b299b0e085 reworked user editing of angeltypes 
fixes
Felix Favre f20e24f589 shift page styling
Felix Favre be1bb5fbeb add simple search to log view
Philip Häusler 388dd0e136 display date
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 bc6aa9a209 responsify create room form
Felix Favre 1cc84a967a change default selection
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 9176261762 add shift entry create model
Felix Favre 8bcce0e003 change button size in user_news
Felix Favre 45ac884474 Merge branch 'master' of github.com:engelsystem/engelsystem
Felix Favre 921449f3ef more styling
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 703de07a63 remove striped table from shift view
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 2654fcf228 use glyph_bool in admin_active view
Felix Favre 67bca99571 Use more Striped Tables 
issue
Robert Oehlmann a42ba2f5a1 Fixed field assignments in shift entry creation form
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 094715e6ee optimize navbar for 1024 px width
Philip Häusler 46575d90c2 pulled complete menu to the top (go for mobile...)
Philip Häusler 1785c38698 fix login layout and add mobile nav
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php
Philip Häusler fbdb8ae472 move new messages badge
Philip Häusler 0e2b257342 begin to refactor user shift state
Philip Häusler 25b5096c7e update german translation
Philip Häusler f9e577352d remove html templates
Philip Häusler 7f43f3bfe5 remove html templates
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 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 e107dff1ce button style and redirect fixes
Philip Häusler 3401c6f8b6 admin import now without template files
Philip Häusler cf20bc1c29 test for existing shifts
Philip Häusler 13f8a513d4 fix error messages on password recovery
Philip Häusler ab450600d7 better integration of angeltypes about
Philip Häusler f40b78faac angeltypes about section
Philip Häusler 239c2b1684 reviewed cookies api
Philip Häusler 71feeee3f2 innodb and foreign keys
Philip Häusler 6664433fab cookie-0006-API-add-cmd-sendMessage.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 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 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 9a1ffdf198 fixed wrong lock icon paths
Philip Häusler 821e37c1b2 removed faq feature
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 85d9bf4f9c angel views in english complete
Philip Häusler aad54bfe88 basic gettext integration
Philip Häusler 96a263f712 initial gettext integration
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 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 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 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 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
Jan-Philipp Litza 3cc2896376 multiply night shifts by 2 (confable with raw mysql)
Jan-Philipp Litza 51c6547610 advanced form in user administration for confirming angeltypes
Jan-Philipp Litza 7344a08a2f Merge branch 'master' into dev
Jan-Philipp Litza 26dafba606 hotfix for time lock before unsigning from shifts
Philip Häusler 0dabaa505e begin log
Philip Häusler 213b6261c8 right fix
Philip Häusler b8854f7158 right fix
Philip Häusler 419da73bef right fix
Philip Häusler fd199ea3a0 fix user shift joined nicknames
Philip Häusler 2d5449f213 sort angeltypes on user shifts
Philip Häusler ad9695573f profile link in admin user angeltypes
Philip Häusler 95880bb7d6 bugblue-layout fix
Philip Häusler 6a30868814 bugblue-layout fix
Philip Häusler b3df228845 bugblue-one-day-calendar-layout-patch
Philip Häusler 8591fb4b5f fix password mind length check
Jan-Philipp Litza db95fe6485 new authentication framework with stronger passwords and real salts - please proofread!
Jan-Philipp Litza 697b756c4e more translations and fixes
Jan-Philipp Litza 910af3eaf7 fixes for the last commit
Jan-Philipp Litza a007a23d75 fix (SQL error in shift filter) and translate "shifts" and "my shifts" a lot
Philip Häusler e0b4562de6 sort angeltypes to be confirmed
Philip Häusler 5660d36ef9 sort angeltypes to be confirmed
Philip Häusler 079279a1d0 code maintenance
Philip Häusler d0c82e1037 discard angel type requests
Philip Häusler 9e7c2dfeca shift join right fuckup
Philip Häusler f62bd8e56b ical fix
Philip Häusler 6dba2ad03d translation fix
Philip Häusler 08f12cbe5b fixes : unrestrict angel types is possible now
Philip Häusler a31ff40a8e fixes: : last login switched with register date
Philip Häusler 781a996b3b fixes : shirt size is now mandatory 
fixes : login error to the top
Philip Häusler ddbc5a9db2 old faq version
Philip Häusler 505ad98e33 fix problems with changing needed angeltypes in rooms
Philip Häusler aac265ec7e fix problem changing tel and/or dect
Philip Häusler 0114edc0ca edit shifts where already somebody subscribed
Philip Häusler bc03069017 fixed problem with editing angels rights and angels can not subscribe running oder ended shifs now
Philip Häusler 2a944121f8 keep symbols in text messages
Philip Häusler 4eaa0d10ea sort filter days
Philip Häusler 9bed1f02ea fix admin edit of t-shirt sizes
Philip Häusler f81943f6c5 make hidden rooms visible for shift creation
Philip Häusler 6be6802488 make adding rooms work
Philip Häusler b6ff5cf834 create rooms possible with working add-button
Jan-Philipp Litza 34582524ba adapted admin section for FAQ to new database scheme
Philip Häusler 046c9e9caf fix some php warnings
Philip Häusler e8cc1e7b4f more redirects - better flow when configuring shifts and shift entries
Philip Häusler b864f2c5b1 cleanup old unused files, display tshirt size in admin_active
Philip Häusler 8968763ff3 provide more information (multiple rooms) in available shifts
Philip Häusler cf3960aeba shiftplan ical export
Philip Häusler 1633d62772 ical export for available shifts
Philip Häusler 666bb3919c Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
Philip Häusler 8c1f9e7057 admin_room rewrite
Jan-Philipp Litza 037f19a137 Give MANY more filter options on shift view
Philip Häusler 8259266297 shiftplan
Philip Häusler e0ffeb1005 registration fix
Philip Häusler 9b46a83870 registration fix
Jan-Philipp Litza d3b51174b6 performance improvements for displaying shifts
Philip Häusler b707f55250 registration fix
Philip Häusler 60810251e5 ical reset fix
Philip Häusler 043a1203d4 bugfixes with angeltype (TID removed)
Philip Häusler 80f355a94f edit user <- user_angeltypes
Philip Häusler 77381ebca8 confirm angel types
Philip Häusler b3d4d7dc52 user angel types -> user_settings, cleanup
Philip Häusler 9e8d3aca6c user angel types -> user_settings
Philip Häusler 278dc8e5b0 changed angel types table layout
Philip Häusler d0bb9fbbeb Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
Jan-Philipp Litza 7154097581 database update script
Philip Häusler 1852a2a1ae style duplication
Philip Häusler d1078f60fd new register form
root 60a94627a7 logo/style change
Angelo Cuccato 07bc29128c fix import with fsockopen
Philip Häusler ce7f071c38 angeltypes recreated
Philip Häusler def9532d6b angeltypes recreated
Philip Häusler 5e5443fad6 angeltypes recreated
Philip Häusler 10b4f94e5b list of currently unemployed angels
Philip Häusler 61d61848a4 , , angels active and t-shirts
Philip Häusler 471cbad391 schichten von fremen usern einsehen können, für dispatcher
Philip Häusler d4c17f48f5 admin_shifts: escape from preview
Philip Häusler a06ffd2e49 ical export, key reset
Philip Häusler f8ec85e4c6 ical export, link explained
Philip Häusler 304af8e8f0 ical export, beginn
Philip Häusler 1854e1455a begin edit shifts feature, completed
Philip Häusler b47b6ed7e4 begin edit shifts feature, simplified needed angels
Philip Häusler 403c11047b begin edit shifts feature
Philip Häusler 402dc172b6 fixed shift length display
Philip Häusler 8a5f510da2 fix issue , edit rights of righless users
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
Jan-Philipp Litza 2ad0124eb0 Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
Jan-Philipp Litza 01bd4e33de remove statistics from angel list which used includes_old functions
Philip Häusler 95e9e7b147 translated user_shifts to german
Philip Häusler 6a84dadf1a fixed news table name
Jan-Philipp Litza e9193a7161 fix typo and remove some globals
Philip Häusler 1342dc49cf translated *_question to german
Philip Häusler 8e35c721d7 user_shifts fixed error with empty shifts table
Philip Häusler a5c6ad4393 translated some pages to german
Philip Häusler 3c33e23c3c admin_news privilege for writing news too
Philip Häusler fc90174dd8 joined login+start
Philip Häusler 0eb9830818 shift name is now optional
Philip Häusler ddf309717b delete shifts
Philip Häusler d63e7e9aad fixed user_shifts needed angel types calculation
Philip Häusler b399227956 fixed shift calculation
Philip Häusler 024c5ff2e2 preview for shifts to be created
Philip Häusler 4303b05d08 form validation for creating shifts (admin_shifts) and changed database layout
Philip Häusler 82522881d4 begin form validation
Philip Häusler e665d1701f create multiple shifts
root 28b50acb88 user_shifts: 15 freie noch kommende schichten anzeigen (und nicht bereits vergangene)
Philip Häusler c3a9e66c32 search function for arrived angels
Philip Häusler 24e402c6e0 mark angels as arrived
Philip Häusler e8c035e166 edit my shift comment
Philip Häusler 3add966f23 needed files and settings for new modul admin_arrive
Philip Häusler 05410ba89a my shifts | cancel my shifts
Philip Häusler 32cdb6b0e1 , begin myshifts
Philip Häusler 4ee429a27b , shift registration and shift entry administration
Philip Häusler 80bff6bab6 angel shift signup
Philip Häusler 2bf28a3505 prepare for shift entries, verify
Philip Häusler 4f220e30ce prepare for shift entries
Philip Häusler 1bb1997e04 browse shifts
Philip Häusler 526b9783aa angels shifts
Philip Häusler eeff48ad97 import shift names
Philip Häusler 02e187a4ec made t-shirt-size optional for angels
Philip Häusler d3d6d2e3f1 completed import with file-upload and fsock-open method