183fa7b3a3
Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist
...
doesn't support IPv6
* Fixes WHMCS login for all airtime.pro users
2014-12-01 16:10:03 -05:00
94d9577539
Temporarily disable the Google Tag Manager generation for debugging
2014-12-01 11:34:47 -05:00
432245b18e
SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
...
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
92feacd46f
SAAS-501: Re-jig cloud_storage.conf
2014-11-27 15:50:40 -05:00
8601452c71
Merge conflict
2014-11-27 15:46:39 -05:00
2f9382679a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-27 15:45:26 -05:00
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -05:00
e59cd11370
Close the session when a track is previewed or downloaded.
...
Close the file pointer when we are down with it.
2014-11-27 13:48:34 -05:00
37e358630d
updated translation resources
2014-11-27 14:57:16 +00:00
670a63df87
Error handling for if propel isn't found / composer wasn't run
2014-11-26 18:04:46 -05:00
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -05:00
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
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
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
bec62ec906
SAAS-496: Create a provisioning controller with a terminate endpoint
2014-11-25 16:04:08 -05:00
86ce4673ab
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-25 12:27:50 -05:00
a62e98beb4
Fix logins from WHMCS by disabling CSRF token on login page for trusted
...
origins
2014-11-20 19:33:11 -05:00
df933b57f7
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-20 17:12:52 -05:00
544767a775
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-20 17:11:50 -05:00
8e8fe2d288
SAAS-489: Cannot preview tracks stored on disk
2014-11-20 17:11:23 -05:00
ca7d0688e7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
29fd728d7d
Undo live stream auth action breakage
2014-11-20 14:30:42 -05:00
0890de4cdd
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-20 14:00:12 -05:00
cea3fc5302
Temporarily fix live stream auth (show source)
2014-11-20 13:59:59 -05:00
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
767562922a
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-19 17:09:54 -05:00
766c827094
Removed undefined index from show info array
2014-11-19 16:04:06 -05:00
c627342e28
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-19 15:21:14 -05:00
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
5fdca78041
Scheduler->removeItems optimization
2014-11-19 14:30:18 -05:00
755df62a00
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
34453b5548
Removed setting the directory for cloud files
2014-11-18 10:57:21 -05:00
501b22c48d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 10:32:28 -05:00
3c73abc786
SAAS-491: Edit meta data not working
...
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32:03 -05:00
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
91e7f7053d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 09:16:25 -05:00
2494e66bb0
Merge branch '2.5.x' into saas
2014-11-14 11:56:01 -05:00
1e8df2b027
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-14 10:02:01 -05:00
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
b5575d9953
updated translation resources
2014-11-14 10:53:06 +00:00
9d29b84081
updated translation resources
2014-11-14 10:49:07 +00:00
ee0d89913b
updated translation resources
2014-11-14 09:59:25 +00:00
0a0e7cb8f3
Regenerate the .po files...
2014-11-13 14:31:41 -05:00
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
9e74b26fc4
updated translation resources
2014-11-13 19:07:10 +00:00
0681e80afd
Regenerated the .po files
2014-11-13 13:56:47 -05:00
51274920e1
Cosmetic updates
2014-11-13 10:20:58 -05:00
6b8163748d
Updated styles for csrf elements
2014-11-13 09:46:44 -05:00
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
2eb1fee4a7
fixed po file format
2014-11-13 12:09:06 +03:00
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -05:00
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
c580e8a569
Removed references to show instance description
2014-11-11 19:07:33 -05:00
a4ae1a7842
Translation update, and fixed bad merge in fr_FR
2014-11-11 18:19:49 -05:00
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
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
ca34ad8bdc
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-10 16:08:50 -05:00
769e0e1d82
Fixed 'clear' button not working when files failed to import
2014-11-10 16:07:51 -05:00
4893d087e2
Bug fix
2014-11-10 12:53:07 -05:00
8733788807
Added NOT NULL to cloud_file foreign key field
2014-11-10 10:55:15 -05:00
6b058ade0b
Upgrade script fix
2014-11-10 10:50:15 -05:00
13f6b693d6
Fixed upgrade.sql script
2014-11-10 10:37:01 -05:00
fbdd3f1dc4
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-10 09:59:51 -05:00
3618433792
Add separate pro.po file for Airtime Pro strings
2014-11-10 09:59:37 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
4dab2abf4e
Replaced reoccurring strings with string formatting to aid dynamic translations
2014-11-06 18:40:19 -05:00
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
efd05c4b77
Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes
2014-11-06 18:40:06 -05:00
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
3046003a1b
Removed unnecessary cookie declaration for default locale
2014-11-05 17:27:41 -05:00
3b588dcce8
Removed unnecessary call to set locale data on the Login page
2014-11-05 17:27:08 -05:00
534b56351e
Added styles to completely hide csrf elements on the page; changed tabs to spaces
2014-11-05 17:26:05 -05:00
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -05:00
b94d34f719
Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose
2014-11-05 17:22:13 -05:00
564e8d9311
Replaced hardcoded locale defaults with the station default locale
2014-11-05 17:21:19 -05:00
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
273afaa126
Added Japanese language text files to js i18n datatables
2014-11-05 16:47:09 -05:00
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
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
02be09b5ff
Fixed issue with improper array initialization
2014-11-05 10:15:16 -05:00
e843d96e3f
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-05 10:08:09 -05:00
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
6c27606aa7
updated translation resources
2014-11-05 10:56:11 +00:00
5ea27067e2
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-04 18:39:00 -05:00
0f3c1914e1
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
2014-11-04 18:38:31 -05:00
eef7116142
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
2f16385b53
Fixed upgrades
2014-11-04 13:33:20 -05:00
a67397d0cf
updated translation resources
2014-11-04 16:44:18 +00:00
f147fb34bb
Cloud storage upgrade script
2014-11-03 16:56:25 -05:00
6cda01fba9
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-03 13:15:21 -05:00
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
87d5d3cb02
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-03 13:11:22 -05:00
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -05:00
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
7e1d14fcf2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-11-03 10:31:49 -05:00
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
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
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
e23649173d
Added comments to CcFiles and CloudFile classes.
2014-10-30 12:12:47 -04:00
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
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
c590869311
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-10-29 17:57:25 -04:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
dd5176c209
Merge pull request #76 from RobertElder/saas-relder-cors-localhost
...
Don't throw exceptions for localhost in CORSHelper.
2014-10-29 17:35:25 -04:00
2f96885d65
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-28 13:30:16 -04:00
53c4301024
Wrapped json_encode call in PHP version check
2014-10-28 13:29:35 -04:00
10f3c0a290
Merge branch '2.5.x' into saas
2014-10-28 10:29:42 -04:00
1d3180cc80
CC-5932: Update is_scheduled query is too slow
...
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
64a68c972d
Merge branch '2.5.x' into saas
2014-10-28 10:26:14 -04:00
eae1b4e17c
CC-5932: Update is_scheduled query is too slow
2014-10-28 10:25:40 -04:00
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -04:00
d467714f84
Fixed bug where timezone wasn't adjusting correctly when adding or editing a show
2014-10-27 15:42:30 -04:00
7018f45c0a
Check filesize is greater than zero before deleteing a file from library
2014-10-27 12:39:02 -04:00
a88c0233d6
Don't throw exceptions for localhost in CORSHelper.
2014-10-27 15:07:12 +00:00
7edd993fa3
Reverted pypo's copy file method to how it was without cloud files
...
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
e6b9a71d00
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-10-24 15:12:17 -04:00
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +00:00
70ff67374b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
2014-10-22 17:16:46 -04:00
8134687c24
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-22 17:13:42 -04:00
9726fb80d2
Removed amazon s3 signature from pypo cache file name.
...
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
aec189089a
Merge branch '2.5.x' into saas
2014-10-22 14:46:32 +00:00
f29f30e3ac
Include base_dir in session namespaces.
2014-10-22 14:37:47 +00:00
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
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
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
544d20ebc2
Replaced spaces with dashes in resource_id generation
...
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
a10e287368
Fixed a fresh install bug that wasn't using composer installs.
...
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
f439072422
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-10 11:21:49 -04:00
0196aa21f5
Fixed testcases to account for show image path in and show instance description
2014-10-09 09:39:50 -04:00
736acda14e
updated translation resources
2014-10-09 04:27:12 +00:00
6ade74163d
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-08 18:03:16 -04:00
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -04:00
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
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
5cc93eac3c
Merge pull request #68 from RobertElder/session
...
Regenerate session ids.
2014-10-07 10:10:41 -04:00
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
159ab47857
Merge pull request #69 from RobertElder/tokens
...
Add form tokens to several forms.
2014-10-07 10:05:59 -04:00
e803676d1b
Merge pull request #67 from RobertElder/2.5.x
...
PHP ini settings for cookies.
2014-10-07 10:04:13 -04:00
b861375959
updated translation resources
2014-10-07 13:42:14 +00:00
cf1d65363c
updated translation resources
2014-10-03 05:39:12 +00:00
185d84dc01
Increase the time token is valid for in case of long uploads.
2014-10-03 02:18:04 +00:00
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
78cc43d33d
Regenerate session ids.
2014-09-29 22:48:52 +00:00
f0397bbc59
PHP ini settings for cookies.
2014-09-29 18:22:10 +00:00
ff16cefa62
updated translation resources
2014-09-29 06:43:17 +00:00
1bb17c5614
Blacklist free products from upgrade page
2014-09-23 16:01:28 -04:00
657a47a576
updated translation resources
2014-09-22 02:46:15 +00:00
bc603ddd33
Merge branch '2.5.x' into saas
2014-09-19 15:42:05 -04:00
3c797c044a
Undoing make API on by default for now. This needs to be done in the db
2014-09-19 15:41:55 -04:00
36b908b4d1
Merge branch '2.5.x' into saas
2014-09-19 15:30:16 -04:00
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
a0b40e1f7d
Merge branch '2.5.x' into saas
2014-09-19 15:00:58 -04:00
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
0789de9392
Updated Show services to account for added show instance description field
2014-09-19 13:02:38 -04:00
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -04:00
62c50234ab
Added 2.5.5 upgrades
2014-09-19 12:59:53 -04:00
28d2bdbbec
Updated upgrade functions to have a directory parameter, since __DIR__
2014-09-19 12:58:31 -04:00
0a0c6911f8
Added description field to cc_show_instances table
2014-09-19 12:56:47 -04:00
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -04:00
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
26d875ed66
Added confirmation prompt when deleting current logo
2014-09-19 12:54:03 -04:00
8b20ee459c
Merge branch '2.5.x' into saas
2014-09-19 11:12:49 -04:00
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
1d658867f7
Updated front-end validation to work in FireFox
2014-09-18 17:11:56 -04:00
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
d5f6e8a682
Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile
2014-09-18 16:37:03 -04:00
Albert Santoni
drigato
localizer
Duncan Sommerville
omniton
Albert Santoni
Robert Elder
Robbt