Philip Häusler
|
b8fb31c6c5
|
impossible merge fail
|
2012-12-28 17:58:48 +01:00 |
|
Philip Häusler
|
f759296db3
|
make new angeltype confirmes less annoying
|
2012-12-28 17:54:34 +01:00 |
|
Philip Häusler
|
ff99dd5b71
|
fixed merge fail - reconstructed new shift view
|
2012-12-28 17:54:06 +01:00 |
|
Jan-Philipp Litza
|
9270b54eb1
|
optimizations and minor fixes for user_shifts and admin_user
|
2012-12-28 17:47:02 +01:00 |
|
Philip Häusler
|
c5438d5228
|
merged shift view fixes
|
2012-12-28 15:13:28 +01:00 |
|
Philip Häusler
|
e61cb06ee8
|
enable deny/confirm all for restricted angeltypes
|
2012-12-28 15:09:20 +01:00 |
|
Jan-Philipp Litza
|
cc8f117ed1
|
fix remembering of new-style-setting and fix a bug with signing up for shifts after they startet
|
2012-12-28 03:53:08 +01:00 |
|
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
|
2012-12-28 03:32:31 +01:00 |
|
Jan-Philipp Litza
|
4c329ecbf9
|
more CSS an JS voodoo for bugblues table view
|
2012-12-27 23:05:09 +01:00 |
|
Philip Häusler
|
76efad3c5b
|
fix duplicating user angel types
|
2012-12-27 23:05:09 +01:00 |
|
Jan-Philipp Litza
|
dd5ca95975
|
fixes for last commit
|
2012-12-27 22:49:10 +01:00 |
|
Jan-Philipp Litza
|
13747c62fd
|
more CSS an JS voodoo for bugblues table view
|
2012-12-27 22:46:41 +01:00 |
|
Philip Häusler
|
a0ec26126e
|
fix duplicating user angel types
|
2012-12-27 21:24:44 +01:00 |
|
Philip Häusler
|
622b856298
|
merge css
|
2012-12-27 18:08:01 +01:00 |
|
Philip Häusler
|
88134641b8
|
made angel types usable
|
2012-12-27 18:03:58 +01:00 |
|
Philip Häusler
|
242408b71c
|
fixed shift view bug
|
2012-12-27 17:35:42 +01:00 |
|
Philip Häusler
|
62e72eda93
|
simplified shift view
|
2012-12-27 17:35:42 +01:00 |
|
Jan-Philipp Litza
|
5c8290d880
|
made the user list a bit nicer
|
2012-12-27 17:35:42 +01:00 |
|
Jan-Philipp Litza
|
3af1d09d61
|
reworked admin_user again
|
2012-12-27 17:32:14 +01:00 |
|
Jan-Philipp Litza
|
b01ab50367
|
Revert "simplified shift view"
This reverts commit 43970df0f3.
|
2012-12-27 16:57:03 +01:00 |
|
Philip Häusler
|
f787a2ec70
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
2012-12-27 16:34:58 +01:00 |
|
Philip Häusler
|
43970df0f3
|
simplified shift view
|
2012-12-27 16:34:41 +01:00 |
|
Jan-Philipp Litza
|
e12608ee73
|
made the user list a bit nicer
|
2012-12-27 16:11:07 +01:00 |
|
Philip Häusler
|
e82c31a76d
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
2012-12-27 15:00:41 +01:00 |
|
Philip Häusler
|
1cf84a87be
|
fix bad html at user_shifts
|
2012-12-27 15:00:21 +01:00 |
|
Jan-Philipp Litza
|
7a2eae0a4b
|
fix sign out button and remove edit button for "myshifts" when viewing other users
|
2012-12-27 14:46:55 +01:00 |
|
Jan-Philipp Litza
|
c0bdfe0871
|
link to Volunteers page of 29C3 whereever angeltypes are mentioned
|
2012-12-27 14:33:13 +01:00 |
|
Jan-Philipp Litza
|
35202cc525
|
allow IP address change while being logged in
|
2012-12-27 14:25:48 +01:00 |
|
Jan-Philipp Litza
|
5a7a32d559
|
make search case-insensitive
|
2012-12-27 14:24:05 +01:00 |
|
Philip Häusler
|
7fa2353c38
|
#28 array hotfix for log
|
2012-12-27 03:32:15 +01:00 |
|
Philip Häusler
|
caeadadb27
|
Merge branch 'dev'
|
2012-12-27 03:04:54 +01:00 |
|
Philip Häusler
|
32cae74a58
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
2012-12-27 03:03:47 +01:00 |
|
Jan-Philipp Litza
|
0f0f847af4
|
minor fixes for logging and user editing and searching
|
2012-12-27 02:54:57 +01:00 |
|
Philip Häusler
|
670cd715c5
|
#28 logging doku
|
2012-12-27 02:44:21 +01:00 |
|
Philip Häusler
|
26ffee4a96
|
#28 logging doku
|
2012-12-27 02:18:56 +01:00 |
|
Philip Häusler
|
29a6f020e6
|
#28 finnished logging, fixes, inverted log order
|
2012-12-27 02:18:02 +01:00 |
|
Philip Häusler
|
9293cea5a1
|
Merge branch 'dev' of https://vcs.wybt.net/engelsystem/git into dev
|
2012-12-27 02:07:59 +01:00 |
|
Philip Häusler
|
12fb781946
|
#28 finnished logging
|
2012-12-27 02:07:49 +01:00 |
|
Philip Häusler
|
74098af09d
|
#28 finnished logging
|
2012-12-27 01:35:05 +01:00 |
|
Philip Häusler
|
7c42769ab8
|
#28 finnished logging
|
2012-12-27 01:35:05 +01:00 |
|
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
|
2012-12-26 23:15:08 +01:00 |
|
Jan-Philipp Litza
|
346209fbc2
|
ignore more files
|
2012-12-26 20:41:11 +01:00 |
|
Jan-Philipp Litza
|
e0e44fc8c3
|
added Atom feed for news and meetings
|
2012-12-26 20:39:54 +01:00 |
|
Jan-Philipp Litza
|
fe6fab67be
|
filter free angels by angeltype
|
2012-12-26 18:14:23 +01:00 |
|
Jan-Philipp Litza
|
3cc2896376
|
multiply night shifts by 2 (confable with raw mysql)
|
2012-12-26 17:27:27 +01:00 |
|
Jan-Philipp Litza
|
51c6547610
|
advanced form in user administration for confirming angeltypes
|
2012-12-26 16:58:09 +01:00 |
|
Jan-Philipp Litza
|
7344a08a2f
|
Merge branch 'master' into dev
|
2012-12-26 16:10:59 +01:00 |
|
Jan-Philipp Litza
|
26dafba606
|
hotfix for time lock before unsigning from shifts
|
2012-12-26 16:09:23 +01:00 |
|
Philip Häusler
|
0dabaa505e
|
#28 begin log
|
2012-12-26 14:02:27 +01:00 |
|
Philip Häusler
|
213b6261c8
|
right fix
|
2012-12-25 19:32:08 +01:00 |