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
Albert Santoni
f40357f972
Added missing git config stuff
2014-08-27 16:51:37 -04:00
Albert Santoni
c1843f9d6b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-08-27 16:47:26 -04:00
Albert Santoni
2ac3633f69
3-way git merge driver for PO files and development bootstrapping script (the start of it anyways)
2014-08-27 16:43:54 -04:00
localizer
6843b528b6
updated translation resources
2014-08-27 01:20:18 +00: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
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
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
drigato
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
drigato
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