Philip Häusler
|
0e0f7f0516
|
fix #203: message popover not workin in safari
|
9 years ago |
|
Philip Häusler
|
d68c91be18
|
remove sessionhelper
|
9 years ago |
|
msquare
|
a92e1e3ea6
|
Merge pull request #213 from engelsystem/remove-sessionhelper
remove sessionhelper
|
9 years ago |
|
Philip Häusler
|
902a5852a4
|
fix user result check on user controller
|
9 years ago |
|
Philip Häusler
|
3790818baf
|
fix user delete log entry
|
9 years ago |
|
Max Weller
|
0dc8da68f4
|
display room number in admin_rooms edit form
|
9 years ago |
|
Felix Favre
|
ecf25f5d2a
|
replace overcomplicated regex for email validation with php function
|
9 years ago |
|
Felix Favre
|
73208016bf
|
change date format in shift table
fixes #202
|
9 years ago |
|
Felix Favre
|
e4bd324801
|
changed all y-m-d date formats to Y-m-d date formats
part of #202
|
9 years ago |
|
Felix Favre
|
1af6b8cf20
|
How Mysql Connection Error to user
fixes #207
|
9 years ago |
|
Felix Favre
|
2df2398b87
|
add more information to ical export
fixes #175
|
9 years ago |
|
Felix Favre
|
8c1f6d2c9c
|
removed sessionhelper. we should let this handle the server administrator within the PHP config
|
9 years ago |
|
Philip Häusler
|
128ee0911f
|
fix wrong data at arrival statistics
|
9 years ago |
|
Philip Häusler
|
c4ee004095
|
rework arrival stat graphs and tables
|
9 years ago |
|
gnomus
|
a67237d0ef
|
Named Function Correctly
|
9 years ago |
|
gnomus
|
73197995d7
|
Merge pull request #209 from engelsystem/feature-shift-types
Add Email Form Helper
|
9 years ago |
|
gnomus
|
7306545e32
|
Add Email Form Helper
|
9 years ago |
|
gnomus
|
b3aa6cc473
|
Change Register form E-Mailfield to form_email
|
9 years ago |
|
Philip Häusler
|
a7189482e9
|
add shift creator and editor
|
9 years ago |
|
Philip Häusler
|
cac86ef509
|
add planned date of departure
|
9 years ago |
|
Philip Häusler
|
bc84710e9d
|
wording
|
9 years ago |
|
Philip Häusler
|
28788e6702
|
put shirt statistics into one table
|
9 years ago |
|
Philip Häusler
|
e8daa4d2ce
|
add table of needed shirts to user active page
|
9 years ago |
|
Philip Häusler
|
18e49ee06a
|
put active+shirt info into a new line
|
9 years ago |
|
Philip Häusler
|
fc0d97344e
|
made shift creation angeltypes smaller (like room editing)
|
9 years ago |
|
Philip Häusler
|
41280a17f5
|
added hint about nightshifts
|
9 years ago |
|
Philip Häusler
|
42150cc6e9
|
add log entry for deleting own shift entries
|
9 years ago |
|
Philip Häusler
|
3d7e378b67
|
change default end date on creating shifts
|
9 years ago |
|
Philip Häusler
|
1cd6a4f4f6
|
keep the show all users checkbox
|
9 years ago |
|
Philip Häusler
|
f9fb12c7f1
|
show all forced active angels
|
9 years ago |
|
Philip Häusler
|
34be996f22
|
add possibility to show already done shifts in admin active view
|
9 years ago |
|
Philip Häusler
|
1c9a3fa89e
|
fix group rights management
|
9 years ago |
|
Philip Häusler
|
723961c19e
|
User shift admins see free and occupied shifts by default
|
9 years ago |
|
Philip Häusler
|
df526fa2bf
|
fix problem with beeing informed about shift changes
|
9 years ago |
|
Philip Häusler
|
5742306095
|
fix wrong user shift edit link
|
9 years ago |
|
Philip Häusler
|
2823c0e438
|
fix angel list with multiple vouchers
|
9 years ago |
|
Philip Häusler
|
803c0a552f
|
make multiple vouchers possible
|
9 years ago |
|
Philip Häusler
|
681d52fe0f
|
fix frab import problem on creating rooms
|
9 years ago |
|
Philip Häusler
|
18585285a3
|
fix user update problem
|
9 years ago |
|
Philip Häusler
|
1dcd6c0f3f
|
fix loggin on setting rooms angeltypes
|
9 years ago |
|
Philip Häusler
|
c06573bb87
|
add maintenance mode
|
9 years ago |
|
Philip Häusler
|
bc0354fbff
|
responsive resizing for graphs is broken -> turn off
|
9 years ago |
|
Philip Häusler
|
1a0ccddbe9
|
show number of user angel types to confirm in hint
|
9 years ago |
|
Philip Häusler
|
6376b90e9f
|
introduce table buttons to angeltype view
|
9 years ago |
|
Philip Häusler
|
386a3c3298
|
remove duplication from unconfirmed angeltypes hint
|
9 years ago |
|
Philip Häusler
|
bae55f78fd
|
swap chart and table
|
9 years ago |
|
Philip Häusler
|
d414c455a2
|
responsive chart
|
9 years ago |
|
Philip Häusler
|
46f0636f2f
|
arrival statistics
|
9 years ago |
|
Philip Häusler
|
18644cac7a
|
fixes #196: make users planned arrival date editable in user settings and show it in their own profile
|
9 years ago |
|
Philip Häusler
|
4aec1b1536
|
fix doubleclick bug on user hint popover
|
9 years ago |
|
Philip Häusler
|
8c518d4c34
|
add arrival date feature
|
9 years ago |
|
Philip Häusler
|
66c7e67a03
|
remove avatars
|
9 years ago |
|
Philip Häusler
|
53737666c6
|
add bootstrap datepicker
|
9 years ago |
|
Philip Häusler
|
993d6a4f59
|
add cccamp15 design
|
9 years ago |
|
Philip Häusler
|
86a4773243
|
add log entry test
|
10 years ago |
|
Philip Häusler
|
eddafead49
|
add function to clear log to model
|
10 years ago |
|
Philip Häusler
|
1da5604f47
|
remove json auth feature (will be covered by api)
|
10 years ago |
|
Philip Häusler
|
45c8a68beb
|
deleted counter function - never needed in the last 4 years
|
10 years ago |
|
Felix Favre
|
c88b1adcfe
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
10 years ago |
|
Felix Favre
|
dc2c986522
|
fix location of session file storage
|
10 years ago |
|
Philip Häusler
|
c6c0e8f2ff
|
fix test running
|
10 years ago |
|
Philip Häusler
|
218b305a3e
|
fix broken session creation
|
10 years ago |
|
Philip Häusler
|
0a59089e2b
|
add room model tests
|
10 years ago |
|
Philip Häusler
|
284ed12f59
|
add bootstrap file
|
10 years ago |
|
Philip Häusler
|
0cb28c05b1
|
fix creation of shift types
|
10 years ago |
|
Philip Häusler
|
9af229094d
|
display user nicks on shift json export
|
10 years ago |
|
Philip Häusler
|
48e4787548
|
set force active user to active
|
10 years ago |
|
Philip Häusler
|
ca37de95da
|
fix shift update
|
10 years ago |
|
Philip Häusler
|
739eddefd5
|
better shift sign up restriction
|
10 years ago |
|
Philip Häusler
|
a470a5f5d3
|
fix shift creation
|
10 years ago |
|
Philip Häusler
|
6bede2fd22
|
harden the sql queries
|
10 years ago |
|
Philip Häusler
|
a6ab81b834
|
fix overfull progress bars
|
10 years ago |
|
Philip Häusler
|
cb46534569
|
move shift edit buttons
|
10 years ago |
|
Philip Häusler
|
0b70fc2a7f
|
better shift sign up buttons in shift view
|
10 years ago |
|
Philip Häusler
|
502a52394e
|
redirect to users page on shift cancel by admin
|
10 years ago |
|
Philip Häusler
|
16ce2eb969
|
begin cleanup of user edit
|
10 years ago |
|
Philip Häusler
|
247d9b65c1
|
remove user angeltype administration from user-edit
|
10 years ago |
|
Philip Häusler
|
af52251cef
|
angelnames were too fat.
|
10 years ago |
|
Philip Häusler
|
582c429fd4
|
allow admin to sign up more angels than needed again
|
10 years ago |
|
Philip Häusler
|
8d6175a273
|
user cannot signup for full shifts
|
10 years ago |
|
Philip Häusler
|
af25ca9103
|
fix broken log nick
|
10 years ago |
|
Philip Häusler
|
1ec2783a8e
|
use user nick render
|
10 years ago |
|
Philip Häusler
|
dc412ba826
|
sort meetings by date
|
10 years ago |
|
Philip Häusler
|
71a23be3d4
|
fade out for not arrived angels
|
10 years ago |
|
Philip Häusler
|
77273425f7
|
fade out for not arrived angels
|
10 years ago |
|
Philip Häusler
|
bd48de258a
|
update german translation
|
10 years ago |
|
Philip Häusler
|
9007bb6790
|
sort news by date
|
10 years ago |
|
Philip Häusler
|
47b52bc3f6
|
count confirmed and unconfirmed angels
|
10 years ago |
|
Philip Häusler
|
8764be8604
|
display room per shift in shift table
|
10 years ago |
|
Philip Häusler
|
fc4a5e0e7a
|
fix shift creation for shifttypes
|
10 years ago |
|
Philip Häusler
|
9cabdb1d78
|
shift edit for shifttypes
|
10 years ago |
|
Philip Häusler
|
c602d0208f
|
integrate voucher into user state
|
10 years ago |
|
Philip Häusler
|
7cb3a772ed
|
integrate vouche into user state
|
10 years ago |
|
Philip Häusler
|
8ed077bcec
|
user voucher feature
|
10 years ago |
|
Philip Häusler
|
33bafad9b7
|
fix wrong redirect after shift edit
|
10 years ago |
|
Philip Häusler
|
34e2f49875
|
shift signup improvements for shift view
|
10 years ago |
|
Philip Häusler
|
3770ab8271
|
add import progress
|
10 years ago |
|
Philip Häusler
|
0fda4a9181
|
update german translation
|
10 years ago |
|
Philip Häusler
|
342b79ff3f
|
more fixes
|
10 years ago |
|
Philip Häusler
|
2d587478a1
|
fix different bugs with shift types
|
10 years ago |
|
Philip Häusler
|
702047de53
|
add more icons for better shift view
|
10 years ago |
|
Philip Häusler
|
c12e5336fb
|
display shifts with title
|
10 years ago |
|
Philip Häusler
|
6a05c3d9de
|
rewrite create shifts for shifttypes
|
10 years ago |
|
Philip Häusler
|
0dbd0ea599
|
add basic shift view
|
10 years ago |
|
Felix Favre
|
2f20540a6b
|
more infos in shift view
|
10 years ago |
|
Philip Häusler
|
038bf97178
|
link to next shift in menu
|
10 years ago |
|
Philip Häusler
|
d02272afd6
|
add basic shift view
|
10 years ago |
|
Philip Häusler
|
a791a75b0a
|
integrate shift type into shifts
|
10 years ago |
|
Philip Häusler
|
634a3739b2
|
better shift type links
|
10 years ago |
|
Philip Häusler
|
3f8e5e47c0
|
add update, delete and view for shift type
|
10 years ago |
|
Philip Häusler
|
526167ed11
|
add create shift type
|
10 years ago |
|
Philip Häusler
|
c8cc46886b
|
shift type list
|
10 years ago |
|
Philip Häusler
|
a73e98a8e0
|
prepare shift types controller and view
|
10 years ago |
|
Philip Häusler
|
294a21d163
|
add shift types model
|
10 years ago |
|
Philip Häusler
|
25889920cf
|
prepare for shift types model, add db update
|
10 years ago |
|
Felix Favre
|
8a51e5d822
|
added headings template function
(cherry picked from commit 02457f00b809282d5fa4be19239a33afb3e927c3)
|
10 years ago |
|
Felix Favre
|
807e420883
|
only log if api key was reset on purpose
|
10 years ago |
|
Felix Favre
|
d2e59e8f86
|
make FAQ Buttom more visible
fixes #166
|
10 years ago |
|
Felix Favre
|
b299b0e085
|
reworked user editing of angeltypes
fixes #170
|
10 years ago |
|
Felix Favre
|
f20e24f589
|
shift page styling
|
10 years ago |
|
Felix Favre
|
c18c0983fc
|
only show "arrived" button if user has rights for it
fixes #172
|
10 years ago |
|
Felix Favre
|
be1bb5fbeb
|
add simple search to log view
|
10 years ago |
|
Philip Häusler
|
388dd0e136
|
display date
|
10 years ago |
|
Philip Häusler
|
9125f7e5ab
|
show 10000 log entries
|
10 years ago |
|
Philip Häusler
|
f39df75b4e
|
list user buttons size
|
10 years ago |
|
Felix Favre
|
ed001633e6
|
Own Shifts ignore the filled filter.
issue #134
|
10 years ago |
|
Felix Favre
|
3e958227aa
|
fix shift collision display
|
10 years ago |
|
Felix Favre
|
e9bbd967ff
|
add freeload info to shiftentry update log
issue #28
|
10 years ago |
|
Felix Favre
|
5b3d0d302f
|
on api-key reset also log the username
|
10 years ago |
|
Felix Favre
|
bc6aa9a209
|
responsify create room form
|
10 years ago |
|
Felix Favre
|
1cc84a967a
|
change default selection
|
10 years ago |
|
Philip Häusler
|
7e650920d3
|
dont send mails for my own actions
|
10 years ago |
|
Philip Häusler
|
1f572918ff
|
include all mailers
|
10 years ago |
|
Philip Häusler
|
a4a4a0aecc
|
fix missing ;
|
10 years ago |
|
Philip Häusler
|
f4fa7f5d33
|
union shift update model
|
10 years ago |
|
Felix Favre
|
07b9de84c5
|
use mail helpers for shift delete and shift change
|
10 years ago |
|
Felix Favre
|
8f918422f4
|
mailer functions for shift delete,assign,remove
|
10 years ago |
|
Felix Favre
|
5b3e5750eb
|
Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
includes/model/ShiftEntry_model.php
|
10 years ago |
|
Felix Favre
|
09ef38ff35
|
change shift mail function
|
10 years ago |
|
Felix Favre
|
4b490167ac
|
added User.Nick to ShiftEntries_by_shift function
|
10 years ago |
|
Philip Häusler
|
b75700ee1b
|
add shift delete model
|
10 years ago |
|
Philip Häusler
|
d26f8aa12c
|
add shift update model
|
10 years ago |
|
Philip Häusler
|
fa0e38ebff
|
add shift create model
|
10 years ago |
|
Philip Häusler
|
156db1eadd
|
add shift entry update model
|
10 years ago |
|
Philip Häusler
|
0a74ab94a8
|
add shift entry delete model
|
10 years ago |
|
Philip Häusler
|
514d2aca64
|
add function to list users subscribed to a shift
|
10 years ago |
|
Philip Häusler
|
9176261762
|
add shift entry create model
|
10 years ago |
|
Felix Favre
|
09e65d1a84
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
10 years ago |
|
Felix Favre
|
9e0cc40e6d
|
added shift mailer
|
10 years ago |
|
Philip Häusler
|
663526246b
|
add settings button to user page
|
10 years ago |
|
Felix Favre
|
e9ae329be4
|
added another theme
|
10 years ago |
|
Felix Favre
|
8bcce0e003
|
change button size in user_news
|
10 years ago |
|
Felix Favre
|
6ade63f11d
|
change popover sybol based on message
|
10 years ago |
|
Felix Favre
|
69878fa458
|
changes to messages popover
|
10 years ago |
|
Felix Favre
|
45ac884474
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
10 years ago |
|
Felix Favre
|
921449f3ef
|
more styling
|
10 years ago |
|
Philip Häusler
|
a48fd8fc37
|
change hint color on urgency
|
10 years ago |
|
Philip Häusler
|
d34fae3c40
|
move hints to toolbar
|
10 years ago |
|
Philip Häusler
|
8261933bec
|
try to prevent hint duplication
|
10 years ago |
|
Felix Favre
|
40d83367bb
|
beautify messages form
|
10 years ago |
|
Felix Favre
|
b97154d19e
|
form_element helper now supports empty labels
|
10 years ago |
|
Felix Favre
|
703de07a63
|
remove striped table from shift view
|
10 years ago |
|
Felix Favre
|
2f445eb90c
|
Merge branch 'master' of github.com:engelsystem/engelsystem
|
10 years ago |
|
Felix Favre
|
3973236f6e
|
css and layout fixes. font path fix
|
10 years ago |
|
Philip Häusler
|
10d7fce163
|
fix wrong angel type alarm
|
10 years ago |
|
Philip Häusler
|
481e52cf77
|
add email shiftinfo checkbox/flag
|
10 years ago |
|
Philip Häusler
|
57a92dbdcd
|
add opt-in bool for shiftinfo mails and remove icq from users
|
10 years ago |
|
Felix Favre
|
191ba6e1b1
|
replace all the remaining old icons with glyphicons
|
10 years ago |
|
Felix Favre
|
524acb15ba
|
use the new very cool glyph button
|
10 years ago |
|
Felix Favre
|
de65cd64e1
|
add very cool button_glyph helper
|
10 years ago |
|
Felix Favre
|
2654fcf228
|
use glyph_bool in admin_active view
|
10 years ago |
|
Felix Favre
|
67bca99571
|
Use more Striped Tables
issue #159
|
10 years ago |
|
illuxio
|
90a5e5ec14
|
Update User_view.php
Fix Nickname and DECT bug in settings.
|
10 years ago |
|
Philip Häusler
|
4516cbe5d6
|
renamed mysql provider to mysqli, updated system requirements, fixes #145
|
10 years ago |
|
Robert Oehlmann
|
a42ba2f5a1
|
Fixed field assignments in shift entry creation form
|
10 years ago |
|
Robert Oehlmann
|
c4039f72bb
|
Fixed shift duration calculation
Fixes issue #136
|
10 years ago |
|
Robert Oehlmann
|
4edaa26911
|
Fixed shift edit/delete URLs in new layout
|
10 years ago |
|
Philip Häusler
|
785fd45d3a
|
fix register privilege
|
10 years ago |
|
Philip Häusler
|
4931fbb372
|
replace icons with glyphicons
|
10 years ago |
|
Philip Häusler
|
bd2a8b441f
|
clear up mvc for user list
|
10 years ago |
|
Philip Häusler
|
1d9e1c467c
|
user list rewritten
|
10 years ago |
|
Philip Häusler
|
0f77edc4fb
|
hint for disabled registration
|
10 years ago |
|
Philip Häusler
|
e4a042c8c3
|
clear userlist
|
10 years ago |
|
Philip Häusler
|
f06e4a0f47
|
move user messages to menu icon right
|
10 years ago |
|
Philip Häusler
|
07b6541204
|
move language to submenu
|
10 years ago |
|
Philip Häusler
|
094715e6ee
|
optimize navbar for 1024 px width
|
10 years ago |
|
Philip Häusler
|
50fea6d371
|
fix session security issue (same session on multiple instances)
|
10 years ago |
|
Philip Häusler
|
46575d90c2
|
pulled complete menu to the top (go for mobile...)
|
10 years ago |
|
Philip Häusler
|
1785c38698
|
fix login layout and add mobile nav
|
10 years ago |
|
Philip Häusler
|
4414358cf5
|
fix wrong nick and api sql query
|
10 years ago |
|
Philip Häusler
|
2716c63648
|
fix wrong username on angeltype confirm
|
10 years ago |
|
Moritz Kaspar Rudert (mortzu)
|
27b8223611
|
removed bootstrap.php
|
10 years ago |
|
Philip Häusler
|
9adaeaa97a
|
shift state text update
|
10 years ago |
|
Philip Häusler
|
fbdb8ae472
|
move new messages badge
|
10 years ago |
|
Philip Häusler
|
53a10de5cf
|
move json and ical export buttons
|
10 years ago |
|
Philip Häusler
|
3da1748e84
|
correct shift state strings
|
10 years ago |
|
Philip Häusler
|
da6eaae215
|
refactor shift state
|
10 years ago |
|
Philip Häusler
|
0e2b257342
|
begin to refactor user shift state
|
10 years ago |
|
Philip Häusler
|
25b5096c7e
|
update german translation
|
10 years ago |
|
Felix Favre
|
4faca9864f
|
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
|
10 years ago |