drigato
|
f08535cc10
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
airtime_mvc/application/Bootstrap.php
|
2014-11-26 10:35:48 -05:00 |
Albert Santoni
|
7db571d103
|
Remove clearAction from the media REST API for security
|
2014-11-20 16:47:02 -05:00 |
|
Albert Santoni
|
8ffd70781b
|
Remove clearAction from the media REST API for security
|
2014-11-20 16:46:21 -05:00 |
|
drigato
|
00fbda193e
|
Schedule->removeItems optimization fix for deleting the current playing track
|
2014-11-20 09:57:37 -05:00 |
|
drigato
|
48ae8ac69c
|
Scheduler->removeItems optimization
|
2014-11-19 15:13:33 -05:00 |
|
Albert Santoni
|
12550112fd
|
Remove base URL from selenium tests to make the Selenium IDE happy
|
2014-11-19 11:28:03 -05:00 |
|
Albert Santoni
|
c829b6bf95
|
Fix bad merge
|
2014-11-18 18:17:19 -05:00 |
|
Albert Santoni
|
dd3b54f8ed
|
Actually delete files from the database via the media REST API
|
2014-11-18 18:15:45 -05:00 |
|
Albert Santoni
|
11a31375df
|
Slightly more robust fix for the last issue
|
2014-11-18 17:41:44 -05:00 |
Duncan Sommerville
|
6460854fda
|
Fixed 'clear' button not working when files failed to import
|
2014-11-18 17:13:48 -05:00 |
|
Albert Santoni
|
e7e1926896
|
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
sometimes
|
2014-11-18 17:11:09 -05:00 |
|
Albert Santoni
|
32bdbe1ad6
|
Improved some comments
|
2014-11-14 11:12:10 -05:00 |
localizer
|
b5575d9953
|
updated translation resources
|
2014-11-14 10:53:06 +00:00 |
|
localizer
|
9d29b84081
|
updated translation resources
|
2014-11-14 10:49:07 +00:00 |
|
localizer
|
ee0d89913b
|
updated translation resources
|
2014-11-14 09:59:25 +00:00 |
|
Albert Santoni
|
0a0e7cb8f3
|
Regenerate the .po files...
|
2014-11-13 14:31:41 -05:00 |
|
localizer
|
9e74b26fc4
|
updated translation resources
|
2014-11-13 19:07:10 +00:00 |
|
Albert Santoni
|
0681e80afd
|
Regenerated the .po files
|
2014-11-13 13:56:47 -05:00 |
|
Albert Santoni
|
71f2cc11d2
|
Fix for incorrect watchdog disabling
|
2014-11-12 17:04:21 -05:00 |
|
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 |
|
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
|
b324031ee6
|
Disable those new requirements because pip requires gcc to install them
|
2014-11-11 18:41:09 -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
|
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
|
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
|
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 |
|
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
|
7bc07a91f2
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-10-30 17:41:42 -04:00 |