Commit Graph

878 Commits (ddfe3b028f637f28fa8fb6fb32249a87e744a4df)

Author SHA1 Message Date
msquare b87eb49b93 reduce complexity of table()
msquare 3738d071f8 remove long array syntax
msquare 1debe567f5 simplify user_angeltype_add_controller
msquare 9fce3b22aa fix issues after changing codestyle
msquare 9ad9088260 make short variable names longer
msquare a128bcbb38 use more ValidationResult
msquare 07ddbb0f4c make short variable names longer
msquare c231070dcc rename ok to valid
msquare f05f1a3cd4 rename to
msquare 81e5a6482c remove unused global from login
msquare 4c288e957e prohibit inline control structures on includes and index
msquare e965f8d041 prohibit inline control structures on model and view
msquare 91dafb19ec prohibit inline control structures on pages
msquare 1ec19b46f3 prohibit inline control structures on mailers
msquare 5170fd7f6e prohibit inline control structures on helpers
msquare bd9003f5d5 prohibit inline control structures on controllers
msquare 6685beb397 display event countdowns on start page
msquare 50bf7feff0 show event info in footer text line
msquare 6384eca1ce display user welcome message
msquare a083c198bb better log when changing event config
msquare 6f6724e55b update german translation
msquare 5957e05bf1 finished rename settings to event config and added more date validation for event config
msquare 031fc3057c rename settings to event config and implement mvc pattern on it
msquare 45bbf95972 fix settings validation
msquare 9e884bb444 remove unused code
msquare 3f4be08865 remove old update script
msquare 14d20933f7 improve quality of user atom
msquare 54e6f422ce cleanup guest stats
msquare 79588ff2cf split user atom into different functions
msquare d4bba0d468 remove exit code from shifts controller
msquare de917bc543 remove unused code
msquare f02148af35 fix rename bug
msquare 28e5a3b978 user_ical rewrite (remove codacy issues)
msquare 191328d703 fix method names, quotes, duplication in forms.js
msquare 53ad1b5110 fix codacy unused code
kamishetty sreeja 8a20b43f6d Added Feature Admin Settings Page
Philip Häusler 99c8751059 some minor text changes on user vouchers
Philip Häusler d0a07a74cc remove preg replace with e flag for php 7
tike 661e5595c4 issue - make app caluclate number of vouchers for angels
Philip Häusler 1da3cba5a7 fixes problem when adding rooms
Philip Häusler c4179df503 fixes bug when editing a room without changing its name
Philip Häusler ef60b95555 add a more secure way to delete users containing a password request
Philip Häusler 1983db901b better error message for creating room with name that is already used
Philip Häusler 2af1fd582e put message input to the top
Philip Häusler b479cdaef8 fix room creation
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 570037eed0 fix problem that angeltypes lose their restriction when edited by a coordinator
Philip Häusler dc5b0a6214 finish cleanup of angeltypes controller
Philip Häusler f7cf9b327e log updates on driving license information
Philip Häusler 0ac05d251c fixed: driving license feature completed - integrated into angeltypes
Philip Häusler 2cb44fe517 make angeltype names clickable
Philip Häusler facc32f133 add basic driver license information
Philip Häusler 761897a942 add 32c3 design
Philip Häusler 28edf6bd48 make register log entry include link to userpage
Philip Häusler 7bff27d20b fix : deleting angeltype doesn't log correctly
Philip Häusler 0e0f7f0516 fix : message popover not workin in safari
Philip Häusler d68c91be18 remove sessionhelper
msquare a92e1e3ea6 Merge pull request from engelsystem/remove-sessionhelper
remove sessionhelper
Philip Häusler 902a5852a4 fix user result check on user controller
Philip Häusler 3790818baf fix user delete log entry
Max Weller 0dc8da68f4 display room number in admin_rooms edit form
Felix Favre ecf25f5d2a replace overcomplicated regex for email validation with php function
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 1af6b8cf20 How Mysql Connection Error to user
fixes 
Felix Favre 2df2398b87 add more information to ical export
fixes 
Felix Favre 8c1f6d2c9c removed sessionhelper. we should let this handle the server administrator within the PHP config
Philip Häusler 128ee0911f fix wrong data at arrival statistics
Philip Häusler c4ee004095 rework arrival stat graphs and tables
gnomus a67237d0ef Named Function Correctly
gnomus 73197995d7 Merge pull request from engelsystem/feature-shift-types
Add Email Form Helper
gnomus 7306545e32 Add Email Form Helper
gnomus b3aa6cc473 Change Register form E-Mailfield to form_email
Philip Häusler a7189482e9 add shift creator and editor
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 18e49ee06a put active+shirt info into a new line
Philip Häusler fc0d97344e made shift creation angeltypes smaller (like room editing)
Philip Häusler 41280a17f5 added hint about nightshifts
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 5742306095 fix wrong user shift edit link
Philip Häusler 2823c0e438 fix angel list with multiple vouchers
Philip Häusler 803c0a552f make multiple vouchers possible
Philip Häusler 681d52fe0f fix frab import problem on creating rooms
Philip Häusler 18585285a3 fix user update problem
Philip Häusler 1dcd6c0f3f fix loggin on setting rooms angeltypes
Philip Häusler c06573bb87 add maintenance mode
Philip Häusler bc0354fbff responsive resizing for graphs is broken -> turn off
Philip Häusler 1a0ccddbe9 show number of user angel types to confirm in hint
Philip Häusler 6376b90e9f introduce table buttons to angeltype view
Philip Häusler 386a3c3298 remove duplication from unconfirmed angeltypes hint
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 4aec1b1536 fix doubleclick bug on user hint popover
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