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 |