Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13326 commits 3 branches 0 tags 405 MiB
Commit graph

4508 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
drigato
2cc7557cb7 Remove php short tag for better compatibility 2014-08-29 17:10:55 -04:00
drigato
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
drigato
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
drigato
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
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
Albert Santoni
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
Albert Santoni
77ff4ffc3a Merge branch '2.5.x' into saas 2014-08-26 13:34:09 -04:00
Albert Santoni
d1971b6d2b Remove cc_locale table and add Selenium running script 
* Fixes CC-5906
 2014-08-26 13:32:35 -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
Albert Santoni
32e06a7456 Clean up and simplifcation of linked show filling 2014-08-25 18:33:00 -04:00
drigato
e3596dfed3 Added comments and removed some unused code 2014-08-25 18:32:41 -04:00
drigato
29c07f2438 Removed old comments 2014-08-25 18:32:27 -04:00