Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,871 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

12871 Commits

Author SHA1 Message Date
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
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
Albert Santoni 359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-10-29 18:01:31 -04:00
Albert Santoni ceb51100ec Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-29 17:58:56 -04:00
Albert Santoni c590869311 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-10-29 17:57:25 -04:00
Albert Santoni fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Albert Santoni dd5176c209 Merge pull request #76 from RobertElder/saas-relder-cors-localhost 
Don't throw exceptions for localhost in CORSHelper.
 2014-10-29 17:35:25 -04:00
Duncan Sommerville 2f96885d65 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-28 13:30:16 -04:00
Duncan Sommerville 53c4301024 Wrapped json_encode call in PHP version check 2014-10-28 13:29:35 -04:00
drigato 10f3c0a290 Merge branch '2.5.x' into saas 2014-10-28 10:29:42 -04:00
drigato 1d3180cc80 CC-5932: Update is_scheduled query is too slow 
Forgot to remove some debugging statements
 2014-10-28 10:29:25 -04:00
drigato 64a68c972d Merge branch '2.5.x' into saas 2014-10-28 10:26:14 -04:00
drigato eae1b4e17c CC-5932: Update is_scheduled query is too slow 2014-10-28 10:25:40 -04:00
Duncan Sommerville 1a90184a69 Merging 2.5.x into saas 2014-10-27 16:27:45 -04:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Duncan Sommerville d4e8eed51d Marked old functions for API calls as deprecated 2014-10-27 15:52:58 -04:00
Duncan Sommerville e6cf1c7cb9 Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility 2014-10-27 15:52:14 -04:00
Duncan Sommerville d467714f84 Fixed bug where timezone wasn't adjusting correctly when adding or editing a show 2014-10-27 15:42:30 -04:00
Robert Elder a88c0233d6 Don't throw exceptions for localhost in CORSHelper. 2014-10-27 15:07:12 +00:00