msquare
|
deb41c4b64
|
reduce number of sql queries on shift calendar
|
2016-12-26 14:26:49 +01:00 |
|
msquare
|
99c7e8ce1a
|
fixes #298 allow a shift supporter to remove a user from shift
|
2016-12-24 17:29:12 +01:00 |
|
msquare
|
0c15964e6b
|
#298 hide freeload form from angeltype supporters
|
2016-12-24 17:02:34 +01:00 |
|
msquare
|
e86d75b4d9
|
begin #298 add privilege and add users to shifts by angeltype supporter
|
2016-12-24 17:00:03 +01:00 |
|
msquare
|
11bea2a3ce
|
update german translation
|
2016-12-23 16:24:50 +01:00 |
|
msquare
|
188891c147
|
use planned arrival time validation for register page
|
2016-12-23 16:22:46 +01:00 |
|
msquare
|
5b9ff7b7bf
|
fix that free shifts become green
|
2016-12-23 12:50:27 +01:00 |
|
msquare
|
b8c26b0fd0
|
fix that free shifts become green
|
2016-12-23 12:48:34 +01:00 |
|
msquare
|
9e804ba91a
|
fix that free shifts become green
|
2016-12-23 12:46:32 +01:00 |
|
msquare
|
94cc01d4ce
|
fixes #293 make panel heading font color dark for warning and success on 33c3 theme
|
2016-12-15 09:00:56 +01:00 |
|
msquare
|
acfe7309f6
|
remove angeltype contact fields until the feature is ready
|
2016-12-15 08:51:19 +01:00 |
|
msquare
|
6976208d5d
|
remove db name from update script
|
2016-12-13 18:07:36 +01:00 |
|
msquare
|
d4ea9dd218
|
fix non existing default contact mail address
|
2016-12-13 17:59:42 +01:00 |
|
msquare
|
5fea199b54
|
no scroll handler, wenn no shift calendar
|
2016-12-13 17:59:42 +01:00 |
|
msquare
|
2f0a63a4a1
|
remove angeltype contact radios for now
|
2016-12-13 17:59:42 +01:00 |
|
msquare
|
e26eb952f4
|
update binary lang file
|
2016-12-13 17:59:42 +01:00 |
|
msquare
|
deac80e700
|
merge #253
|
2016-12-13 17:58:41 +01:00 |
|
msquare
|
e7767af4c1
|
Merge pull request #285 from jwacalex/gh_issue_253_disallow_selfsignup_for_shifts
Issue #253 disallow selfsignup for shifts
|
2016-12-13 17:55:26 +01:00 |
|
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 |