Albert Santoni
|
2d20e58c91
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2014-11-12 17:02:11 -05:00 |
Albert Santoni
|
8eaeaf71f9
|
airtime_analyzer status_reporter shutdown fix
|
2014-11-12 17:01:59 -05:00 |
Albert Santoni
|
aff6104839
|
Disable airtime_analyzer watchdog
|
2014-11-12 16:12:33 -05:00 |
drigato
|
95517cac87
|
Fix exception thrown when the analyzer doesn't return filesize with the metadata
|
2014-11-12 14:45:50 -05:00 |
Duncan Sommerville
|
c580e8a569
|
Removed references to show instance description
|
2014-11-11 19:07:33 -05:00 |
Albert Santoni
|
24cae3b3d6
|
Merge branch 'cc-5709-airtime-analyzer' into saas
|
2014-11-11 18:41:26 -05:00 |
Albert Santoni
|
b324031ee6
|
Disable those new requirements because pip requires gcc to install them
|
2014-11-11 18:41:09 -05:00 |
Albert Santoni
|
a4ae1a7842
|
Translation update, and fixed bad merge in fr_FR
|
2014-11-11 18:19:49 -05:00 |
Albert Santoni
|
024923ba6a
|
Disable SSL verification for SaaS as a temporary workaround
|
2014-11-11 12:18:20 -05:00 |
Albert Santoni
|
5f27e3099a
|
Merge branch 'cc-5709-airtime-analyzer' into saas
|
2014-11-11 11:19:31 -05:00 |
Albert Santoni
|
63b357f0ee
|
Updated requirements for airtime_analyzer to make python-requests
support SNI properly
|
2014-11-11 11:18:55 -05:00 |
Duncan Sommerville
|
ca34ad8bdc
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2014-11-10 16:08:50 -05:00 |
Duncan Sommerville
|
769e0e1d82
|
Fixed 'clear' button not working when files failed to import
|
2014-11-10 16:07:51 -05:00 |
Albert Santoni
|
fbdd3f1dc4
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-11-10 09:59:51 -05:00 |
Albert Santoni
|
3618433792
|
Add separate pro.po file for Airtime Pro strings
|
2014-11-10 09:59:37 -05:00 |
Duncan Sommerville
|
af8c6c2f48
|
Merged 2.5.x into saas
|
2014-11-10 09:08:03 -05:00 |
Duncan Sommerville
|
f6bf2f8cc5
|
Changed tabs to spaces
|
2014-11-07 12:05:29 -05:00 |
Duncan Sommerville
|
4dab2abf4e
|
Replaced reoccurring strings with string formatting to aid dynamic translations
|
2014-11-06 18:40:19 -05:00 |
Duncan Sommerville
|
8fc7178d82
|
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
|
2014-11-06 18:40:19 -05:00 |
Duncan Sommerville
|
efd05c4b77
|
Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes
|
2014-11-06 18:40:06 -05:00 |
Duncan Sommerville
|
795e239ff3
|
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
|
2014-11-06 18:39:48 -05:00 |
Duncan Sommerville
|
62a915f109
|
Added global define for application name
|
2014-11-06 11:57:05 -05:00 |
Duncan Sommerville
|
4d263ce897
|
Merged 2.5.x into saas
|
2014-11-05 17:36:58 -05:00 |
Duncan Sommerville
|
3046003a1b
|
Removed unnecessary cookie declaration for default locale
|
2014-11-05 17:27:41 -05:00 |
Duncan Sommerville
|
3b588dcce8
|
Removed unnecessary call to set locale data on the Login page
|
2014-11-05 17:27:08 -05:00 |
Duncan Sommerville
|
534b56351e
|
Added styles to completely hide csrf elements on the page; changed tabs to spaces
|
2014-11-05 17:26:05 -05:00 |
Duncan Sommerville
|
e5e7942b42
|
Added getUserLocale function to pull locale data into the Login form
|
2014-11-05 17:24:54 -05:00 |
Duncan Sommerville
|
eecd3fa188
|
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
|
2014-11-05 17:24:08 -05:00 |
Duncan Sommerville
|
b94d34f719
|
Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose
|
2014-11-05 17:22:13 -05:00 |
Duncan Sommerville
|
564e8d9311
|
Replaced hardcoded locale defaults with the station default locale
|
2014-11-05 17:21:19 -05:00 |
Duncan Sommerville
|
90626a2fcb
|
Formatting; Changed tabs to spaces
|
2014-11-05 17:04:18 -05:00 |
Duncan Sommerville
|
273afaa126
|
Added Japanese language text files to js i18n datatables
|
2014-11-05 16:47:09 -05:00 |
Duncan Sommerville
|
79548c9e83
|
Changed tabs to spaces and moved apache2 version call to after installation
|
2014-11-05 14:36:19 -05:00 |
Duncan Sommerville
|
bd68ae4f98
|
Changed tabs to spaces and moved apache2 version call to after installation
|
2014-11-05 14:35:19 -05:00 |
Duncan Sommerville
|
02be09b5ff
|
Fixed issue with improper array initialization
|
2014-11-05 10:15:16 -05:00 |
Duncan Sommerville
|
e843d96e3f
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-11-05 10:08:09 -05:00 |
Duncan Sommerville
|
00e85de3c8
|
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
|
2014-11-05 10:06:59 -05:00 |
localizer
|
6c27606aa7
|
updated translation resources
|
2014-11-05 10:56:11 +00:00 |
Duncan Sommerville
|
5ea27067e2
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-11-04 18:39:00 -05:00 |
Duncan Sommerville
|
0f3c1914e1
|
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
|
2014-11-04 18:38:31 -05:00 |
Duncan Sommerville
|
eef7116142
|
Updated i18n to use multiple domains
|
2014-11-04 17:03:52 -05:00 |
Duncan Sommerville
|
5275669211
|
Updated i18n to use multiple domains
|
2014-11-04 17:03:52 -05:00 |
localizer
|
a67397d0cf
|
updated translation resources
|
2014-11-04 16:44:18 +00:00 |
drigato
|
52b0db5ccd
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
|
2014-11-03 10:29:53 -05:00 |
Albert Santoni
|
8616cee9a3
|
Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
|
2014-10-31 15:49:45 -04:00 |
Duncan Sommerville
|
057993eeeb
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2014-10-30 17:43:31 -04:00 |
Duncan Sommerville
|
ef9ab1acf0
|
Merge branch '2.5.x' into saas
|
2014-10-30 17:42:55 -04:00 |
Duncan Sommerville
|
7bc07a91f2
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-10-30 17:41:42 -04:00 |
Duncan Sommerville
|
8f5af6556d
|
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
|
2014-10-30 17:41:00 -04:00 |
drigato
|
54d1bcf81e
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
|
2014-10-30 12:15:41 -04:00 |