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 |
drigato
|
1eb7d0d7fd
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-09-16 16:55:06 -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 |
Albert Santoni
|
ffeea2619d
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-09-15 16:22:18 -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 |
Holman Romero
|
3e621204f5
|
Switch from GPL to AGPL
|
2014-09-12 16:51:45 +02:00 |
localizer
|
e1bb017c9a
|
updated translation resources
|
2014-09-12 00:51:07 +00: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 |
Albert Santoni
|
e4be7baf54
|
Use test/test as credentials in selenium tests
|
2014-09-05 15:42:58 -04: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 |
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 |
drigato
|
46f93c2f8e
|
Merge branch '2.5.x' into saas
|
2014-08-27 16:54:59 -04:00 |
Albert Santoni
|
8c869914f0
|
One more time!
|
2014-08-27 16:52:06 -04:00 |