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 |
|
Philip Häusler
|
f9e577352d
|
remove html templates
|
10 years ago |
|
Felix Favre
|
520aed3d32
|
Changed Next Shift Countdown Format
|
10 years ago |
|
Philip Häusler
|
7f43f3bfe5
|
remove html templates
|
10 years ago |
|
Felix Favre
|
c57e450ed2
|
Changed Angeltypes List Actions to Bootstrap Button Group
|
10 years ago |
|
Philip Häusler
|
66f166399c
|
better preselected angeltypes
|
10 years ago |
|
Philip Häusler
|
d60c2f0c40
|
better layout for user register
|
10 years ago |
|
Philip Häusler
|
51cecb27e5
|
better layout for user settings
|
10 years ago |
|
Philip Häusler
|
f30bc25246
|
minor bugfixes
|
10 years ago |
|
Philip Häusler
|
c5331c44fd
|
move language select to the top
|
10 years ago |
|
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
10 years ago |
|
Philip Häusler
|
74647e16d3
|
add basic bootstrap theme
|
10 years ago |
|
Philip Häusler
|
721aa7f160
|
#148 fix wrong password validation message
|
11 years ago |
|
Philip Häusler
|
d394ed2fee
|
notify coordinators about unconfirmed angeltypes
|
11 years ago |
|
Philip Häusler
|
f1145b8a5e
|
implemented team/angeltype coordinators
|
11 years ago |
|
Philip Häusler
|
e107dff1ce
|
button style and redirect fixes
|
11 years ago |
|
Philip Häusler
|
a33fc5e21d
|
router simplification
|
11 years ago |
|
Philip Häusler
|
3401c6f8b6
|
admin import now without template files
|
11 years ago |
|
Philip Häusler
|
cf20bc1c29
|
test for existing shifts
|
11 years ago |
|
Philip Häusler
|
dc7a56f422
|
fixed angeltype add model
|
11 years ago |
|
Philip Häusler
|
0ce1ba5bf1
|
style rename to engelsystem default
|
11 years ago |
|
Philip Häusler
|
3963e4907a
|
german update and style reset
|
11 years ago |
|
Philip Häusler
|
13f8a513d4
|
fix error messages on password recovery
|
11 years ago |
|
Philip Häusler
|
462b78a7e7
|
better integration of angeltypes about
|
11 years ago |
|
Philip Häusler
|
ab450600d7
|
better integration of angeltypes about
|
11 years ago |
|
Philip Häusler
|
f40b78faac
|
angeltypes about section
|
11 years ago |
|
Philip Häusler
|
98f355cd86
|
added angeltype description
|
11 years ago |
|
Philip Häusler
|
82c0d2acc2
|
controller comments
|
11 years ago |
|
Philip Häusler
|
b35a32ef52
|
completed api comments
|
11 years ago |
|
Philip Häusler
|
239c2b1684
|
reviewed cookies api
|
11 years ago |
|
Philip Häusler
|
71feeee3f2
|
innodb and foreign keys
|
11 years ago |
|
Philip Häusler
|
27ff879f51
|
cookie-0007-API-getRoom-show-real-rooms.patch
|
11 years ago |
|
Philip Häusler
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
11 years ago |
|
Philip Häusler
|
9dc5dbe3b6
|
cookie-0005-API-add-getApiKey.patch
|
11 years ago |
|
Philip Häusler
|
316c18f912
|
removed old user angeltypes
|
11 years ago |
|
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
11 years ago |
|
Philip Häusler
|
d921cf903e
|
tshirt sum
|
11 years ago |
|
Philip Häusler
|
8c2157c546
|
shirt statistics
|
11 years ago |
|
Philip Häusler
|
8fa78b55ac
|
first api new files
|
11 years ago |
|
Philip Häusler
|
a041e0efbb
|
first api
|
11 years ago |
|
Philip Häusler
|
124cf64d4f
|
try to fix ical, but still broken
|
11 years ago |
|
Philip Häusler
|
f2b0756296
|
user hover displays angeltypes
|
11 years ago |
|
Philip Häusler
|
0a4bd66c5f
|
removed email and age from user list
|
11 years ago |
|
Philip Häusler
|
1174b11c0a
|
display freeloads in angel list
|
11 years ago |
|
Philip Häusler
|
299652e070
|
fix broken ical export
|
11 years ago |
|
Philip Häusler
|
400dc093c6
|
force active function fix
|
11 years ago |
|
Philip Häusler
|
a9fb05b128
|
force active function
|
11 years ago |
|
Philip Häusler
|
8ce67793df
|
form text fields now make htmlspecialchars
|
11 years ago |
|
Philip Häusler
|
9da2ff6f9f
|
#137 fixed xss on login
|
11 years ago |
|
Philip Häusler
|
9d709b2a73
|
freeloader fix, admins should edit user shifts
|
11 years ago |
|
Philip Häusler
|
c589219a96
|
freeloader feature
|
11 years ago |
|
Philip Häusler
|
2c41fcdc09
|
display max 10000 log entries (1000 before)
|
11 years ago |
|
Philip Häusler
|
fdd4b44c0e
|
fixed button font and added star to shirt size at registration
|
11 years ago |
|
Philip Häusler
|
0c98f13eee
|
user password recovery
|
11 years ago |
|
Philip Häusler
|
e46528ff21
|
#134 removed empty line at the end of admin log php
|
11 years ago |
|
Philip Häusler
|
ec4f173a61
|
admin import uses now msg functions
|
11 years ago |
|
Philip Häusler
|
7df8b967f3
|
fixed count taken shifts entries
|
11 years ago |
|
Philip Häusler
|
a0ec1130a6
|
needed angeltypes corrected loading by room or special needs
|
11 years ago |
|
Philip Häusler
|
3bc9d09f7a
|
api all shifts export should only show needed angeltypes with count greater than 0
|
11 years ago |
|
Philip Häusler
|
4aa85a3ff2
|
api export for all shifts completed
|
11 years ago |
|
Philip Häusler
|
ad5899f028
|
api export for all shifts
|
11 years ago |
|
Philip Häusler
|
9a1ffdf198
|
fixed wrong lock icon paths
|
11 years ago |