drigato
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
drigato
9951abd897
SAAS-1025: Restyle the billing page
...
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
Albert Santoni
d4527a0460
CC-6091: Settings->General doesn't highlight when you click Settings
2015-08-25 13:15:57 -04:00
drigato
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
Duncan Sommerville
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
Duncan Sommerville
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
drigato
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
Albert Santoni
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
Duncan Sommerville
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
drigato
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
drigato
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
drigato
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
drigato
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
Albert Santoni
8dd580e623
Applied context menu restyling globally
2015-08-12 17:47:55 -04:00
Albert Santoni
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
Duncan Sommerville
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
Albert Santoni
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Duncan Sommerville
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
Albert Santoni
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
Albert Santoni
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
Duncan Sommerville
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
Duncan Sommerville
75aef986ea
SAAS-781 - Code review fixes
2015-07-28 11:47:53 -04:00
drigato
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00
Duncan Sommerville
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
Duncan Sommerville
c5e7d6734e
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:03:30 -04:00
Duncan Sommerville
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
Duncan Sommerville
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
Duncan Sommerville
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
Duncan Sommerville
5cb396e512
SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null)
2015-07-06 18:03:44 -04:00
Duncan Sommerville
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
Duncan Sommerville
5fe70754bd
Replace all timestamp strings with constant
2015-06-26 14:42:52 -04:00
Duncan Sommerville
9d60a3d130
Move Help Translate Airtime link to help menu
2015-06-26 14:27:27 -04:00
Duncan Sommerville
7e0b6ac7ba
Add transifex link constant
2015-06-26 13:28:05 -04:00
Duncan Sommerville
c44bae8140
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
Duncan Sommerville
d91b05a0ae
SoundCloud - Add release_year metadata field and set default sharing and license types
2015-06-25 10:53:35 -04:00
Duncan Sommerville
8fcaf7fc74
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Albert Santoni
d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
Duncan Sommerville
f26559c0c6
Fix permissions for SoundCloud functionality
2015-06-24 14:48:38 -04:00
Duncan Sommerville
7645f67515
SAAS-877 - Update live-info-v2 api
2015-06-24 12:18:52 -04:00
Duncan Sommerville
4c797cf100
Update installer to work with saas branch
2015-06-23 19:02:55 -04:00
Albert Santoni
19adb062cf
SAAS-879 and add FAQ to Help menu
...
* SAAS-879: When trying to save changes in the user setting pages
changes do not save and goes to a "an error hass occured page"
2015-06-19 14:22:58 -04:00
Duncan Sommerville
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
Duncan Sommerville
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
Duncan Sommerville
706d7db2b2
Merge branch 'saas-dev' into soundcloud
2015-06-15 11:03:37 -04:00
Albert Santoni
f4ff00355d
Added Radio Page link
2015-06-12 17:21:46 -04:00
Albert Santoni
7c6f15984d
Small consistency changes for the embeddable widgets
2015-06-10 18:02:25 -04:00
Duncan Sommerville
8163608666
Merge branch 'saas-dev' into soundcloud
2015-06-10 16:25:30 -04:00
Duncan Sommerville
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
drigato
d1ac78be68
Fix for station logo....again...
2015-06-10 16:01:16 -04:00
Duncan Sommerville
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
Albert Santoni
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
drigato
8e8f8aa55b
Radio Page Code Review Changes
...
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -04:00
drigato
6528a9b0a3
SAAS-843: Create Embeddable Schedule Widget View
...
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
Duncan Sommerville
63b726e6b2
SAAS-848 - Modify SoundCloud code to use external redirect
2015-06-04 11:38:46 -04:00
Duncan Sommerville
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
Albert Santoni
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
drigato
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
drigato
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
Duncan Sommerville
fc36ff5797
Updated user manual constant to new manual url
2015-04-30 14:51:35 -04:00
Duncan Sommerville
59b90360a1
SAAS-755 - Updated User Manual link
2015-04-30 11:52:23 -04:00
Albert Santoni
1515984664
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:23:40 -04:00
Albert Santoni
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
drigato
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
drigato
57cd2eda13
bad merge
2015-03-31 18:21:25 -04:00
drigato
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
Duncan Sommerville
669d980565
Fixed conf.php
2015-03-25 17:35:43 -04:00
Duncan Sommerville
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
Albert Santoni
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
drigato
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
drigato
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
drigato
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
Albert Santoni
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
Albert Santoni
73cb14155c
Replace the version hashing with git revision hashing to fix browser
...
caching
2015-02-19 10:01:09 -05:00
Albert Santoni
08c53a9292
Fixed incorrect authorization for ShowImage API
2015-02-18 18:34:52 -05:00
drigato
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
Albert Santoni
d46f4a52eb
Installer tweaks and a pypo bugfix
...
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
Albert Santoni
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
Albert Santoni
2a9790adf3
Backport ACL REST permission fix
2015-02-06 16:05:51 -05:00
drigato
cee0ff4881
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
2015-02-05 14:31:20 -05:00
drigato
e2ff452b8a
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
2015-02-05 10:15:48 -05:00
Duncan Sommerville
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
drigato
c6fc184559
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-04 13:36:35 -05:00
drigato
7b3f9af04c
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
2015-02-03 15:55:47 -05:00
Albert Santoni
f69e5afbff
SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file
2015-02-02 14:42:20 -05:00
drigato
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
drigato
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
drigato
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
Albert Santoni
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
drigato
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
Duncan Sommerville
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
Duncan Sommerville
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
Albert Santoni
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
Duncan Sommerville
36c889a3a2
Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer
2015-01-15 17:34:33 -05:00
Duncan Sommerville
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
Albert Santoni
11acca32f9
Update comment at the top of conf.php to reflect config file
...
amalgamation
2015-01-15 15:36:22 -05:00
Albert Santoni
ee9163fa8e
2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
...
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
Daniel James
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
Duncan Sommerville
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
Duncan Sommerville
df2576e5a0
Updated installer to better accommodate running over existing installs
2015-01-14 16:11:49 -05:00
drigato
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
Duncan Sommerville
1ddda846d6
Updates to running background services as web user
2015-01-08 18:52:58 -05:00
Duncan Sommerville
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
Duncan Sommerville
9c324c1b6f
Updated configuration checklist
2014-12-19 11:58:47 -05:00
Duncan Sommerville
32f40f3dc8
Updated configuration checklist to include running services
2014-12-19 11:44:23 -05:00
Albert Santoni
a0f5e33855
Added "Help Center" link to Help menu for Josh
2014-12-17 16:10:04 -05:00
drigato
ec1c8669c8
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-17 14:14:03 -05:00
drigato
1de326283e
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Not quite done.
2014-12-16 18:47:42 -05:00
Duncan Sommerville
4043ebfd25
More work on monitless installer
2014-12-16 16:26:58 -05:00
drigato
ff0a685243
Updated propel models
2014-12-16 14:20:28 -05:00
Duncan Sommerville
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
drigato
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -05:00
Duncan Sommerville
8f99595f54
Added button to redirect to login page from config-check page on success
2014-12-15 09:49:00 -05:00
drigato
891cfdb48e
SAAS-517: Create Provisioning controller with a terminate endpoint
2014-12-11 13:35:34 -05:00
Duncan Sommerville
f5b4928538
More work on web installer
2014-12-09 17:48:16 -05:00
Duncan Sommerville
9fed113f74
More work on setup/installation process
2014-12-03 18:04:47 -05:00
drigato
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
bf91677f91
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
...
Fixed reading credentials in from cloud_storage.conf
2014-12-02 09:06:28 -05:00
drigato
7c0a25be7f
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
2014-12-01 21:05:46 -05:00
Duncan Sommerville
acaf47c592
More work on web setup form
2014-12-01 15:49:53 -05:00
Duncan Sommerville
8f46b4dca7
More work on new installer
2014-11-28 15:30:11 -05:00
drigato
8601452c71
Merge conflict
2014-11-27 15:46:39 -05:00
Albert Santoni
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -05:00
drigato
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
drigato
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
drigato
bec62ec906
SAAS-496: Create a provisioning controller with a terminate endpoint
2014-11-25 16:04:08 -05:00
drigato
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
drigato
10db978a2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 16:30:50 -05:00
drigato
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
Duncan Sommerville
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
Duncan Sommerville
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
Duncan Sommerville
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
drigato
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
drigato
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
drigato
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
drigato
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
Duncan Sommerville
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
drigato
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
drigato
0ccc7e7dc9
SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
...
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
Albert Santoni
0203be0f10
Revert zend routing changes to fix uploads
2014-08-01 15:30:37 -04:00
Albert Santoni
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
Albert Santoni
aa8a26271c
Fix zend routing on Trusty (weird error due to REST module)
2014-08-01 11:51:20 -04:00
drigato
41ff0cce67
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
2014-07-23 15:22:42 -04:00
drigato
72841de714
CC-5895: Upgrade Propel to 1.7
...
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
2014-07-23 15:03:51 -04:00
drigato
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
drigato
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
Albert Santoni
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
drigato
25e4036d2f
typo
2014-06-20 17:29:56 -04:00