msquare
|
45bbf95972
|
fix settings validation
|
2016-09-27 17:49:39 +02:00 |
|
msquare
|
9e884bb444
|
remove unused code
|
2016-08-22 20:40:31 +02:00 |
|
msquare
|
3f4be08865
|
remove old update script
|
2016-08-22 19:32:54 +02:00 |
|
msquare
|
14d20933f7
|
improve quality of user atom
|
2016-08-22 19:23:23 +02:00 |
|
msquare
|
54e6f422ce
|
cleanup guest stats
|
2016-08-22 19:11:09 +02:00 |
|
msquare
|
79588ff2cf
|
split user atom into different functions
|
2016-08-22 19:08:10 +02:00 |
|
msquare
|
d4bba0d468
|
remove exit code from shifts controller
|
2016-08-22 19:03:18 +02:00 |
|
msquare
|
de917bc543
|
remove unused code
|
2016-08-21 23:11:23 +02:00 |
|
msquare
|
f02148af35
|
fix rename bug
|
2016-08-21 23:00:58 +02:00 |
|
msquare
|
28e5a3b978
|
user_ical rewrite (remove codacy issues)
|
2016-08-21 22:58:09 +02:00 |
|
msquare
|
191328d703
|
fix method names, quotes, duplication in forms.js
|
2016-08-21 20:14:09 +02:00 |
|
msquare
|
53ad1b5110
|
fix codacy unused code
|
2016-08-21 18:00:39 +02:00 |
|
kamishetty sreeja
|
8a20b43f6d
|
Added Feature Admin Settings Page
|
2016-07-14 13:49:38 +05:30 |
|
Philip Häusler
|
99c8751059
|
some minor text changes on user vouchers
|
2016-03-22 14:51:30 +01:00 |
|
Philip Häusler
|
d0a07a74cc
|
remove preg replace with e flag for php 7
|
2016-03-22 14:41:36 +01:00 |
|
tike
|
661e5595c4
|
issue #242 - make app caluclate number of vouchers for angels
|
2016-02-07 13:00:28 +01:00 |
|
Philip Häusler
|
1da3cba5a7
|
fixes #241 problem when adding rooms
|
2016-02-01 11:48:40 +01:00 |
|
Philip Häusler
|
c4179df503
|
fixes #237 bug when editing a room without changing its name
|
2016-01-19 11:35:00 +01:00 |
|
Philip Häusler
|
ef60b95555
|
add a more secure way to delete users containing a password request
|
2015-12-30 15:48:41 +01:00 |
|
Philip Häusler
|
1983db901b
|
better error message for creating room with name that is already used
|
2015-12-29 21:50:09 +01:00 |
|
Philip Häusler
|
2af1fd582e
|
put message input to the top
|
2015-12-29 18:13:05 +01:00 |
|
Philip Häusler
|
b479cdaef8
|
fix room creation
|
2015-12-29 17:57:16 +01:00 |
|
Philip Häusler
|
522546795b
|
search only for nickname on active angel page
|
2015-12-29 15:32:58 +01:00 |
|
Philip Häusler
|
4684d708fb
|
better shift cancel messages and workflow
|
2015-12-28 17:47:02 +01:00 |
|
Philip Häusler
|
99d36e47b8
|
redirect to other users page on shift cancel
|
2015-12-28 17:42:29 +01:00 |
|
Philip Häusler
|
897053e049
|
redirect to users profile page after marking as arrived or not arrived
|
2015-12-27 23:20:09 +01:00 |
|
Philip Häusler
|
667466b9d0
|
add minutes to start and end of talks for frab import
|
2015-12-26 12:37:29 +01:00 |
|
Philip Häusler
|
570037eed0
|
fix problem that angeltypes lose their restriction when edited by a coordinator
|
2015-12-22 21:05:10 +01:00 |
|
Philip Häusler
|
dc5b0a6214
|
finish cleanup of angeltypes controller
|
2015-12-22 16:25:38 +01:00 |
|
Philip Häusler
|
f7cf9b327e
|
#198 log updates on driving license information
|
2015-12-20 21:07:08 +01:00 |
|
Philip Häusler
|
0ac05d251c
|
#198 fixed: driving license feature completed - integrated into angeltypes
|
2015-12-20 11:36:12 +01:00 |
|
Philip Häusler
|
2cb44fe517
|
make angeltype names clickable
|
2015-12-20 10:35:03 +01:00 |
|
Philip Häusler
|
facc32f133
|
#198 add basic driver license information
|
2015-12-19 23:31:08 +01:00 |
|
Philip Häusler
|
761897a942
|
add 32c3 design
|
2015-12-16 15:32:54 +01:00 |
|
Philip Häusler
|
28edf6bd48
|
make register log entry include link to userpage
|
2015-12-12 19:39:30 +01:00 |
|
Philip Häusler
|
7bff27d20b
|
fix #221: deleting angeltype doesn't log correctly
|
2015-12-12 19:35:07 +01:00 |
|
Philip Häusler
|
0e0f7f0516
|
fix #203: message popover not workin in safari
|
2015-12-12 19:27:53 +01:00 |
|
Philip Häusler
|
d68c91be18
|
remove sessionhelper
|
2015-12-09 16:31:51 +01:00 |
|
msquare
|
a92e1e3ea6
|
Merge pull request #213 from engelsystem/remove-sessionhelper
remove sessionhelper
|
2015-12-09 16:29:04 +01:00 |
|
Philip Häusler
|
902a5852a4
|
fix user result check on user controller
|
2015-12-05 11:55:35 +01:00 |
|
Philip Häusler
|
3790818baf
|
fix user delete log entry
|
2015-12-04 21:50:39 +01:00 |
|
Max Weller
|
0dc8da68f4
|
display room number in admin_rooms edit form
|
2015-12-02 18:59:38 +01:00 |
|
Felix Favre
|
ecf25f5d2a
|
replace overcomplicated regex for email validation with php function
|
2015-08-26 15:24:33 +02:00 |
|
Felix Favre
|
73208016bf
|
change date format in shift table
fixes #202
|
2015-08-26 15:03:53 +02:00 |
|
Felix Favre
|
e4bd324801
|
changed all y-m-d date formats to Y-m-d date formats
part of #202
|
2015-08-26 15:00:48 +02:00 |
|
Felix Favre
|
1af6b8cf20
|
How Mysql Connection Error to user
fixes #207
|
2015-08-26 14:51:00 +02:00 |
|
Felix Favre
|
2df2398b87
|
add more information to ical export
fixes #175
|
2015-08-26 14:29:51 +02:00 |
|
Felix Favre
|
8c1f6d2c9c
|
removed sessionhelper. we should let this handle the server administrator within the PHP config
|
2015-08-26 13:33:38 +02:00 |
|
Philip Häusler
|
128ee0911f
|
fix wrong data at arrival statistics
|
2015-08-16 23:32:39 +02:00 |
|
Philip Häusler
|
c4ee004095
|
rework arrival stat graphs and tables
|
2015-08-16 23:13:13 +02:00 |
|
gnomus
|
a67237d0ef
|
Named Function Correctly
|
2015-08-16 21:05:27 +02:00 |
|
gnomus
|
73197995d7
|
Merge pull request #209 from engelsystem/feature-shift-types
Add Email Form Helper
|
2015-08-16 20:42:25 +02:00 |
|
gnomus
|
7306545e32
|
Add Email Form Helper
|
2015-08-16 20:41:23 +02:00 |
|
gnomus
|
b3aa6cc473
|
Change Register form E-Mailfield to form_email
|
2015-08-16 20:38:41 +02:00 |
|
Philip Häusler
|
a7189482e9
|
add shift creator and editor
|
2015-08-15 23:36:38 +02:00 |
|
Philip Häusler
|
cac86ef509
|
add planned date of departure
|
2015-08-15 14:54:25 +02:00 |
|
Philip Häusler
|
bc84710e9d
|
wording
|
2015-08-14 17:40:58 +02:00 |
|
Philip Häusler
|
28788e6702
|
put shirt statistics into one table
|
2015-08-14 14:16:09 +02:00 |
|
Philip Häusler
|
e8daa4d2ce
|
add table of needed shirts to user active page
|
2015-08-14 14:06:33 +02:00 |
|
Philip Häusler
|
18e49ee06a
|
put active+shirt info into a new line
|
2015-08-14 13:20:24 +02:00 |
|
Philip Häusler
|
fc0d97344e
|
made shift creation angeltypes smaller (like room editing)
|
2015-08-14 12:42:18 +02:00 |
|
Philip Häusler
|
41280a17f5
|
added hint about nightshifts
|
2015-08-14 12:32:54 +02:00 |
|
Philip Häusler
|
42150cc6e9
|
add log entry for deleting own shift entries
|
2015-08-14 09:28:32 +02:00 |
|
Philip Häusler
|
3d7e378b67
|
change default end date on creating shifts
|
2015-08-13 22:57:40 +02:00 |
|
Philip Häusler
|
1cd6a4f4f6
|
keep the show all users checkbox
|
2015-08-13 22:57:29 +02:00 |
|
Philip Häusler
|
f9fb12c7f1
|
show all forced active angels
|
2015-08-13 22:38:32 +02:00 |
|
Philip Häusler
|
34be996f22
|
add possibility to show already done shifts in admin active view
|
2015-08-13 20:28:48 +02:00 |
|
Philip Häusler
|
1c9a3fa89e
|
fix group rights management
|
2015-08-13 11:46:06 +02:00 |
|
Philip Häusler
|
723961c19e
|
User shift admins see free and occupied shifts by default
|
2015-08-13 11:22:25 +02:00 |
|
Philip Häusler
|
df526fa2bf
|
fix problem with beeing informed about shift changes
|
2015-08-13 10:48:39 +02:00 |
|
Philip Häusler
|
5742306095
|
fix wrong user shift edit link
|
2015-08-13 09:13:13 +02:00 |
|
Philip Häusler
|
2823c0e438
|
fix angel list with multiple vouchers
|
2015-08-12 23:47:06 +02:00 |
|
Philip Häusler
|
803c0a552f
|
make multiple vouchers possible
|
2015-08-12 23:44:39 +02:00 |
|
Philip Häusler
|
681d52fe0f
|
fix frab import problem on creating rooms
|
2015-08-12 20:43:22 +02:00 |
|
Philip Häusler
|
18585285a3
|
fix user update problem
|
2015-08-11 12:04:22 +02:00 |
|
Philip Häusler
|
1dcd6c0f3f
|
fix loggin on setting rooms angeltypes
|
2015-08-09 17:56:03 +02:00 |
|
Philip Häusler
|
c06573bb87
|
add maintenance mode
|
2015-08-09 17:46:57 +02:00 |
|
Philip Häusler
|
bc0354fbff
|
responsive resizing for graphs is broken -> turn off
|
2015-07-27 17:36:42 +02:00 |
|
Philip Häusler
|
1a0ccddbe9
|
show number of user angel types to confirm in hint
|
2015-07-27 17:20:05 +02:00 |
|
Philip Häusler
|
6376b90e9f
|
introduce table buttons to angeltype view
|
2015-07-27 17:14:41 +02:00 |
|
Philip Häusler
|
386a3c3298
|
remove duplication from unconfirmed angeltypes hint
|
2015-07-27 17:05:16 +02:00 |
|
Philip Häusler
|
bae55f78fd
|
swap chart and table
|
2015-07-18 21:34:14 +02:00 |
|
Philip Häusler
|
d414c455a2
|
responsive chart
|
2015-07-18 21:32:50 +02:00 |
|
Philip Häusler
|
46f0636f2f
|
arrival statistics
|
2015-07-18 21:27:30 +02:00 |
|
Philip Häusler
|
18644cac7a
|
fixes #196: make users planned arrival date editable in user settings and show it in their own profile
|
2015-07-15 21:53:19 +02:00 |
|
Philip Häusler
|
4aec1b1536
|
fix doubleclick bug on user hint popover
|
2015-07-12 20:06:34 +02:00 |
|
Philip Häusler
|
8c518d4c34
|
add arrival date feature
|
2015-07-12 14:45:58 +02:00 |
|
Philip Häusler
|
66c7e67a03
|
remove avatars
|
2015-07-12 13:51:39 +02:00 |
|
Philip Häusler
|
53737666c6
|
add bootstrap datepicker
|
2015-07-12 13:45:47 +02:00 |
|
Philip Häusler
|
993d6a4f59
|
add cccamp15 design
|
2015-07-12 12:44:09 +02:00 |
|
Philip Häusler
|
86a4773243
|
add log entry test
|
2015-06-07 20:42:01 +02:00 |
|
Philip Häusler
|
eddafead49
|
add function to clear log to model
|
2015-06-07 20:12:18 +02:00 |
|
Philip Häusler
|
1da5604f47
|
remove json auth feature (will be covered by api)
|
2015-06-07 20:11:50 +02:00 |
|
Philip Häusler
|
45c8a68beb
|
deleted counter function - never needed in the last 4 years
|
2015-06-07 19:40:51 +02:00 |
|
Felix Favre
|
c88b1adcfe
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
2015-06-07 15:06:24 +02:00 |
|
Felix Favre
|
dc2c986522
|
fix location of session file storage
|
2015-06-07 15:05:59 +02:00 |
|
Philip Häusler
|
c6c0e8f2ff
|
fix test running
|
2015-06-07 13:45:47 +02:00 |
|
Philip Häusler
|
218b305a3e
|
fix broken session creation
|
2015-06-07 13:33:59 +02:00 |
|
Philip Häusler
|
0a59089e2b
|
add room model tests
|
2015-05-14 17:20:46 +02:00 |
|
Philip Häusler
|
284ed12f59
|
add bootstrap file
|
2015-05-14 16:37:12 +02:00 |
|
Philip Häusler
|
0cb28c05b1
|
fix creation of shift types
|
2015-01-10 11:12:02 +01:00 |
|
Philip Häusler
|
9af229094d
|
display user nicks on shift json export
|
2015-01-05 13:58:34 +01:00 |
|
Philip Häusler
|
48e4787548
|
set force active user to active
|
2015-01-05 13:58:24 +01:00 |
|
Philip Häusler
|
ca37de95da
|
fix shift update
|
2014-12-28 14:56:02 +01:00 |
|
Philip Häusler
|
739eddefd5
|
better shift sign up restriction
|
2014-12-28 14:20:16 +01:00 |
|
Philip Häusler
|
a470a5f5d3
|
fix shift creation
|
2014-12-28 13:57:50 +01:00 |
|
Philip Häusler
|
6bede2fd22
|
harden the sql queries
|
2014-12-28 13:44:56 +01:00 |
|
Philip Häusler
|
a6ab81b834
|
fix overfull progress bars
|
2014-12-28 01:35:36 +01:00 |
|
Philip Häusler
|
cb46534569
|
move shift edit buttons
|
2014-12-28 01:30:29 +01:00 |
|
Philip Häusler
|
0b70fc2a7f
|
better shift sign up buttons in shift view
|
2014-12-28 01:27:41 +01:00 |
|
Philip Häusler
|
502a52394e
|
redirect to users page on shift cancel by admin
|
2014-12-27 23:38:23 +01:00 |
|
Philip Häusler
|
16ce2eb969
|
begin cleanup of user edit
|
2014-12-27 21:55:24 +01:00 |
|
Philip Häusler
|
247d9b65c1
|
remove user angeltype administration from user-edit
|
2014-12-27 21:48:08 +01:00 |
|
Philip Häusler
|
af52251cef
|
angelnames were too fat.
|
2014-12-27 21:32:02 +01:00 |
|
Philip Häusler
|
582c429fd4
|
allow admin to sign up more angels than needed again
|
2014-12-27 00:15:41 +01:00 |
|
Philip Häusler
|
8d6175a273
|
user cannot signup for full shifts
|
2014-12-26 23:48:16 +01:00 |
|
Philip Häusler
|
af25ca9103
|
fix broken log nick
|
2014-12-26 22:03:35 +01:00 |
|
Philip Häusler
|
1ec2783a8e
|
use user nick render
|
2014-12-26 19:26:53 +01:00 |
|
Philip Häusler
|
dc412ba826
|
sort meetings by date
|
2014-12-26 19:22:03 +01:00 |
|
Philip Häusler
|
71a23be3d4
|
fade out for not arrived angels
|
2014-12-26 19:11:26 +01:00 |
|
Philip Häusler
|
77273425f7
|
fade out for not arrived angels
|
2014-12-26 18:59:32 +01:00 |
|
Philip Häusler
|
bd48de258a
|
update german translation
|
2014-12-26 18:51:06 +01:00 |
|
Philip Häusler
|
9007bb6790
|
sort news by date
|
2014-12-26 18:39:16 +01:00 |
|
Philip Häusler
|
47b52bc3f6
|
count confirmed and unconfirmed angels
|
2014-12-26 16:57:58 +01:00 |
|
Philip Häusler
|
8764be8604
|
display room per shift in shift table
|
2014-12-26 14:31:37 +01:00 |
|
Philip Häusler
|
fc4a5e0e7a
|
fix shift creation for shifttypes
|
2014-12-26 02:34:57 +01:00 |
|
Philip Häusler
|
9cabdb1d78
|
shift edit for shifttypes
|
2014-12-26 02:27:54 +01:00 |
|
Philip Häusler
|
c602d0208f
|
integrate voucher into user state
|
2014-12-26 01:57:15 +01:00 |
|
Philip Häusler
|
7cb3a772ed
|
integrate vouche into user state
|
2014-12-26 01:56:16 +01:00 |
|
Philip Häusler
|
8ed077bcec
|
user voucher feature
|
2014-12-26 01:49:59 +01:00 |
|
Philip Häusler
|
33bafad9b7
|
fix wrong redirect after shift edit
|
2014-12-26 01:26:17 +01:00 |
|
Philip Häusler
|
34e2f49875
|
shift signup improvements for shift view
|
2014-12-25 22:23:18 +01:00 |
|
Philip Häusler
|
3770ab8271
|
add import progress
|
2014-12-22 20:30:29 +01:00 |
|
Philip Häusler
|
0fda4a9181
|
update german translation
|
2014-12-22 20:25:19 +01:00 |
|
Philip Häusler
|
342b79ff3f
|
more fixes
|
2014-12-22 20:18:34 +01:00 |
|
Philip Häusler
|
2d587478a1
|
fix different bugs with shift types
|
2014-12-22 20:06:37 +01:00 |
|
Philip Häusler
|
702047de53
|
add more icons for better shift view
|
2014-12-22 18:22:54 +01:00 |
|
Philip Häusler
|
c12e5336fb
|
display shifts with title
|
2014-12-22 18:06:58 +01:00 |
|
Philip Häusler
|
6a05c3d9de
|
rewrite create shifts for shifttypes
|
2014-12-22 17:55:20 +01:00 |
|
Philip Häusler
|
0dbd0ea599
|
add basic shift view
|
2014-12-19 23:04:26 +01:00 |
|
Felix Favre
|
2f20540a6b
|
more infos in shift view
|
2014-12-19 23:02:50 +01:00 |
|
Philip Häusler
|
038bf97178
|
link to next shift in menu
|
2014-12-19 22:59:18 +01:00 |
|
Philip Häusler
|
d02272afd6
|
add basic shift view
|
2014-12-19 22:41:55 +01:00 |
|
Philip Häusler
|
a791a75b0a
|
integrate shift type into shifts
|
2014-12-17 17:22:35 +01:00 |
|
Philip Häusler
|
634a3739b2
|
better shift type links
|
2014-12-17 16:08:04 +01:00 |
|
Philip Häusler
|
3f8e5e47c0
|
add update, delete and view for shift type
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
526167ed11
|
add create shift type
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
c8cc46886b
|
shift type list
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
a73e98a8e0
|
prepare shift types controller and view
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
294a21d163
|
add shift types model
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
25889920cf
|
prepare for shift types model, add db update
|
2014-12-17 14:59:40 +01:00 |
|
Felix Favre
|
8a51e5d822
|
added headings template function
(cherry picked from commit 02457f00b809282d5fa4be19239a33afb3e927c3)
|
2014-12-16 03:39:43 +01:00 |
|
Felix Favre
|
807e420883
|
only log if api key was reset on purpose
|
2014-12-16 00:54:50 +01:00 |
|
Felix Favre
|
d2e59e8f86
|
make FAQ Buttom more visible
fixes #166
|
2014-12-16 00:36:24 +01:00 |
|
Felix Favre
|
b299b0e085
|
reworked user editing of angeltypes
fixes #170
|
2014-12-16 00:16:10 +01:00 |
|
Felix Favre
|
f20e24f589
|
shift page styling
|
2014-12-15 23:09:06 +01:00 |
|
Felix Favre
|
c18c0983fc
|
only show "arrived" button if user has rights for it
fixes #172
|
2014-12-15 21:31:40 +01:00 |
|
Felix Favre
|
be1bb5fbeb
|
add simple search to log view
|
2014-12-15 21:23:57 +01:00 |
|
Philip Häusler
|
388dd0e136
|
display date
|
2014-12-15 19:08:40 +01:00 |
|
Philip Häusler
|
9125f7e5ab
|
show 10000 log entries
|
2014-12-15 19:07:53 +01:00 |
|
Philip Häusler
|
f39df75b4e
|
list user buttons size
|
2014-12-15 18:36:12 +01:00 |
|
Felix Favre
|
ed001633e6
|
Own Shifts ignore the filled filter.
issue #134
|
2014-12-13 01:56:29 +01:00 |
|
Felix Favre
|
3e958227aa
|
fix shift collision display
|
2014-12-13 00:34:27 +01:00 |
|
Felix Favre
|
e9bbd967ff
|
add freeload info to shiftentry update log
issue #28
|
2014-12-12 23:40:36 +01:00 |
|
Felix Favre
|
5b3d0d302f
|
on api-key reset also log the username
|
2014-12-12 23:39:54 +01:00 |
|
Felix Favre
|
bc6aa9a209
|
responsify create room form
|
2014-12-12 22:55:56 +01:00 |
|
Felix Favre
|
1cc84a967a
|
change default selection
|
2014-12-12 22:41:35 +01:00 |
|
Philip Häusler
|
7e650920d3
|
dont send mails for my own actions
|
2014-12-07 20:42:54 +01:00 |
|
Philip Häusler
|
1f572918ff
|
include all mailers
|
2014-12-07 20:29:01 +01:00 |
|
Philip Häusler
|
a4a4a0aecc
|
fix missing ;
|
2014-12-07 19:47:36 +01:00 |
|
Philip Häusler
|
f4fa7f5d33
|
union shift update model
|
2014-12-07 19:47:02 +01:00 |
|
Felix Favre
|
07b9de84c5
|
use mail helpers for shift delete and shift change
|
2014-12-07 19:44:59 +01:00 |
|
Felix Favre
|
8f918422f4
|
mailer functions for shift delete,assign,remove
|
2014-12-07 19:43:48 +01:00 |
|
Felix Favre
|
5b3e5750eb
|
Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
includes/model/ShiftEntry_model.php
|
2014-12-07 18:04:03 +01:00 |
|
Felix Favre
|
09ef38ff35
|
change shift mail function
|
2014-12-07 18:01:45 +01:00 |
|
Felix Favre
|
4b490167ac
|
added User.Nick to ShiftEntries_by_shift function
|
2014-12-07 18:01:05 +01:00 |
|
Philip Häusler
|
b75700ee1b
|
add shift delete model
|
2014-12-07 17:48:35 +01:00 |
|
Philip Häusler
|
d26f8aa12c
|
add shift update model
|
2014-12-07 17:41:40 +01:00 |
|
Philip Häusler
|
fa0e38ebff
|
add shift create model
|
2014-12-07 17:34:29 +01:00 |
|
Philip Häusler
|
156db1eadd
|
add shift entry update model
|
2014-12-07 17:13:14 +01:00 |
|
Philip Häusler
|
0a74ab94a8
|
add shift entry delete model
|
2014-12-07 17:07:19 +01:00 |
|
Philip Häusler
|
514d2aca64
|
add function to list users subscribed to a shift
|
2014-12-07 16:54:13 +01:00 |
|
Philip Häusler
|
9176261762
|
add shift entry create model
|
2014-12-07 16:54:13 +01:00 |
|
Felix Favre
|
09e65d1a84
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
2014-12-07 16:38:45 +01:00 |
|
Felix Favre
|
9e0cc40e6d
|
added shift mailer
|
2014-12-07 16:38:31 +01:00 |
|
Philip Häusler
|
663526246b
|
add settings button to user page
|
2014-12-07 16:15:20 +01:00 |
|
Felix Favre
|
e9ae329be4
|
added another theme
|
2014-12-07 15:43:25 +01:00 |
|
Felix Favre
|
8bcce0e003
|
change button size in user_news
|
2014-12-07 00:10:47 +01:00 |
|
Felix Favre
|
6ade63f11d
|
change popover sybol based on message
|
2014-12-07 00:10:09 +01:00 |
|
Felix Favre
|
69878fa458
|
changes to messages popover
|
2014-12-07 00:09:38 +01:00 |
|
Felix Favre
|
45ac884474
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
2014-12-06 22:46:40 +01:00 |
|
Felix Favre
|
921449f3ef
|
more styling
|
2014-12-06 22:46:23 +01:00 |
|
Philip Häusler
|
a48fd8fc37
|
change hint color on urgency
|
2014-12-06 22:31:42 +01:00 |
|
Philip Häusler
|
d34fae3c40
|
move hints to toolbar
|
2014-12-06 22:26:56 +01:00 |
|
Philip Häusler
|
8261933bec
|
try to prevent hint duplication
|
2014-12-06 21:40:16 +01:00 |
|
Felix Favre
|
40d83367bb
|
beautify messages form
|
2014-12-06 20:02:47 +01:00 |
|
Felix Favre
|
b97154d19e
|
form_element helper now supports empty labels
|
2014-12-06 20:01:47 +01:00 |
|
Felix Favre
|
703de07a63
|
remove striped table from shift view
|
2014-12-06 19:49:16 +01:00 |
|
Felix Favre
|
2f445eb90c
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
2014-12-06 19:02:26 +01:00 |
|
Felix Favre
|
3973236f6e
|
css and layout fixes. font path fix
|
2014-12-06 19:02:02 +01:00 |
|
Philip Häusler
|
10d7fce163
|
fix wrong angel type alarm
|
2014-12-06 18:55:24 +01:00 |
|
Philip Häusler
|
481e52cf77
|
add email shiftinfo checkbox/flag
|
2014-12-06 18:37:39 +01:00 |
|
Philip Häusler
|
57a92dbdcd
|
add opt-in bool for shiftinfo mails and remove icq from users
|
2014-12-06 18:37:39 +01:00 |
|
Felix Favre
|
191ba6e1b1
|
replace all the remaining old icons with glyphicons
|
2014-12-06 18:16:18 +01:00 |
|
Felix Favre
|
524acb15ba
|
use the new very cool glyph button
|
2014-12-06 17:42:29 +01:00 |
|
Felix Favre
|
de65cd64e1
|
add very cool button_glyph helper
|
2014-12-06 17:41:16 +01:00 |
|
Felix Favre
|
2654fcf228
|
use glyph_bool in admin_active view
|
2014-12-06 17:30:35 +01:00 |
|
Felix Favre
|
67bca99571
|
Use more Striped Tables
issue #159
|
2014-12-06 17:15:22 +01:00 |
|
illuxio
|
90a5e5ec14
|
Update User_view.php
Fix Nickname and DECT bug in settings.
|
2014-11-25 17:30:17 +01:00 |
|
Philip Häusler
|
4516cbe5d6
|
renamed mysql provider to mysqli, updated system requirements, fixes #145
|
2014-11-04 11:22:32 +01:00 |
|
Robert Oehlmann
|
a42ba2f5a1
|
Fixed field assignments in shift entry creation form
|
2014-11-03 19:37:47 +01:00 |
|
Robert Oehlmann
|
c4039f72bb
|
Fixed shift duration calculation
Fixes issue #136
|
2014-11-03 19:28:43 +01:00 |
|
Robert Oehlmann
|
4edaa26911
|
Fixed shift edit/delete URLs in new layout
|
2014-11-03 08:51:23 +01:00 |
|
Philip Häusler
|
785fd45d3a
|
fix register privilege
|
2014-09-28 19:47:57 +02:00 |
|
Philip Häusler
|
4931fbb372
|
replace icons with glyphicons
|
2014-09-28 19:44:53 +02:00 |
|
Philip Häusler
|
bd2a8b441f
|
clear up mvc for user list
|
2014-09-28 15:01:02 +02:00 |
|
Philip Häusler
|
1d9e1c467c
|
user list rewritten
|
2014-09-28 14:50:08 +02:00 |
|
Philip Häusler
|
0f77edc4fb
|
hint for disabled registration
|
2014-09-28 14:14:04 +02:00 |
|
Philip Häusler
|
e4a042c8c3
|
clear userlist
|
2014-09-24 15:36:26 +02:00 |
|
Philip Häusler
|
f06e4a0f47
|
move user messages to menu icon right
|
2014-09-24 15:24:32 +02:00 |
|
Philip Häusler
|
07b6541204
|
move language to submenu
|
2014-09-24 15:11:50 +02:00 |
|
Philip Häusler
|
094715e6ee
|
optimize navbar for 1024 px width
|
2014-09-24 15:03:41 +02:00 |
|
Philip Häusler
|
50fea6d371
|
fix session security issue (same session on multiple instances)
|
2014-09-20 18:31:59 +02:00 |
|
Philip Häusler
|
46575d90c2
|
pulled complete menu to the top (go for mobile...)
|
2014-09-08 14:45:41 +02:00 |
|
Philip Häusler
|
1785c38698
|
fix login layout and add mobile nav
|
2014-09-08 13:57:36 +02:00 |
|
Philip Häusler
|
4414358cf5
|
fix wrong nick and api sql query
|
2014-09-08 13:57:36 +02:00 |
|
Philip Häusler
|
2716c63648
|
fix wrong username on angeltype confirm
|
2014-09-08 13:57:36 +02:00 |
|
Moritz Kaspar Rudert (mortzu)
|
27b8223611
|
removed bootstrap.php
|
2014-09-08 08:38:08 +02:00 |
|
Philip Häusler
|
9adaeaa97a
|
shift state text update
|
2014-08-24 16:48:12 +02:00 |
|
Philip Häusler
|
fbdb8ae472
|
move new messages badge
|
2014-08-24 16:46:30 +02:00 |
|
Philip Häusler
|
53a10de5cf
|
move json and ical export buttons
|
2014-08-24 16:36:10 +02:00 |
|
Philip Häusler
|
3da1748e84
|
correct shift state strings
|
2014-08-24 16:22:43 +02:00 |
|
Philip Häusler
|
da6eaae215
|
refactor shift state
|
2014-08-24 16:08:12 +02:00 |
|
Philip Häusler
|
0e2b257342
|
begin to refactor user shift state
|
2014-08-24 15:51:42 +02:00 |
|
Philip Häusler
|
25b5096c7e
|
update german translation
|
2014-08-24 15:51:42 +02:00 |
|
Felix Favre
|
4faca9864f
|
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
|
2014-08-24 15:52:25 +02:00 |
|
Philip Häusler
|
f9e577352d
|
remove html templates
|
2014-08-23 19:15:10 +02:00 |
|
Felix Favre
|
520aed3d32
|
Changed Next Shift Countdown Format
|
2014-08-23 17:30:38 +02:00 |
|
Philip Häusler
|
7f43f3bfe5
|
remove html templates
|
2014-08-23 17:24:11 +02:00 |
|
Felix Favre
|
c57e450ed2
|
Changed Angeltypes List Actions to Bootstrap Button Group
|
2014-08-23 16:25:51 +02:00 |
|
Philip Häusler
|
66f166399c
|
better preselected angeltypes
|
2014-08-23 15:47:06 +02:00 |
|
Philip Häusler
|
d60c2f0c40
|
better layout for user register
|
2014-08-23 15:35:25 +02:00 |
|
Philip Häusler
|
51cecb27e5
|
better layout for user settings
|
2014-08-23 14:30:45 +02:00 |
|
Philip Häusler
|
f30bc25246
|
minor bugfixes
|
2014-08-23 02:47:06 +02:00 |
|
Philip Häusler
|
c5331c44fd
|
move language select to the top
|
2014-08-23 02:16:12 +02:00 |
|
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
2014-08-23 01:55:18 +02:00 |
|
Philip Häusler
|
74647e16d3
|
add basic bootstrap theme
|
2014-08-22 22:34:13 +02:00 |
|
Philip Häusler
|
721aa7f160
|
#148 fix wrong password validation message
|
2014-07-29 20:50:54 +02:00 |
|
Philip Häusler
|
d394ed2fee
|
notify coordinators about unconfirmed angeltypes
|
2014-05-13 16:49:09 +02:00 |
|
Philip Häusler
|
f1145b8a5e
|
implemented team/angeltype coordinators
|
2014-05-13 15:51:45 +02:00 |
|
Philip Häusler
|
e107dff1ce
|
button style and redirect fixes
|
2014-05-13 14:44:04 +02:00 |
|
Philip Häusler
|
a33fc5e21d
|
router simplification
|
2014-05-13 11:20:48 +02:00 |
|
Philip Häusler
|
3401c6f8b6
|
admin import now without template files
|
2014-03-26 20:04:11 +01:00 |
|
Philip Häusler
|
cf20bc1c29
|
test for existing shifts
|
2014-03-26 18:51:34 +01:00 |
|
Philip Häusler
|
dc7a56f422
|
fixed angeltype add model
|
2014-03-24 11:51:51 +01:00 |
|
Philip Häusler
|
0ce1ba5bf1
|
style rename to engelsystem default
|
2014-03-23 18:23:47 +01:00 |
|
Philip Häusler
|
3963e4907a
|
german update and style reset
|
2014-03-23 18:21:58 +01:00 |
|
Philip Häusler
|
13f8a513d4
|
fix error messages on password recovery
|
2014-03-12 17:36:55 +01:00 |
|
Philip Häusler
|
462b78a7e7
|
better integration of angeltypes about
|
2014-03-09 16:01:41 +01:00 |
|
Philip Häusler
|
ab450600d7
|
better integration of angeltypes about
|
2014-03-09 16:00:13 +01:00 |
|
Philip Häusler
|
f40b78faac
|
angeltypes about section
|
2014-03-09 13:39:04 +01:00 |
|
Philip Häusler
|
98f355cd86
|
added angeltype description
|
2014-03-09 13:12:46 +01:00 |
|
Philip Häusler
|
82c0d2acc2
|
controller comments
|
2014-01-07 16:19:35 +01:00 |
|
Philip Häusler
|
b35a32ef52
|
completed api comments
|
2014-01-07 15:56:31 +01:00 |
|
Philip Häusler
|
239c2b1684
|
reviewed cookies api
|
2014-01-07 15:50:16 +01:00 |
|
Philip Häusler
|
71feeee3f2
|
innodb and foreign keys
|
2014-01-05 20:04:09 +01:00 |
|
Philip Häusler
|
27ff879f51
|
cookie-0007-API-getRoom-show-real-rooms.patch
|
2014-01-05 19:35:01 +01:00 |
|
Philip Häusler
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
2014-01-05 19:34:17 +01:00 |
|
Philip Häusler
|
9dc5dbe3b6
|
cookie-0005-API-add-getApiKey.patch
|
2014-01-05 19:33:52 +01:00 |
|
Philip Häusler
|
316c18f912
|
removed old user angeltypes
|
2014-01-05 19:31:17 +01:00 |
|
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
2014-01-05 19:30:06 +01:00 |
|
Philip Häusler
|
d921cf903e
|
tshirt sum
|
2013-12-30 15:45:04 +01:00 |
|
Philip Häusler
|
8c2157c546
|
shirt statistics
|
2013-12-30 15:40:07 +01:00 |
|
Philip Häusler
|
8fa78b55ac
|
first api new files
|
2013-12-29 15:08:33 +01:00 |
|
Philip Häusler
|
a041e0efbb
|
first api
|
2013-12-29 15:08:21 +01:00 |
|
Philip Häusler
|
124cf64d4f
|
try to fix ical, but still broken
|
2013-12-29 15:06:18 +01:00 |
|
Philip Häusler
|
f2b0756296
|
user hover displays angeltypes
|
2013-12-29 13:46:37 +01:00 |
|
Philip Häusler
|
0a4bd66c5f
|
removed email and age from user list
|
2013-12-29 13:39:47 +01:00 |
|
Philip Häusler
|
1174b11c0a
|
display freeloads in angel list
|
2013-12-29 13:26:09 +01:00 |
|
Philip Häusler
|
299652e070
|
fix broken ical export
|
2013-12-28 18:49:15 +01:00 |
|
Philip Häusler
|
400dc093c6
|
force active function fix
|
2013-12-28 03:13:48 +01:00 |
|
Philip Häusler
|
a9fb05b128
|
force active function
|
2013-12-28 03:02:51 +01:00 |
|
Philip Häusler
|
8ce67793df
|
form text fields now make htmlspecialchars
|
2013-12-28 02:14:49 +01:00 |
|
Philip Häusler
|
9da2ff6f9f
|
#137 fixed xss on login
|
2013-12-27 19:45:50 +01:00 |
|
Philip Häusler
|
9d709b2a73
|
freeloader fix, admins should edit user shifts
|
2013-12-27 18:56:20 +01:00 |
|
Philip Häusler
|
c589219a96
|
freeloader feature
|
2013-12-27 18:45:27 +01:00 |
|
Philip Häusler
|
2c41fcdc09
|
display max 10000 log entries (1000 before)
|
2013-12-27 17:54:12 +01:00 |
|
Philip Häusler
|
fdd4b44c0e
|
fixed button font and added star to shirt size at registration
|
2013-12-26 14:37:17 +01:00 |
|
Philip Häusler
|
0c98f13eee
|
user password recovery
|
2013-12-26 13:34:48 +01:00 |
|
Philip Häusler
|
e46528ff21
|
#134 removed empty line at the end of admin log php
|
2013-12-12 13:38:04 +01:00 |
|
Philip Häusler
|
ec4f173a61
|
admin import uses now msg functions
|
2013-12-09 17:52:43 +01:00 |
|
Philip Häusler
|
7df8b967f3
|
fixed count taken shifts entries
|
2013-12-09 17:37:50 +01:00 |
|
Philip Häusler
|
a0ec1130a6
|
needed angeltypes corrected loading by room or special needs
|
2013-12-09 17:28:22 +01:00 |
|
Philip Häusler
|
3bc9d09f7a
|
api all shifts export should only show needed angeltypes with count greater than 0
|
2013-12-09 17:24:54 +01:00 |
|
Philip Häusler
|
4aa85a3ff2
|
api export for all shifts completed
|
2013-12-09 17:17:23 +01:00 |
|
Philip Häusler
|
ad5899f028
|
api export for all shifts
|
2013-12-09 17:10:07 +01:00 |
|
Philip Häusler
|
9a1ffdf198
|
fixed wrong lock icon paths
|
2013-12-03 16:44:04 +01:00 |
|
Philip Häusler
|
821e37c1b2
|
removed faq feature
|
2013-12-03 16:28:37 +01:00 |
|
Philip Häusler
|
e9565a79ea
|
simplified config
|
2013-12-03 16:18:22 +01:00 |
|
Philip Häusler
|
d5b0311061
|
german translation update
|
2013-12-02 22:42:29 +01:00 |
|
Philip Häusler
|
c1539ef5bb
|
display stored dect number in settings
|
2013-12-01 21:20:56 +01:00 |
|
Philip Häusler
|
ef66360f69
|
fix angeltype assign error
|
2013-12-01 20:44:32 +01:00 |
|
Philip Häusler
|
347a861da0
|
register with default config theme
|
2013-12-01 20:12:23 +01:00 |
|
Philip Häusler
|
33785f45a2
|
missing start and end shift in session
|
2013-12-01 20:06:41 +01:00 |
|
Philip Häusler
|
e60b0df2ec
|
gettext some german translation
|
2013-11-28 23:21:25 +01:00 |
|
Philip Häusler
|
c8041fa27f
|
template cleanup
|
2013-11-28 22:49:15 +01:00 |
|
Philip Häusler
|
1e05da6c81
|
gettext for user sites
|
2013-11-28 22:40:48 +01:00 |
|
Philip Häusler
|
8a5915594f
|
gettext for admin active
|
2013-11-28 22:00:49 +01:00 |
|
Philip Häusler
|
7d3239f3fe
|
forgot to add the new views
|
2013-11-25 22:04:32 +01:00 |
|
Philip Häusler
|
85d9bf4f9c
|
angel views in english complete
|
2013-11-25 21:56:56 +01:00 |
|
Philip Häusler
|
813751ac7a
|
language cleanup
|
2013-11-25 21:07:08 +01:00 |
|
Philip Häusler
|
aad54bfe88
|
basic gettext integration
|
2013-11-25 21:04:58 +01:00 |
|
Philip Häusler
|
96a263f712
|
initial gettext integration
|
2013-11-25 19:12:19 +01:00 |
|
Philip Häusler
|
3c4321ff76
|
30c3 theme
|
2013-10-13 00:52:44 +02:00 |
|
Philip Häusler
|
bfb0cacd54
|
mysql to mysqli and a lot of cleanup and mvc
|
2013-09-18 01:38:36 +02:00 |
|
Philip Häusler
|
d50cc21f50
|
#119 extended json shift information for angeltypes and taken places
|
2013-09-10 14:54:16 +02:00 |
|
Philip Häusler
|
fb8241039b
|
#119 added links to json export
|
2013-09-10 14:45:41 +02:00 |
|
Philip Häusler
|
a47b1935cb
|
#119 added basic shift json export support using same pattern like ical export
|
2013-09-10 14:27:31 +02:00 |
|
Philip Häusler
|
98aac2a429
|
brought back hour sum on my shifts
|
2013-01-02 14:17:34 +01:00 |
|
Philip Häusler
|
a573b4e325
|
replaced header with redirect function
|
2012-12-30 18:27:45 +01:00 |
|
Philip Häusler
|
8fd5ffb335
|
cleanup user myshifts
|
2012-12-30 18:23:10 +01:00 |
|
Philip Häusler
|
dd4530d760
|
User Nick function, enhanced log with some links
|
2012-12-30 17:58:23 +01:00 |
|
Jan-Philipp Litza
|
b26994f518
|
moved footer to navigation and removed left-padding of headings, reworked credits
|
2012-12-30 17:13:28 +01:00 |
|
Jan-Philipp Litza
|
b32ade0a34
|
Fix new shift time filter and show dates for longer shift tables
|
2012-12-30 16:02:23 +01:00 |
|
Jan-Philipp Litza
|
3efe63fa10
|
fix #49: "Array" after preview in mass-shift-generation
|
2012-12-30 15:20:44 +01:00 |
|
Jan-Philipp Litza
|
de695c0fe4
|
make shifts filterable by timespan instead of days and enable new view for arbitrary timespans
|
2012-12-30 15:06:52 +01:00 |
|
Jan-Philipp Litza
|
0d47caa09b
|
simplified stats generation
|
2012-12-30 13:59:07 +01:00 |
|
Jan-Philipp Litza
|
f91e00adc7
|
fix bug in signing off from shifts
|
2012-12-30 13:08:03 +01:00 |
|
Jan-Philipp Litza
|
7e44546f5c
|
use bin icon instead of cross for deletion
|
2012-12-30 12:52:01 +01:00 |
|
Jan-Philipp Litza
|
d509a10121
|
Prevent from signing up for colliding shifts servier-side
|
2012-12-30 12:51:29 +01:00 |
|
Jan-Philipp Litza
|
0dae68a9a3
|
indicate colliding shifts in new shift view
|
2012-12-30 12:09:48 +01:00 |
|
Jan-Philipp Litza
|
bf226f87dc
|
revert scrollable table because of bad browser implementation and replace by non-fixed header scrolling
|
2012-12-30 01:55:24 +01:00 |
|
Philip Häusler
|
38366b0285
|
fix admin user angeltypes, preventing from deleting all permissions
|
2012-12-29 17:11:57 +01:00 |
|
Philip Häusler
|
1f764e20a3
|
fixed strange hour sum impossible
|
2012-12-29 16:59:18 +01:00 |
|
Philip Häusler
|
b7b8b142e3
|
fixed strange hour sum
|
2012-12-29 16:58:40 +01:00 |
|
Philip Häusler
|
a7c44d8dce
|
fixed strange hour sum
|
2012-12-29 16:55:21 +01:00 |
|
Philip Häusler
|
8ca71f66cd
|
fixed leaving done shifts by angels bug
|
2012-12-29 16:02:27 +01:00 |
|
Philip Häusler
|
19e3cc3434
|
fixed leaving done shifts by angels bug
|
2012-12-29 15:38:55 +01:00 |
|
Jan-Philipp Litza
|
2d0b2542c9
|
a few fixes and polishes in myshifts, shifts and menu
|
2012-12-29 14:41:09 +01:00 |
|
Philip Häusler
|
b60603d76c
|
news reload duplication bug fixed
|
2012-12-29 14:35:53 +01:00 |
|
Jan-Philipp Litza
|
6432401d9c
|
limit height of online user list
|
2012-12-29 14:05:57 +01:00 |
|
Jan-Philipp Litza
|
7c7b2d3b54
|
polished code and display of shiftview and used more icons
|
2012-12-29 13:58:59 +01:00 |
|
Philip Häusler
|
1867c88484
|
more stats
|
2012-12-28 23:38:31 +01:00 |
|
Philip Häusler
|
263edf58f2
|
stats for infobeamer/monitor
|
2012-12-28 22:53:05 +01:00 |
|
Philip Häusler
|
7044c07c00
|
link to edit page and shift mates on myshifts page
|
2012-12-28 20:55:13 +01:00 |
|
Jan-Philipp Litza
|
01c9d1a810
|
hotfix: show completely free shifts when searching for free shifts
|
2012-12-28 18:45:26 +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 |
|
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
|
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 |
|
Philip Häusler
|
b8854f7158
|
right fix
|
2012-12-25 19:30:53 +01:00 |
|
Philip Häusler
|
419da73bef
|
right fix
|
2012-12-25 19:27:04 +01:00 |
|
Philip Häusler
|
fd199ea3a0
|
fix user shift joined nicknames
|
2012-12-23 14:50:03 +01:00 |
|
Philip Häusler
|
2d5449f213
|
sort angeltypes on user shifts
|
2012-12-12 23:15:57 +01:00 |
|
Philip Häusler
|
ad9695573f
|
#89 profile link in admin user angeltypes
|
2012-12-12 23:13:19 +01:00 |
|
Philip Häusler
|
95880bb7d6
|
#77 bugblue-layout fix
|
2012-12-12 23:03:36 +01:00 |
|
Philip Häusler
|
6a30868814
|
#77 bugblue-layout fix
|
2012-12-12 22:57:04 +01:00 |
|
Philip Häusler
|
b3df228845
|
#77 bugblue-one-day-calendar-layout-patch
|
2012-12-12 22:56:51 +01:00 |
|
Philip Häusler
|
8591fb4b5f
|
#10 fix password mind length check
|
2012-12-12 22:45:51 +01:00 |
|
Jan-Philipp Litza
|
db95fe6485
|
new authentication framework with stronger passwords and real salts - please proofread!
|
2012-12-12 02:40:12 +01:00 |
|
Jan-Philipp Litza
|
697b756c4e
|
more translations and fixes
|
2012-12-12 01:02:55 +01:00 |
|
Jan-Philipp Litza
|
910af3eaf7
|
fixes for the last commit
|
2012-12-12 00:45:29 +01:00 |
|
Jan-Philipp Litza
|
a007a23d75
|
fix #91 (SQL error in shift filter) and translate "shifts" and "my shifts" a lot
|
2012-12-12 00:22:30 +01:00 |
|
Philip Häusler
|
e0b4562de6
|
#83 sort angeltypes to be confirmed
|
2012-12-10 10:07:45 +01:00 |
|
Philip Häusler
|
5660d36ef9
|
#83 sort angeltypes to be confirmed
|
2012-12-10 10:02:33 +01:00 |
|
Philip Häusler
|
079279a1d0
|
code maintenance
|
2012-12-10 09:49:23 +01:00 |
|
Philip Häusler
|
734447b40c
|
29c3 design
|
2012-12-07 18:00:19 +01:00 |
|
Philip Häusler
|
d0c82e1037
|
#86 discard angel type requests
|
2012-12-03 22:49:13 +01:00 |
|
Philip Häusler
|
9e7c2dfeca
|
shift join right fuckup
|
2012-12-03 22:47:08 +01:00 |
|
Philip Häusler
|
f62bd8e56b
|
ical fix
|
2012-12-03 21:00:20 +01:00 |
|
Philip Häusler
|
6dba2ad03d
|
translation fix
|
2012-12-03 11:15:54 +01:00 |
|
Philip Häusler
|
08f12cbe5b
|
fixes #76: unrestrict angel types is possible now
|
2012-12-01 11:51:03 +01:00 |
|
Philip Häusler
|
a31ff40a8e
|
fixes: #78: last login switched with register date
|
2012-12-01 11:49:16 +01:00 |
|
Philip Häusler
|
781a996b3b
|
fixes #81: shirt size is now mandatory
fixes #50: login error to the top
|
2012-12-01 11:39:03 +01:00 |
|
Philip Häusler
|
ddbc5a9db2
|
old faq version
|
2012-11-06 00:28:27 +01:00 |
|
Philip Häusler
|
505ad98e33
|
#51 fix problems with changing needed angeltypes in rooms
|
2012-05-19 17:50:09 +02:00 |
|
Philip Häusler
|
aac265ec7e
|
#57 fix problem changing tel and/or dect
|
2012-05-19 17:10:26 +02:00 |
|
Philip Häusler
|
41e10798a7
|
#52 accept + in mail-address
|
2012-05-19 17:08:08 +02:00 |
|
Philip Häusler
|
0114edc0ca
|
#53 edit shifts where already somebody subscribed
|
2012-05-19 17:05:04 +02:00 |
|
Philip Häusler
|
bc03069017
|
#56 fixed problem with editing angels rights and angels can not subscribe running oder ended shifs now
|
2012-05-19 16:41:00 +02:00 |
|
Philip Häusler
|
2a944121f8
|
#48 keep symbols in text messages
|
2012-05-19 15:59:19 +02:00 |
|
Philip Häusler
|
4eaa0d10ea
|
sort filter days
|
2012-05-17 17:18:34 +02:00 |
|
Philip Häusler
|
9bed1f02ea
|
fix admin edit of t-shirt sizes
|
2012-05-02 16:20:12 +02:00 |
|
Philip Häusler
|
f81943f6c5
|
make hidden rooms visible for shift creation
|
2012-04-26 22:45:45 +02:00 |
|
Philip Häusler
|
6be6802488
|
make adding rooms work
|
2012-04-26 22:37:37 +02:00 |
|
Philip Häusler
|
b6ff5cf834
|
create rooms possible with working add-button
|
2012-04-26 22:27:40 +02:00 |
|
Jan-Philipp Litza
|
34582524ba
|
adapted admin section for FAQ to new database scheme
|
2012-04-26 19:18:17 +02:00 |
|
Philip Häusler
|
046c9e9caf
|
fix some php warnings
|
2012-04-17 14:11:40 +02:00 |
|
Philip Häusler
|
e8cc1e7b4f
|
more redirects - better flow when configuring shifts and shift entries
|
2011-12-29 15:58:28 +01:00 |
|
Philip Häusler
|
b864f2c5b1
|
cleanup old unused files, display tshirt size in admin_active
|
2011-12-29 14:58:50 +01:00 |
|
Philip Häusler
|
8968763ff3
|
provide more information (multiple rooms) in available shifts
|
2011-12-29 14:47:04 +01:00 |
|
Philip Häusler
|
cf3960aeba
|
shiftplan ical export
|
2011-12-29 00:35:23 +01:00 |
|
Philip Häusler
|
1633d62772
|
ical export for available shifts
|
2011-12-28 14:45:49 +01:00 |
|
Philip Häusler
|
666bb3919c
|
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
|
2011-12-27 22:21:32 +01:00 |
|
Philip Häusler
|
8c1f9e7057
|
admin_room rewrite
|
2011-12-27 22:21:24 +01:00 |
|
Jan-Philipp Litza
|
037f19a137
|
Give MANY more filter options on shift view
|
2011-12-27 22:13:17 +01:00 |
|
Philip Häusler
|
8259266297
|
#44 shiftplan
|
2011-12-27 15:42:13 +01:00 |
|
Philip Häusler
|
e0ffeb1005
|
registration fix
|
2011-12-27 14:40:16 +01:00 |
|
Philip Häusler
|
9b46a83870
|
registration fix
|
2011-12-27 14:13:16 +01:00 |
|
Jan-Philipp Litza
|
d3b51174b6
|
performance improvements for displaying shifts
|
2011-12-27 13:50:07 +01:00 |
|
Philip Häusler
|
c925f19a96
|
registration fix
|
2011-12-27 13:34:04 +01:00 |
|
Philip Häusler
|
b707f55250
|
registration fix
|
2011-12-27 13:30:51 +01:00 |
|
Philip Häusler
|
60810251e5
|
ical reset fix
|
2011-12-26 21:23:27 +01:00 |
|
Philip Häusler
|
043a1203d4
|
bugfixes with angeltype (TID removed)
|
2011-12-26 20:51:08 +01:00 |
|
Philip Häusler
|
80f355a94f
|
#44 edit user <- user_angeltypes
|
2011-12-26 19:58:05 +01:00 |
|
Philip Häusler
|
77381ebca8
|
#44 confirm angel types
|
2011-12-26 19:28:34 +01:00 |
|
Philip Häusler
|
b3d4d7dc52
|
#44 user angel types -> user_settings, cleanup
|
2011-12-26 18:29:45 +01:00 |
|
Philip Häusler
|
9e8d3aca6c
|
#44 user angel types -> user_settings
|
2011-12-26 18:28:57 +01:00 |