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
5dfadf6ecc
Changed check for image deletion
2014-09-18 16:35:32 -04:00
6c0b94f9bb
Moved validation workaround to Service
2014-09-18 16:34:35 -04:00
5af735654c
Added Airtime255 class in Upgrades
2014-09-18 16:33:01 -04:00
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -04:00
ee92f41a8d
Updated look and feel and added front-end validation for image elements in add-show
2014-09-18 16:28:52 -04:00
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
323f53d6ac
Changed data uri method to return empty string instead of malformed uri when given an incorrect path (oddball case)
2014-09-18 10:34:38 -04:00
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
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
e5e350dfe4
updated translation resources
2014-09-17 23:49:10 +00:00
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
b505f16b8f
Commented out $calendar_info logging
2014-09-17 19:47:05 -04:00
c08252bc99
Added function to convert static image file in stor to data URI for display
2014-09-17 19:45:45 -04:00
c4b38043e8
Removed unnecessary image_path field from showData and ccShow object
2014-09-17 19:43:26 -04:00
b89a764442
Updated to include show image functionality
2014-09-17 19:41:17 -04:00
63d1bf08f7
Merged 2.5.x into saas
2014-09-17 13:30:37 -04:00
0cb6e27306
Language updates
2014-09-17 13:26:51 -04:00
f2eecebeed
Checkout commit
2014-09-17 13:07:18 -04:00
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -04:00
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
b2d81f370a
Merged changes
2014-09-16 18:34:59 -04:00
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
f5a607ad90
Added functionality for deleting saved images when the show is deleted, updating the show image, and returning the showId to be used by ShowController
2014-09-16 18:24:22 -04:00
f73432931c
Updated js functionality for adding shows to POST show image to ShowController on success
2014-09-16 18:22:30 -04:00
f3548ff893
Moved functionality for uploading to RESTful ShowController class
2014-09-16 18:18:26 -04:00
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
1f52c6e093
Removed unnecessary test directory
2014-09-16 18:15:31 -04:00
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
afffd0c876
Added requires for REST controllers to Bootstrap
2014-09-16 18:04:22 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
646c3b34f5
Merge branch '2.5.x' into saas
2014-09-16 16:54:28 -04:00
563fcf0342
Japanese Plupload i18n file
2014-09-16 16:54:20 -04:00
8379862016
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-09-16 16:52:59 -04:00
afa9a27bb9
Japanese Plupload i18n file
2014-09-16 16:51:53 -04:00
66e73cac57
updated translation resources
2014-09-16 00:12:10 +00:00
2a2fcdcf10
More work on show image uploading functionality
2014-09-15 17:14:48 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
ac60a927d4
Merge branch '2.5.x' into saas
2014-09-12 16:31:58 -04:00
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00
e1bb017c9a
updated translation resources
2014-09-12 00:51:07 +00:00
db49ab3c7f
updated translation resources
2014-09-11 09:34:10 +00:00
9e7bffb02a
updated translation resources
2014-09-09 13:14:14 +00:00
662f9d3486
LocaleController path fix
2014-09-08 21:18:57 -04:00
2a96c6ec5b
Merge branch '2.5.x' into saas
2014-09-08 20:49:55 -04:00
f7b6e3379e
Enable Japanese locale
2014-09-08 20:49:08 -04:00
142060d600
Merge remote-tracking branch 'origin/2.5.x' into saas
2014-09-08 20:47:38 -04:00
a21b4f177d
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 13:14:23 -04:00
2670bfae7a
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-09-08 13:12:30 -04:00
6598401266
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 11:48:18 -04:00
fd88fc09aa
updated translation resources
2014-09-08 00:38:12 +00:00
1117984032
updated translation resources
2014-09-05 05:45:12 +00:00
ef46b1facc
Whitelist account.sourcefabric.com for CORS
2014-09-04 19:11:09 -04:00
4c1e6d3fe3
Fixed base URL
...
Conflicts:
airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
f157cad877
Fix silly CAPTCHA flow, now only asks if you get your password wrong 4
...
times in a row
2014-09-03 11:43:06 -04:00
2cc7557cb7
Remove php short tag for better compatibility
2014-08-29 17:10:55 -04:00
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
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
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
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
716cc5a754
Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways.
2014-08-27 18:51:06 -04:00
46f93c2f8e
Merge branch '2.5.x' into saas
2014-08-27 16:54:59 -04:00
6843b528b6
updated translation resources
2014-08-27 01:20:18 +00:00
77ff4ffc3a
Merge branch '2.5.x' into saas
2014-08-26 13:34:09 -04:00
d1971b6d2b
Remove cc_locale table and add Selenium running script
...
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
871ddb47d8
Removed database test that confirms the is_linkable is set to false after a show is un-linked.
...
Since we removed this behaviour from Airtime, and a show can be linked and unlinked as many
times as the user wants, this test is deprecated.
2014-08-25 18:33:41 -04:00
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
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
32e06a7456
Clean up and simplifcation of linked show filling
2014-08-25 18:33:00 -04:00
e3596dfed3
Added comments and removed some unused code
2014-08-25 18:32:41 -04:00
29c07f2438
Removed old comments
2014-08-25 18:32:27 -04:00
d81de5c6eb
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-25 18:32:08 -04:00
57c1e76dc7
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-25 18:31:58 -04:00
08e82cb32e
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-25 18:31:45 -04:00
9a6e617f7c
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-25 18:31:33 -04:00
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
ee52c7692c
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-25 18:30:27 -04:00
afc3d981e8
Commented out unnecessary functions using too much memory
2014-08-25 18:26:46 -04:00
192c4e884f
Bugfix in LocaleController
2014-08-25 18:19:11 -04:00
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
d438587ddc
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/airtime/CcShow.php
airtime_mvc/application/services/SchedulerService.php
airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
80b9bcdfc6
Use SSL with Recaptcha to fix it
2014-08-25 14:45:04 -04:00
0fb9429a9e
Bugfix in LocaleController
2014-08-25 14:18:23 -04:00
55682dc7a9
Bugfix in Airtime 2.5.3 upgrader class
2014-08-25 14:04:25 -04:00
845cabc699
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-08-25 10:09:47 -04:00
fb4699433b
updated translation resources
2014-08-25 02:35:12 +00:00
daaff1e68a
Removed database test that confirms the is_linkable is set to false after a show is un-linked.
...
Since we removed this behaviour from Airtime, and a show can be linked and unlinked as many
times as the user wants, this test is deprecated.
2014-08-21 17:56:00 -04:00
bc63669853
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
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
11de8bd988
Clean up and simplifcation of linked show filling
2014-08-21 13:39:25 -04:00
2a2b4bd05a
Added comments and removed some unused code
2014-10-15 17:11:38 -04:00
8851efaecf
updated translation resources
2014-08-21 14:12:15 +00:00
660b1a0596
Removed old comments
2014-08-21 09:47:54 -04:00
4c03e12ea1
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-20 16:37:44 -04:00
a5704eac6e
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-20 16:35:59 -04:00
4a124a8faf
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-18 19:27:42 -04:00
3fa15913c0
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-18 18:55:03 -04:00
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -04:00
62f8a65573
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-18 13:03:22 -04:00
2cfc20d0c1
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
2014-08-18 12:59:43 -04:00
60f4d112e7
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
f072d60ff1
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
33f397f577
remove memory usage log statements
2014-08-15 16:25:37 -04:00
f863f4dfcf
More mem usage logs
2014-08-15 15:41:00 -04:00
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -04:00
26b210ded9
Commented out unnecessary functions using too much memory
2014-08-15 15:32:52 -04:00
f2929d02f6
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 15:41:55 -04:00
22218079af
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 15:35:58 -04:00
7bd443f668
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 11:09:05 -04:00
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
520387fcad
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
879e776c8d
CC-5888: Handle file deletion if the file is stored in the cloud
2014-08-12 12:32:49 -04:00
46228341b2
Audio preview fix
2014-08-12 11:39:29 -04:00
35c450be3f
Audio preview fix
2014-08-12 11:33:10 -04:00
1d43200041
Syntax error fix
2014-08-01 15:46:08 -04:00
1ab30c26e6
Enforce non-empty passwords when editing user settings
2014-08-01 15:38:35 -04:00
0203be0f10
Revert zend routing changes to fix uploads
2014-08-01 15:30:37 -04:00
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
aa8a26271c
Fix zend routing on Trusty (weird error due to REST module)
2014-08-01 11:51:20 -04:00
02ea553f43
Removed media api delete-success callback because it's no longer in use
2014-07-31 23:21:39 -04:00
dd37ffbdd7
CC-5888: Handle file deletion if the file is stored in the cloud
...
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
3a77931fcd
updated translation resources
2014-07-31 10:12:13 +00:00
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
606560b187
updated translation resources
2014-07-29 09:56:25 +00:00
b7d1852fc0
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-28 16:11:05 -04:00
6fa7ddba9a
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Added delete on cascade for cloud files
2014-07-28 16:03:57 -04:00
f6aa2e5a3b
CC-5896: Store cloud files in separate table, inherited from cc_files
...
For cloud files, return the original filename when downloading a file instead of the cloud object name
2014-07-28 16:02:06 -04:00
ecb072b84c
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
4b4554476a
Error checking if a locale isn't installed
2014-07-28 11:35:19 -04:00
08cc19749b
updated translation resources
2014-07-28 13:38:07 +00:00
46e5625444
updated translation resources
2014-07-28 11:50:20 +00:00
c2deeb5a5f
updated translation resources
2014-07-28 11:17:15 +00:00
a888eb6b00
updated translation resources
2014-07-28 11:02:06 +00:00
f985ff868e
updated translation resources
2014-07-28 10:53:06 +00:00
cec7c86ce4
updated translation resources
2014-07-28 10:42:19 +00:00
e759b8969b
Fix undefined variable
2014-07-25 15:18:17 -04:00
1803e1fd8f
Logging::warning bugfix and updated translations
2014-07-25 15:05:35 -04:00
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
f07e3b65eb
Better error handling if the WHMCS API call for GTM code generation
...
fails
2014-07-24 16:49:03 -04:00
b38f3d7e03
CC-5895: Upgrade Propel to 1.7
...
Add vendor directory to include path
2014-07-23 16:13:55 -04:00
7490c81a8f
CC-5895: Upgrade Propel to 1.7
...
Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
2014-07-23 15:56:23 -04:00
efb2a5ea7d
CC-5895: Upgrade Propel to 1.7
...
Remove propel library from repo
2014-07-23 15:34:00 -04:00
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
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
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
82d7f09382
Small code cleanup
2014-07-16 12:44:09 -04:00
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
1aa99e2896
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-07-15 16:41:29 -04:00
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
9d0f564190
Prevent analyzer from crashing if it is reporting a failure to Airtime
2014-07-11 16:17:13 -04:00
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
e7dfc08128
CC-5892: Handle when a file is downloaded from the Airtime library
2014-07-10 17:59:27 -04:00
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -04:00
0ab1eaa08c
Fix account upgrade invoicing issue
...
* Don't generate upgrade orders if the plan and the billing cycle didn't
change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
2014-07-09 13:49:25 -04:00
20f55314b4
Logging to debug account upgrade, possibly broken by WHMCS update
2014-07-09 12:56:53 -04:00
3c05e14e4d
Fix error when upgrading account
2014-07-09 12:51:12 -04:00
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
2750b6aa0b
Fixed unit tests in saas branch
2014-07-07 15:30:18 -04:00
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
db9d4e3327
htaccess changes to make the saas branch run locally
2014-07-07 15:13:27 -04:00
2b704178ea
Set resource_id and directory to 'cloud' type on PUT request
2014-07-04 16:35:01 -04:00
aeb3bb7aa0
SAAS-447: Cloud Storage
...
Added resource_id column to cc_files table
2014-07-04 16:34:00 -04:00
3c88f66162
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 17:13:06 -04:00
64d3cb7b1b
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 17:12:50 -04:00
63113b4e75
Fix for Chrome radio button disabling
2014-07-03 17:12:33 -04:00
e18a281991
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:53:11 -04:00
e8bc6a3080
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:53:01 -04:00
dea68878f4
Fix for radio button disabling bug in Billing view
2014-07-03 16:51:59 -04:00
20a4323af9
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:49:37 -04:00
a831fbe5b7
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:49:28 -04:00
c551097d57
Default to monthly billing for invalid values
2014-07-03 16:46:25 -04:00
6494db3ccf
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 13:06:14 -04:00
cec2132e5f
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 13:06:04 -04:00
10acbb8ad6
Fix WHMCS login for multiple users again
2014-07-03 13:05:44 -04:00
db73c94f5a
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:39:42 -04:00
1f08f3c482
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 12:39:33 -04:00
6f9c87db3d
WHMCS login bugfix
2014-07-03 12:39:18 -04:00
9c14cfd47c
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:27:01 -04:00
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
585a2859a6
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
2014-07-03 12:26:20 -04:00
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
ac930607ad
Redirect index action to upgrade action
2014-07-03 11:08:54 -04:00
cda812dd73
Trialbox: Don't open My Account in new window
2014-07-02 14:49:11 -04:00
758423a7f7
Billing page fix for customers with multiple stations
2014-07-02 14:47:10 -04:00
Duncan Sommerville
localizer
drigato
Albert Santoni
Albert Santoni
Robert Elder
Robbt