Robert Elder
f29f30e3ac
Include base_dir in session namespaces.
2014-10-22 14:37:47 +00: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
drigato
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
drigato
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
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
Albert Santoni
f439072422
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-10 11:21:49 -04:00
Duncan Sommerville
0196aa21f5
Fixed testcases to account for show image path in and show instance description
2014-10-09 09:39:50 -04:00
localizer
736acda14e
updated translation resources
2014-10-09 04:27:12 +00:00
Duncan Sommerville
6ade74163d
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-08 18:03:16 -04:00
Duncan Sommerville
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -04: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
5cc93eac3c
Merge pull request #68 from RobertElder/session
...
Regenerate session ids.
2014-10-07 10:10:41 -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
dpsommer
e803676d1b
Merge pull request #67 from RobertElder/2.5.x
...
PHP ini settings for cookies.
2014-10-07 10:04:13 -04:00
localizer
b861375959
updated translation resources
2014-10-07 13:42:14 +00:00
localizer
cf1d65363c
updated translation resources
2014-10-03 05:39:12 +00:00
Robert Elder
185d84dc01
Increase the time token is valid for in case of long uploads.
2014-10-03 02:18:04 +00:00
Robert Elder
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
Robert Elder
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
Robert Elder
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
Robert Elder
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
Robert Elder
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
Robert Elder
78cc43d33d
Regenerate session ids.
2014-09-29 22:48:52 +00:00
Robert Elder
f0397bbc59
PHP ini settings for cookies.
2014-09-29 18:22:10 +00:00
localizer
ff16cefa62
updated translation resources
2014-09-29 06:43:17 +00:00
Albert Santoni
1bb17c5614
Blacklist free products from upgrade page
2014-09-23 16:01:28 -04:00
localizer
657a47a576
updated translation resources
2014-09-22 02:46:15 +00:00
drigato
bc603ddd33
Merge branch '2.5.x' into saas
2014-09-19 15:42:05 -04:00
drigato
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
drigato
36b908b4d1
Merge branch '2.5.x' into saas
2014-09-19 15:30:16 -04:00
drigato
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
drigato
a0b40e1f7d
Merge branch '2.5.x' into saas
2014-09-19 15:00:58 -04:00
drigato
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
Duncan Sommerville
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
Duncan Sommerville
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
Duncan Sommerville
0789de9392
Updated Show services to account for added show instance description field
2014-09-19 13:02:38 -04:00
Duncan Sommerville
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -04:00
Duncan Sommerville
62c50234ab
Added 2.5.5 upgrades
2014-09-19 12:59:53 -04:00
Duncan Sommerville
28d2bdbbec
Updated upgrade functions to have a directory parameter, since __DIR__
2014-09-19 12:58:31 -04:00
Duncan Sommerville
0a0c6911f8
Added description field to cc_show_instances table
2014-09-19 12:56:47 -04:00
Duncan Sommerville
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -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
drigato
8b20ee459c
Merge branch '2.5.x' into saas
2014-09-19 11:12:49 -04:00
Duncan Sommerville
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
Duncan Sommerville
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
Duncan Sommerville
1d658867f7
Updated front-end validation to work in FireFox
2014-09-18 17:11:56 -04:00
Duncan Sommerville
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
Duncan Sommerville
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
Duncan Sommerville
5dfadf6ecc
Changed check for image deletion
2014-09-18 16:35:32 -04:00
Duncan Sommerville
6c0b94f9bb
Moved validation workaround to Service
2014-09-18 16:34:35 -04:00
Duncan Sommerville
5af735654c
Added Airtime255 class in Upgrades
2014-09-18 16:33:01 -04:00
Duncan Sommerville
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
Duncan Sommerville
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -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
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
Duncan Sommerville
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
Duncan Sommerville
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
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
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
Duncan Sommerville
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
localizer
e5e350dfe4
updated translation resources
2014-09-17 23:49:10 +00:00
Duncan Sommerville
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
Duncan Sommerville
b505f16b8f
Commented out $calendar_info logging
2014-09-17 19:47:05 -04:00
Duncan Sommerville
c08252bc99
Added function to convert static image file in stor to data URI for display
2014-09-17 19:45:45 -04:00
Duncan Sommerville
c4b38043e8
Removed unnecessary image_path field from showData and ccShow object
2014-09-17 19:43:26 -04:00
Duncan Sommerville
b89a764442
Updated to include show image functionality
2014-09-17 19:41:17 -04:00
Duncan Sommerville
63d1bf08f7
Merged 2.5.x into saas
2014-09-17 13:30:37 -04:00
Duncan Sommerville
0cb6e27306
Language updates
2014-09-17 13:26:51 -04:00
Duncan Sommerville
f2eecebeed
Checkout commit
2014-09-17 13:07:18 -04:00
Duncan Sommerville
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
Duncan Sommerville
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
Duncan Sommerville
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -04:00
Duncan Sommerville
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
Duncan Sommerville
b2d81f370a
Merged changes
2014-09-16 18:34:59 -04:00
Duncan Sommerville
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
Duncan Sommerville
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
Duncan Sommerville
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
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
f3548ff893
Moved functionality for uploading to RESTful ShowController class
2014-09-16 18:18:26 -04:00
Duncan Sommerville
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
Duncan Sommerville
1f52c6e093
Removed unnecessary test directory
2014-09-16 18:15:31 -04:00
Duncan Sommerville
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
Duncan Sommerville
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
Duncan Sommerville
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
Duncan Sommerville
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
Duncan Sommerville
afffd0c876
Added requires for REST controllers to Bootstrap
2014-09-16 18:04:22 -04:00
Duncan Sommerville
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
drigato
646c3b34f5
Merge branch '2.5.x' into saas
2014-09-16 16:54:28 -04:00
drigato
563fcf0342
Japanese Plupload i18n file
2014-09-16 16:54:20 -04:00
drigato
8379862016
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-09-16 16:52:59 -04:00
drigato
afa9a27bb9
Japanese Plupload i18n file
2014-09-16 16:51:53 -04:00
localizer
66e73cac57
updated translation resources
2014-09-16 00:12:10 +00:00
Duncan Sommerville
2a2fcdcf10
More work on show image uploading functionality
2014-09-15 17:14:48 -04:00
Duncan Sommerville
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
drigato
ac60a927d4
Merge branch '2.5.x' into saas
2014-09-12 16:31:58 -04:00
drigato
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00