jwacalex
|
6a591e7557
|
merged cherry picked commit
|
2016-11-30 23:31:21 +01:00 |
|
jwacalex
|
64c304f9bf
|
Merge branch 'master'
|
2016-11-30 23:28:04 +01:00 |
|
jwacalex
|
45cda10479
|
merged master and issue
|
2016-11-30 23:23:49 +01:00 |
|
jwacalex
|
79b9f9448e
|
initial commit and functionality for no self sign up
|
2016-11-30 23:20:13 +01:00 |
|
msquare
|
39f9c2e34c
|
Merge pull request #284 from jwacalex/unset_user_id_in_shift_entries_controller
fixed broken logic in controller (cf. to mail to @msquare)
|
2016-11-30 17:43:55 +01:00 |
|
jwacalex
|
1324260e0f
|
forgot to remove if-statement -.-
|
2016-11-30 16:17:52 +01:00 |
|
jwacalex
|
f4f6dfefcb
|
fixed broken logic in controller (cf. to mail to @msquare)
|
2016-11-30 15:53:47 +01:00 |
|
msquare
|
53e12065c7
|
Merge pull request #283 from leaneb/master
Change Descriptions
|
2016-11-26 20:05:00 +01:00 |
|
Leandra Eberle
|
687c333322
|
Update Descriptions
|
2016-11-26 16:44:28 +01:00 |
|
Leandra Eberle
|
acbaaf4364
|
Update Descriptions
|
2016-11-26 16:43:22 +01:00 |
|
Leandra Eberle
|
d6d049a31c
|
Merge branch 'master' of https://github.com/leaneb/engelsystem
|
2016-11-26 16:34:45 +01:00 |
|
Leandra Eberle
|
10517213f6
|
Update Descriptions
|
2016-11-26 16:33:07 +01:00 |
|
leaneb
|
6ad204d8e2
|
Delete vcs.xml
|
2016-11-26 16:32:26 +01:00 |
|
Leandra Eberle
|
0401e90f00
|
Update Descriptions
|
2016-11-26 16:23:49 +01:00 |
|
Leandra Eberle
|
33031a9c62
|
Update Descriptions
|
2016-11-26 16:22:35 +01:00 |
|
leaneb
|
e1cc80ec41
|
Merge pull request #2 from engelsystem/master
Merge Changes from esys Master to own Repo
|
2016-11-26 11:39:47 +01:00 |
|
msquare
|
561e8ec36c
|
better msg placement on angeltype view
|
2016-11-25 14:55:19 +01:00 |
|
msquare
|
34248bb20c
|
show freeload comments to supporters (user shift admin)
|
2016-11-25 14:27:47 +01:00 |
|
msquare
|
476d1daeb7
|
fixes #280 shift entries finished by user returns no freeloaded shifts
|
2016-11-25 13:58:43 +01:00 |
|
msquare
|
bae3ede662
|
fixes #279 fix exporting freeload comment in json export
|
2016-11-25 13:38:16 +01:00 |
|
msquare
|
a8bcb19eaa
|
fix shift view bars
|
2016-11-25 13:06:05 +01:00 |
|
msquare
|
4f6db20ae4
|
fix shift view bars
|
2016-11-25 13:03:41 +01:00 |
|
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 |