Commit graph

12732 commits

Author SHA1 Message Date
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
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
0c538ff1ae Added chown call to properly permission stor directory 2014-09-17 13:21:08 -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
4e545dfe9f Commented out monit config lines to fix install error 2014-09-16 18:20:11 -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
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
Duncan Sommerville
5af80fcfe3 Updated Ubuntu airtime-full-install to fix apache version issue 2014-09-11 12:48:15 -04:00
localizer
db49ab3c7f updated translation resources 2014-09-11 09:34:10 +00:00
localizer
9e7bffb02a updated translation resources 2014-09-09 13:14:14 +00:00
Albert Santoni
cc3ddb40ea test/test credentials for Selenium tests 2014-09-08 21:23:57 -04:00
Albert Santoni
662f9d3486 LocaleController path fix 2014-09-08 21:18:57 -04:00
Albert Santoni
2a96c6ec5b Merge branch '2.5.x' into saas 2014-09-08 20:49:55 -04:00
Albert Santoni
f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
Albert Santoni
142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
drigato
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
drigato
2670bfae7a Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-09-08 13:12:30 -04:00
drigato
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
localizer
fd88fc09aa updated translation resources 2014-09-08 00:38:12 +00:00
localizer
1117984032 updated translation resources 2014-09-05 05:45:12 +00:00
Albert Santoni
ef46b1facc Whitelist account.sourcefabric.com for CORS 2014-09-04 19:11:09 -04:00
Albert Santoni
4c1e6d3fe3 Fixed base URL
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
Albert Santoni
ec0d0375cf Blacklist Livechat domain in Selenium tests to prevent timeouts 2014-09-03 12:14:06 -04:00