Mike Koch f53065f7f6 Merge branch '3-3-0' into '357-calendar-planning-phase-two' ...

# Conflicts:
#   api/BusinessLogic/Security/UserContext.php
#   api/BusinessLogic/Security/UserPrivilege.php
#   api/index.php
#   language/en/text.php

2018-01-29 01:46:16 +00:00

..

admin

Finish up securing API endpoints

2016-05-02 16:48:39 -04:00

BusinessLogic

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

2018-01-29 01:46:16 +00:00

Controllers

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

2018-01-29 01:46:16 +00:00

Core

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

2018-01-29 01:46:16 +00:00

DataAccess

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

2018-01-29 01:46:16 +00:00

priority

Update array instantiation syntax to support PHP 5.3.X

2016-06-25 21:51:42 -04:00

status

More API improvements

2015-11-28 22:25:51 -05:00

Tests

Fix tests

2017-09-26 21:19:17 -04:00

ticket

Getting started on new ticket validator

2017-01-11 21:55:22 -05:00

autoload.php

Service messages page can now retrieve service messages via AJAX

2017-11-12 22:22:28 -05:00

BaseClass.php

Add a BaseClass/BaseException for 5.4 compatibility

2017-09-11 21:03:03 -04:00

BaseException.php

Add a BaseClass/BaseException for 5.4 compatibility

2017-09-11 21:03:03 -04:00

bootstrap.php

Working on TicketCreator tests

2017-02-05 22:12:18 -05:00

common_api_doc.php

Fix some API doc stuff

2016-07-21 22:17:06 -04:00

composer.json

Going to use rrule.js instead

2018-01-19 22:17:15 -05:00

composer.lock

Going to use rrule.js instead

2018-01-19 22:17:15 -05:00

htaccess.txt

Add a URL rewrite setting for the API. Not using it in code yet... might not even do that lol

2017-06-24 16:04:19 -04:00

http_response_code.php

Added proper DI and autoloading to make things simpler for the actual logic'

2017-01-28 01:28:53 -05:00

index.php

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

2018-01-29 01:46:16 +00:00

Link.php

Modify link to handle servers with odd configurations

2017-11-07 21:48:38 -05:00

RequestMethod.php

Fix a syntax error in PHP 5.5

2017-09-11 12:55:56 -04:00