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

246 Commits (e44ba8456130fcd0a282ea91b5736d903f8c0496)

Author SHA1 Message Date
Philip Häusler 218b305a3e fix broken session creation
Philip Häusler 0a59089e2b add room model tests
Philip Häusler 284ed12f59 add bootstrap file
jere123 e41df963bb Endlosschleife gefixt 
Bei der Installation gibt der browser die Errormeldung zurück, dass die Anfrage zu oft umgeleitet würde.
Habe in Zeile 96 "login" zum array $free_pages hinzugefügt, da sonst der Abschnitt "gewünschte Seite/Funktion" sich immer wieder wiederholt ($p = "login" -> erste Bedingung (Z. 103) nicht erfüllt -> zweite Bedingung (Zeile 223) ist nicht erfüllt, da user nicht eingeloggt -> $p wird als login gesetzt (Z. 228) -> beginnt von vorne).
Philip Häusler d0cfa1dad6 fix glyphicon path
Philip Häusler 77183fb26b better horizontal scrolling on shifts table (thanks Roman/RmMsr)
Philip Häusler 6a05c3d9de rewrite create shifts for shifttypes
Philip Häusler d02272afd6 add basic shift view
Philip Häusler c8cc46886b shift type list
Philip Häusler a73e98a8e0 prepare shift types controller and view
Philip Häusler 25889920cf prepare for shift types model, add db update
Felix Favre f20e24f589 shift page styling
Philip Häusler 8befe4f7db make info text visible
Felix Favre d644952fcd also allow atom feed without login
Felix Favre 96d2aee2cb always allow access to ical and json_export_shifts 
fixes
Felix Favre 595fa5245e fix icon visibility in dark theme
Felix Favre cda4eac6fe commit theme 2
Felix Favre ac82f3dcd2 animation for alert messages
Philip Häusler fa0e38ebff add shift create model
Felix Favre 9e0cc40e6d added shift mailer
Felix Favre 1c18ce26ed 31c3 theme sucess color change
Felix Favre e9ae329be4 added another theme
Felix Favre 4589a505e8 css changes
Philip Häusler d34fae3c40 move hints to toolbar
Philip Häusler 8261933bec try to prevent hint duplication
Philip Häusler 30c8b48996 prevent forms from being double-submitted
Felix Favre 20d4b1b1c3 shift view css changes
Felix Favre 2f445eb90c Merge branch 'master' of github.com:engelsystem/engelsystem
Felix Favre 3973236f6e css and layout fixes. font path fix
Philip Häusler 57a92dbdcd add opt-in bool for shiftinfo mails and remove icq from users
Philip Häusler 4516cbe5d6 renamed mysql provider to mysqli, updated system requirements, fixes
Philip Häusler 4931fbb372 replace icons with glyphicons
Philip Häusler 086ddc2248 better application name
Philip Häusler 50fea6d371 fix session security issue (same session on multiple instances)
Philip Häusler dd3de2d47d hightlight free and occupied shifts like pre bootstrap
Philip Häusler 8a0bd3d55c several fixes 
- syntax error in index.php
- switched from sass to less because of bootstrap submodule
Moritz Kaspar Rudert (mortzu) 0cbac227d9 fixed file system permissions
Moritz Kaspar Rudert (mortzu) 27b8223611 removed bootstrap.php
Moritz Kaspar Rudert (mortzu) 5d8615a958 moved external libraries into gitmodules
Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem 
Conflicts:
	templates/layout.html
Felix Favre 88dfb2e3a8 Countdown implementation
Philip Häusler abb6d8bfd8 move moment js to vendor
Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem 
Conflicts:
	themes/theme1.scss
Philip Häusler f9e577352d remove html templates
Felix Favre 3a7893fb33 added moment-countdown js file
Philip Häusler 7f43f3bfe5 remove html templates
Philip Häusler 6bfa410f90 add moment js
Philip Häusler f5a094fd8b add user view, better bootstrap
Philip Häusler 74647e16d3 add basic bootstrap theme
Philip Häusler d394ed2fee notify coordinators about unconfirmed angeltypes
Philip Häusler e107dff1ce button style and redirect fixes
Philip Häusler 3963e4907a german update and style reset
Philip Häusler f40b78faac angeltypes about section
Philip Häusler 98f355cd86 added angeltype description
Philip Häusler 3162f77eb2 enabled api again
Philip Häusler 316c18f912 removed old user angeltypes
Philip Häusler 5e84539928 rewritten angeltypes and user angeltypes
Philip Häusler 493a29ea88 disable api
Philip Häusler a041e0efbb first api
Philip Häusler c589219a96 freeloader feature
Philip Häusler a5fbc7fbd5 fix news start page bug, not showing always news
Philip Häusler 161c04a206 fix news start page bug, not showing always news
Philip Häusler b34a71e20d fix news start page bug
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 4aa85a3ff2 api export for all shifts completed
Philip Häusler ad5899f028 api export for all shifts
Philip Häusler 821e37c1b2 removed faq feature
Philip Häusler e9565a79ea simplified config
Philip Häusler e475b4f083 prevent shirt and dect message from beeing shown when not logged in
Philip Häusler 988f7509d7 hint for specifying a dect number
Philip Häusler 18b5682363 hint for angels not having a shirt size
Philip Häusler 1e05da6c81 gettext for user sites
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 1f64ebc35e 30c3 design takeover
Philip Häusler 3c4321ff76 30c3 theme
Philip Häusler bfb0cacd54 mysql to mysqli and a lot of cleanup and mvc
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 f5f698a2a5 footer correction
Philip Häusler 3d2f6456e0 hint for not arrived angels
Jan-Philipp Litza b26994f518 moved footer to navigation and removed left-padding of headings, reworked credits
Jan-Philipp Litza 15668bad18 More filter functions and bigger filter button
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
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 263edf58f2 stats for infobeamer/monitor
Philip Häusler 7044c07c00 link to edit page and shift mates on myshifts page
Philip Häusler b8fb31c6c5 impossible merge fail
Philip Häusler c5438d5228 merged shift view fixes
Philip Häusler e61cb06ee8 enable deny/confirm all for restricted angeltypes
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
Jan-Philipp Litza dd5ca95975 fixes for last commit
Jan-Philipp Litza 13747c62fd more CSS an JS voodoo for bugblues table view
Philip Häusler 622b856298 merge css
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 74098af09d finnished logging
Jan-Philipp Litza e0e44fc8c3 added Atom feed for news and meetings
Philip Häusler 0dabaa505e begin log
Philip Häusler 572a986e48 29c3 design success notice
Philip Häusler 734447b40c 29c3 design
Philip Häusler 0b8d31a059 sigint logo
Philip Häusler ccdba91c57 common logo file
Philip Häusler 1633d62772 ical export for available shifts
Jan-Philipp Litza 037f19a137 Give MANY more filter options on shift view
Philip Häusler 8259266297 shiftplan
Philip Häusler 77381ebca8 confirm angel types
Philip Häusler 1852a2a1ae style duplication
Philip Häusler d1078f60fd new register form
root bc471460fc logo/style change
root 60a94627a7 logo/style change
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 d786fcde95 28c3 logo
Philip Häusler 4a9b09f0c3 28c3 logo
Philip Häusler 748c3a8b38 28c3 logo
Philip Häusler d4c17f48f5 admin_shifts: escape from preview
Philip Häusler 304af8e8f0 ical export, beginn
Philip Häusler fc90174dd8 joined login+start
Philip Häusler e665d1701f create multiple shifts
Philip Häusler 24e402c6e0 mark angels as arrived
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 2f822b8f7d textarea css
Philip Häusler 4f220e30ce prepare for shift entries
Philip Häusler eeff48ad97 import shift names
Philip Häusler a476beafe3 cleanup config
Philip Häusler d3d6d2e3f1 completed import with file-upload and fsock-open method
Philip Häusler f59f0eae9c pentabarf room import
Philip Häusler 377c24e13d secure page selection
Philip Häusler 04973d1fa1 moved public files to public, old and yet untouched files to directories ending with _old