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 |
|
Philip Häusler
|
821e37c1b2
|
removed faq feature
|
11 years ago |
|
Philip Häusler
|
e9565a79ea
|
simplified config
|
11 years ago |
|
Philip Häusler
|
d5b0311061
|
german translation update
|
11 years ago |
|
Philip Häusler
|
c1539ef5bb
|
display stored dect number in settings
|
11 years ago |
|
Philip Häusler
|
ef66360f69
|
fix angeltype assign error
|
11 years ago |
|
Philip Häusler
|
347a861da0
|
register with default config theme
|
11 years ago |
|
Philip Häusler
|
33785f45a2
|
missing start and end shift in session
|
11 years ago |
|
Philip Häusler
|
e60b0df2ec
|
gettext some german translation
|
11 years ago |
|
Philip Häusler
|
c8041fa27f
|
template cleanup
|
11 years ago |
|
Philip Häusler
|
1e05da6c81
|
gettext for user sites
|
11 years ago |
|
Philip Häusler
|
8a5915594f
|
gettext for admin active
|
11 years ago |
|
Philip Häusler
|
7d3239f3fe
|
forgot to add the new views
|
11 years ago |
|
Philip Häusler
|
85d9bf4f9c
|
angel views in english complete
|
11 years ago |
|
Philip Häusler
|
813751ac7a
|
language cleanup
|
11 years ago |
|
Philip Häusler
|
aad54bfe88
|
basic gettext integration
|
11 years ago |
|
Philip Häusler
|
96a263f712
|
initial gettext integration
|
11 years ago |
|
Philip Häusler
|
3c4321ff76
|
30c3 theme
|
11 years ago |
|
Philip Häusler
|
bfb0cacd54
|
mysql to mysqli and a lot of cleanup and mvc
|
11 years ago |
|
Philip Häusler
|
d50cc21f50
|
#119 extended json shift information for angeltypes and taken places
|
11 years ago |
|
Philip Häusler
|
fb8241039b
|
#119 added links to json export
|
11 years ago |
|
Philip Häusler
|
a47b1935cb
|
#119 added basic shift json export support using same pattern like ical export
|
11 years ago |
|
Philip Häusler
|
98aac2a429
|
brought back hour sum on my shifts
|
12 years ago |
|
Philip Häusler
|
a573b4e325
|
replaced header with redirect function
|
12 years ago |
|
Philip Häusler
|
8fd5ffb335
|
cleanup user myshifts
|
12 years ago |
|
Philip Häusler
|
dd4530d760
|
User Nick function, enhanced log with some links
|
12 years ago |
|
Jan-Philipp Litza
|
b26994f518
|
moved footer to navigation and removed left-padding of headings, reworked credits
|
12 years ago |
|
Jan-Philipp Litza
|
b32ade0a34
|
Fix new shift time filter and show dates for longer shift tables
|
12 years ago |
|
Jan-Philipp Litza
|
3efe63fa10
|
fix #49: "Array" after preview in mass-shift-generation
|
12 years ago |
|
Jan-Philipp Litza
|
de695c0fe4
|
make shifts filterable by timespan instead of days and enable new view for arbitrary timespans
|
12 years ago |
|
Jan-Philipp Litza
|
0d47caa09b
|
simplified stats generation
|
12 years ago |
|
Jan-Philipp Litza
|
f91e00adc7
|
fix bug in signing off from shifts
|
12 years ago |
|
Jan-Philipp Litza
|
7e44546f5c
|
use bin icon instead of cross for deletion
|
12 years ago |
|
Jan-Philipp Litza
|
d509a10121
|
Prevent from signing up for colliding shifts servier-side
|
12 years ago |
|
Jan-Philipp Litza
|
0dae68a9a3
|
indicate colliding shifts in new shift view
|
12 years ago |
|
Jan-Philipp Litza
|
bf226f87dc
|
revert scrollable table because of bad browser implementation and replace by non-fixed header scrolling
|
12 years ago |
|
Philip Häusler
|
38366b0285
|
fix admin user angeltypes, preventing from deleting all permissions
|
12 years ago |
|
Philip Häusler
|
1f764e20a3
|
fixed strange hour sum impossible
|
12 years ago |
|
Philip Häusler
|
b7b8b142e3
|
fixed strange hour sum
|
12 years ago |