drigato 89925e52ed Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas ...

Conflicts:
	python_apps/pypo/pypofile.py

2014-12-08 15:34:30 -05:00

..

cloud_storage

SAAS-510: PYPO -> Files are downloaded even if they already exist in tmp cache dir

2014-12-08 13:21:24 -05:00

common

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

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

configs

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

2014-12-03 13:35:32 -05:00

controllers

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

2014-12-03 13:35:32 -05:00

forms

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

2014-11-26 10:35:48 -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 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

2014-12-08 15:34:30 -05:00

modules/rest

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

2014-12-03 13:35:32 -05:00

services

Merged 2.5.x into saas

2014-11-05 17:36:58 -05:00

upgrade

Fixed upgrades

2014-11-04 13:33:20 -05: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-11-26 10:35:48 -05:00

Bootstrap.php

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

2014-12-03 13:35:32 -05:00