drigato 9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer ...

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php

2014-08-28 11:59:41 -04:00

..

common

CC-5627 : Check all Application_Common_DateHelper calculations that use

2013-12-12 13:28:51 -05:00

configs

Remove database credentials from application.ini

2014-05-02 15:50:37 -04:00

controllers

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-08-28 11:59:41 -04:00

forms

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-08-28 11:59:41 -04:00

layouts/scripts

CC-5833: Update airtime demo w/o o.p.s.

2014-06-06 17:12:55 -04:00

logging

CC-5062:

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

models

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-08-28 11:59:41 -04:00

modules/rest

Fix error due to bad exception throwing

2014-06-11 13:35:10 -04:00

services

Removed unused code.

2014-08-25 18:33:29 -04:00

validate

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

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

views

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-06-09 11:36:51 -04:00

Bootstrap.php

Merge branch '2.5.x' into cc-5709-airtime-analyzer

2014-08-28 11:59:41 -04:00