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

6539 commits

Author SHA1 Message Date
Duncan Sommerville
6b8163748d Updated styles for csrf elements 2014-11-13 09:46:44 -05:00
drigato
7d86ea3115 Better error handling on media PUT request 2014-11-13 09:41:46 -05:00
drigato
2827db8ba3 Fix bad merge 2014-11-13 09:05:02 -05:00
omniton
2eb1fee4a7 fixed po file format 2014-11-13 12:09:06 +03:00
Albert Santoni
864352c6a7 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
 2014-11-12 17:04:00 -05:00
drigato
97b74a0997 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2014-11-12 15:08:35 -05:00
drigato
f1fa4929ae Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-11-12 14:51:18 -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
drigato
c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
Duncan Sommerville
c580e8a569 Removed references to show instance description 2014-11-11 19:07:33 -05:00
Albert Santoni
a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
drigato
10db978a2b Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-11 16:30:50 -05:00
drigato
5cf5ff4fa1 code cleanup 2014-11-11 16:29:54 -05:00
drigato
b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
Duncan Sommerville
785651ec4b Merged 2.5.x into 2.5.x-installer 2014-11-10 17:15:41 -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
drigato
4893d087e2 Bug fix 2014-11-10 12:53:07 -05:00
drigato
8733788807 Added NOT NULL to cloud_file foreign key field 2014-11-10 10:55:15 -05:00
drigato
6b058ade0b Upgrade script fix 2014-11-10 10:50:15 -05:00
drigato
13f6b693d6 Fixed upgrade.sql script 2014-11-10 10:37:01 -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
drigato
4b10e024da Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-07 12:35:23 -05:00
Duncan Sommerville
f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
drigato
1dc72d5ebe Changed Amazon S3 download URL format so it works with S3_EU_WEST region. 
Updated amazon config file path in the downloader class
 2014-11-07 11:51:11 -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
drigato
e24b4f43fd Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it. 
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
 2014-11-05 16:25:11 -05:00
drigato
6adb33e89b Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it. 
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
 2014-11-05 16:24:03 -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