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
Albert Santoni
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
Duncan Sommerville
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9
Hide Now Playing toolbar for Guest users
2015-01-21 15:15:22 -05:00
Duncan Sommerville
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
drigato
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
Albert Santoni
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -05:00
Albert Santoni
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
Albert Santoni
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
Duncan Sommerville
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
Albert Santoni
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
Albert Santoni
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
drigato
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
drigato
b094e59df3
SAAS-526: Change prefix from station name to station id
...
Just seeing if we can get the hosting id from a function in the Billing Controller
2014-12-17 15:39:18 -05:00
Albert Santoni
ad56d6cafb
Show the plan and station URL in Live Chat
2014-12-11 17:40:34 -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
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
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
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
Duncan Sommerville
6b8163748d
Updated styles for csrf elements
2014-11-13 09:46:44 -05:00
Duncan Sommerville
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
Duncan Sommerville
4dab2abf4e
Replaced reoccurring strings with string formatting to aid dynamic translations
2014-11-06 18:40:19 -05:00
Duncan Sommerville
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
Duncan Sommerville
3046003a1b
Removed unnecessary cookie declaration for default locale
2014-11-05 17:27:41 -05:00
Duncan Sommerville
3b588dcce8
Removed unnecessary call to set locale data on the Login page
2014-11-05 17:27:08 -05:00
Duncan Sommerville
534b56351e
Added styles to completely hide csrf elements on the page; changed tabs to spaces
2014-11-05 17:26:05 -05:00
Duncan Sommerville
273afaa126
Added Japanese language text files to js i18n datatables
2014-11-05 16:47:09 -05:00
Duncan Sommerville
00e85de3c8
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
2014-11-05 10:06:59 -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
7e1d14fcf2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-11-03 10:31:49 -05:00
drigato
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
Albert Santoni
8616cee9a3
Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade
...
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
2014-10-31 15:49:45 -04:00
drigato
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
drigato
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
Albert Santoni
359727fc66
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-10-29 18:01:31 -04:00
Albert Santoni
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
Albert Santoni
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
Duncan Sommerville
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
Duncan Sommerville
d467714f84
Fixed bug where timezone wasn't adjusting correctly when adding or editing a show
2014-10-27 15:42:30 -04:00
Robert Elder
e1b2c51130
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues.
2014-10-21 20:15:05 +00:00
drigato
f775bedb49
Stopped returning filesize in delete functions.
...
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
2014-10-21 16:05:50 -04:00
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
drigato
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
drigato
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
dpsommer
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
dpsommer
159ab47857
Merge pull request #69 from RobertElder/tokens
...
Add form tokens to several forms.
2014-10-07 10:05:59 -04:00
Robert Elder
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
Robert Elder
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
Robert Elder
f0397bbc59
PHP ini settings for cookies.
2014-09-29 18:22:10 +00:00
Duncan Sommerville
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
Duncan Sommerville
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
Duncan Sommerville
26d875ed66
Added confirmation prompt when deleting current logo
2014-09-19 12:54:03 -04:00
Duncan Sommerville
1d658867f7
Updated front-end validation to work in FireFox
2014-09-18 17:11:56 -04:00
Duncan Sommerville
ee92f41a8d
Updated look and feel and added front-end validation for image elements in add-show
2014-09-18 16:28:52 -04:00
Duncan Sommerville
096556fa74
Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded
2014-09-18 10:32:56 -04:00
Duncan Sommerville
b89a764442
Updated to include show image functionality
2014-09-17 19:41:17 -04:00
Duncan Sommerville
f73432931c
Updated js functionality for adding shows to POST show image to ShowController on success
2014-09-16 18:22:30 -04:00
Duncan Sommerville
1f52c6e093
Removed unnecessary test directory
2014-09-16 18:15:31 -04:00
Duncan Sommerville
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
drigato
563fcf0342
Japanese Plupload i18n file
2014-09-16 16:54:20 -04:00
drigato
afa9a27bb9
Japanese Plupload i18n file
2014-09-16 16:51:53 -04:00
Duncan Sommerville
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
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
drigato
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
drigato
10cb5484fe
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
drigato
bc63669853
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
drigato
6249deb1ac
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
drigato
b38f3d7e03
CC-5895: Upgrade Propel to 1.7
...
Add vendor directory to include path
2014-07-23 16:13:55 -04:00
Albert Santoni
db9d4e3327
htaccess changes to make the saas branch run locally
2014-07-07 15:13:27 -04:00
Albert Santoni
14113f7e60
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 12:26:45 -04:00
Albert Santoni
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
Albert Santoni
2794ca1355
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
Albert Santoni
9de92a87a4
Refactored the upgrade process for Airtime Pro
2014-07-01 13:36:09 -04:00
Albert Santoni
f1610485c3
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-26 17:45:48 -04:00
Albert Santoni
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
Albert Santoni
51b7fe9adf
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-25 20:33:10 -04:00
Albert Santoni
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
Albert Santoni
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
Albert Santoni
338fd06f81
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -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
Albert Santoni
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
drigato
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
Albert Santoni
18e7707d8f
Trying to fix my commit again
2014-06-20 18:10:59 -04:00
Albert Santoni
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
Albert Santoni
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
Albert Santoni
51d930cd84
Make Live Chat not block the Add Media pagination buttons
2014-06-04 13:47:27 -04:00
Albert Santoni
397dfb6525
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-20 17:43:54 -04:00
Albert Santoni
08badfb421
SAAS-436: Fix widgets
2014-05-20 17:43:06 -04:00
Albert Santoni
1c33da948e
Removed per-instance application.ini customizations
2014-05-02 16:14:06 -04:00
Albert Santoni
325310f681
CC-5818: Fix Live Chat on Airtime Pro (2.5.3)
2014-04-28 11:23:59 -04:00
Albert Santoni
446eca057c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
airtime_mvc/locale/template/airtime.po
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Naomi
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
drigato
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -04:00
drigato
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
drigato
47215eb541
CC-5781: Upgrade script for new storage quota implementation
...
Removing scripts from public folder (was only there for testing)
2014-04-09 15:04:15 -04:00
drigato
661ab7f647
CC-5781: Upgrade script for new storage quota implementation
...
Copied upgrade files to public folder.
Seeing if we can execute the scripts with a URL
2014-04-09 12:32:20 -04:00
Albert Santoni
afc7df8469
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 16:41:25 -04:00
Albert Santoni
19f231bd11
CC-5709: Airtime Analyzer
...
* Add Media page CSS file that I forgot to commit ages ago
2014-04-01 16:40:54 -04:00