msquare
|
19d5d68d82
|
fix fucked up merge
|
2016-11-15 15:49:39 +01:00 |
|
msquare
|
3873b8dc61
|
Merge branch 'pr/276'
# Conflicts:
# locale/de_DE.UTF-8/LC_MESSAGES/default.mo
# locale/de_DE.UTF-8/LC_MESSAGES/default.po
|
2016-11-15 15:35:55 +01:00 |
|
anykraus
|
852f17a535
|
Updated language files for sheduler to scheduler
(Pull Request #273 of engelsystem/engelsystem)
|
2016-11-14 19:42:03 +01:00 |
|
msquare
|
16ed2ae683
|
fixed settings validation
|
2016-11-14 19:10:29 +01:00 |
|
msquare
|
d3e942f742
|
Merge pull request #273 from anykraus/typo-sheduler-scheduler
minor typo fixed (sheduler to scheduler)
|
2016-11-14 18:21:58 +01:00 |
|
msquare
|
7cf2a9bb9b
|
split templates into different files
|
2016-11-14 18:14:32 +01:00 |
|
msquare
|
1a1ca1d1b5
|
split templates into different files
|
2016-11-14 18:14:23 +01:00 |
|
msquare
|
c81eb0e8b6
|
update german translation
|
2016-11-14 18:02:40 +01:00 |
|
msquare
|
f568141164
|
add shift legend and fix dark theme
|
2016-11-14 17:58:15 +01:00 |
|
msquare
|
0ab9f4f988
|
fix shift ended recognition and displayed time range end
|
2016-11-14 17:40:24 +01:00 |
|
msquare
|
1a3b4e2a33
|
redone shift coloring and shift signup state
|
2016-11-12 23:00:46 +01:00 |
|
msquare
|
106a678808
|
fix wrong variable
|
2016-11-12 20:15:25 +01:00 |
|
msquare
|
7bafe3f24c
|
fix shift occupied method
|
2016-11-12 19:05:36 +01:00 |
|
msquare
|
c61e888de4
|
change shift coloring
|
2016-11-12 12:56:10 +01:00 |
|
msquare
|
c10ab2d8d2
|
reduce complexity of shift signup allowed
|
2016-11-12 12:50:52 +01:00 |
|
msquare
|
5f2871538a
|
fix css problem with rooms table
|
2016-11-11 17:07:40 +01:00 |
|
msquare
|
03c9d1ef5d
|
reduce complexity of user settings main
|
2016-11-11 17:00:51 +01:00 |
|
msquare
|
beb0db6852
|
fix misspellings
|
2016-11-11 16:42:47 +01:00 |
|
msquare
|
ade473f3e1
|
update translation
|
2016-11-11 16:36:03 +01:00 |
|
msquare
|
247166f28b
|
improve code of user settings
|
2016-11-11 16:34:23 +01:00 |
|
msquare
|
f5a5f234e4
|
fixes #266: add checkbox allowing the users email to be used by humans like event-team
|
2016-11-11 15:24:51 +01:00 |
|
msquare
|
82b9436c50
|
rename coordinator to supporter
|
2016-11-11 14:59:25 +01:00 |
|
msquare
|
468a10774c
|
reduce complexity of user driver license controller
|
2016-11-10 13:55:16 +01:00 |
|
msquare
|
f6da9148e7
|
fix missing var check
|
2016-11-10 13:38:31 +01:00 |
|
msquare
|
defdb3007c
|
Merge pull request #272 from anykraus/#271-admin_active
fix admin_active.php not displaying (issue #271)
|
2016-11-09 22:04:22 +01:00 |
|
msquare
|
dfc9e209a5
|
fix parsedown
|
2016-11-09 19:25:55 +01:00 |
|
msquare
|
af9328f558
|
split angeltype about view into different methods
|
2016-11-09 18:05:00 +01:00 |
|
msquare
|
0ba0ce207d
|
split angeltype view into different methods
|
2016-11-09 18:02:01 +01:00 |
|
msquare
|
d43eb41d25
|
Merge pull request #274 from engelsystem/task-164-shift-view
Task 164 shift view
|
2016-11-09 17:43:56 +01:00 |
|
msquare
|
22520532c7
|
fix shift occupied calculation
|
2016-11-07 21:24:05 +01:00 |
|
msquare
|
125f34133d
|
remove unused var
|
2016-11-07 21:11:05 +01:00 |
|
msquare
|
a8e3e91448
|
implement shift calendar into user shift page
|
2016-11-07 20:55:37 +01:00 |
|
msquare
|
db7f8c1ab3
|
split shift calendar renderer into different classes
|
2016-11-07 20:50:15 +01:00 |
|
anykraus
|
8c22ec7f6d
|
typo fixed (sheduler to scheduler)
|
2016-11-07 20:24:01 +01:00 |
|
msquare
|
cf8cc5f592
|
change shift table to html5
|
2016-11-05 10:06:06 +01:00 |
|
msquare
|
902866ff3a
|
add first design of new shift markup
|
2016-11-03 18:28:22 +01:00 |
|
anykraus
|
efb7dbfb01
|
fix admin_active.php not displaying (issue #271)
Reverts 53ad1b5110 "fix codacy unused code" partially. (where $shift_sum_formula was removed from global)
|
2016-11-02 02:04:43 +01:00 |
|
msquare
|
d59b1c8812
|
fix phpunit config
|
2016-10-09 09:40:11 +02:00 |
|
msquare
|
1d4811cca5
|
remove unused code
|
2016-10-08 09:18:04 +02:00 |
|
msquare
|
c48335e702
|
improve shift rendering
|
2016-10-07 17:22:48 +02:00 |
|
msquare
|
6d97aa2d27
|
continue working on shifts calendar renderer
|
2016-10-05 22:28:39 +02:00 |
|
msquare
|
6fff6a6c1a
|
begin room view and shifts filter renderer
|
2016-10-05 18:56:50 +02:00 |
|
msquare
|
27c9650dc4
|
reduce complexity of shifts controller
|
2016-10-04 21:20:38 +02:00 |
|
msquare
|
a50b26490c
|
reduce complexity of shiftsfilter update
|
2016-10-04 18:52:52 +02:00 |
|
msquare
|
aa628208ec
|
reduce complexity of shift view
|
2016-10-04 18:36:57 +02:00 |
|
msquare
|
676f5e1627
|
small code style improvements
|
2016-10-04 18:11:26 +02:00 |
|
msquare
|
42144ed21c
|
move static access to datetime parse function
|
2016-10-04 17:58:56 +02:00 |
|
msquare
|
eec10ebfc5
|
reduce complexity of user angeltypes controller
|
2016-10-04 16:50:06 +02:00 |
|
msquare
|
455e417200
|
fix variable naming problems
|
2016-10-04 16:16:00 +02:00 |
|
msquare
|
51d270db28
|
restore ical export
|
2016-10-03 19:37:00 +02:00 |