Commit Graph

1704 Commits

Author SHA1 Message Date
msquare d865abb8b9 Merge pull request #282 from leaneb/master
Fixed Typo, and Description
2016-11-25 08:56:02 +01:00
Leandra Eberle 67df8da061 Typo Changes and Descriptions 2016-11-24 22:47:32 +01:00
leaneb 96728fedd7 Merge pull request #1 from engelsystem/master
Merge with Master
2016-11-24 22:29:06 +01:00
msquare 07e8d8dfbd Merge pull request #281 from engelsystem/gnomus-fix-typo
fix typo
2016-11-24 12:27:11 +01:00
gnomus dc49b9af41 Update guest_login.php 2016-11-24 12:22:18 +01:00
gnomus 7b32a40308 Update default.po 2016-11-24 12:21:41 +01:00
msquare ff31d0a1c5 fix shift signup state being combined to null 2016-11-24 09:32:32 +01:00
msquare 16e9a69c0d fixes #277 date parsing returns the start of the day now 2016-11-24 09:25:28 +01:00
msquare 321566d4b0 Merge pull request #278 from leaneb/master
Change Ask an Arch Angel title
2016-11-24 09:15:05 +01:00
Leandra Eberle 4116e0114e Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated 2016-11-24 00:17:01 +01:00
msquare 3fd30add3c fix NPE 2016-11-23 22:31:11 +01:00
msquare be8c47a175 add 33c3 theme 2016-11-23 17:52:58 +01:00
msquare 5ae328b2b1 hide event countdown for mobile clients 2016-11-20 17:54:16 +01:00
msquare 409761ce4b rebuild login page 2016-11-18 15:36:02 +01:00
msquare 9098b8e80d reduce complexity of user view 2016-11-18 08:47:52 +01:00
msquare 2a075b43c0 add namespace for test classes 2016-11-18 08:26:27 +01:00
msquare bd54bec595 add ValidationResult to namespace 2016-11-18 08:20:17 +01:00
msquare 356cc9e1d0 reduce complexity of user driver license 2016-11-17 15:04:33 +01:00
msquare 7b8d191808 reduce complexity of user driver license 2016-11-17 14:40:21 +01:00
msquare 9c4636f5c4 reduce complexity of user driver license 2016-11-17 14:35:04 +01:00
msquare b5784e5961 fix order problem 2016-11-17 13:16:15 +01:00
msquare d64f96b6a1 reduce complexity of angeltype controller 2016-11-17 13:11:44 +01:00
msquare 1636688394 reduce complexity of angeltype edit controller 2016-11-17 13:03:28 +01:00
msquare 9900d6e14c battle of the z-indizes 2016-11-16 13:03:22 +01:00
msquare f2630162e9 reduce complexity of password recovery controller 2016-11-15 22:08:41 +01:00
msquare ac53559fea fix shift calendar headers 2016-11-15 22:00:17 +01:00
msquare 54f3253c32 fix js var names 2016-11-15 21:42:43 +01:00
msquare 3e5316e0c1 align header text 2016-11-15 21:38:29 +01:00
msquare 79ca2f1772 add fixed shift calendar headers and timelane 2016-11-15 21:33:54 +01:00
msquare 5299ca2103 reduce complexity of shift view 2016-11-15 17:54:59 +01:00
msquare 5a93050a06 localize date rendering for eventconfig info 2016-11-15 17:41:02 +01:00
msquare 15243f15fc fix shift view 2016-11-15 17:22:15 +01:00
msquare ec40e10ebd fix unused code 2016-11-15 16:58:12 +01:00
msquare 53a306f14b make departure date nullable 2016-11-15 16:36:03 +01:00
msquare 918d41ca70 reduce complexity of menu and hints 2016-11-15 16:31:55 +01:00
msquare ec6016cd38 reduce complexity of menu and hints 2016-11-15 16:28:20 +01:00
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