Albert Santoni f0bad70cee Merge branch '2.5.x' into saas-pullreq77 ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php

2015-01-09 13:10:54 -05:00

..

common

Merge branch '2.5.x' into saas-pullreq77

2015-01-09 13:10:54 -05:00

configs

Added "Help Center" link to Help menu for Josh

2014-12-17 16:10:04 -05:00

controllers

Merge branch '2.5.x' into saas-pullreq77

2015-01-09 13:10:54 -05:00

forms

Fix logins from WHMCS by disabling CSRF token on login page for trusted

2014-11-20 19:33:11 -05:00

layouts/scripts

Merged 2.5.x into saas

2014-11-10 09:08:03 -05:00

logging

CC-5062:

2013-04-19 20:11:33 -04:00

models

Merge branch '2.5.x' into saas-pullreq77

2015-01-09 13:10:54 -05:00

modules/rest

Merge branch 'cc-5709-airtime-analyzer' into saas

2014-11-20 16:47:35 -05:00

services

Merge branch '2.5.x' into saas-pullreq77

2015-01-09 13:10:54 -05:00

upgrade

Updated upgrade functions to have a directory parameter, since __DIR__

2014-09-19 12:58:31 -04:00

validate

Fix SAAS-349 by preventing password changes in demo mode.

2013-09-26 16:23:22 -04:00

views

Merged 2.5.x into saas

2014-11-10 09:08:03 -05:00

Bootstrap.php

Merge branch '2.5.x' into saas-pullreq77

2015-01-09 13:10:54 -05:00