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
|
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 |
Felix Favre
|
807e420883
|
only log if api key was reset on purpose
|
2014-12-16 00:54:50 +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
|
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 |
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
|
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
|
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
|
9176261762
|
add shift entry create model
|
2014-12-07 16:54:13 +01:00 |
Felix Favre
|
8bcce0e003
|
change button size in user_news
|
2014-12-07 00:10:47 +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
|
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
|
703de07a63
|
remove striped table from shift view
|
2014-12-06 19:49:16 +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
|
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 |
Robert Oehlmann
|
a42ba2f5a1
|
Fixed field assignments in shift entry creation form
|
2014-11-03 19:37:47 +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
|
094715e6ee
|
optimize navbar for 1024 px width
|
2014-09-24 15:03:41 +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 |
Moritz Kaspar Rudert (mortzu)
|
27b8223611
|
removed bootstrap.php
|
2014-09-08 08:38:08 +02:00 |
Philip Häusler
|
fbdb8ae472
|
move new messages badge
|
2014-08-24 16:46:30 +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 |
Philip Häusler
|
f9e577352d
|
remove html templates
|
2014-08-23 19:15:10 +02:00 |
Philip Häusler
|
7f43f3bfe5
|
remove html templates
|
2014-08-23 17:24:11 +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
|
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
|
e107dff1ce
|
button style and redirect fixes
|
2014-05-13 14:44:04 +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
|
13f8a513d4
|
fix error messages on password recovery
|
2014-03-12 17:36:55 +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
|
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
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
2014-01-05 19:34:17 +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
|
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
|
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
|
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
|
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
|
85d9bf4f9c
|
angel views in english complete
|
2013-11-25 21:56:56 +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
|
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
|
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
|
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 |