Albert Santoni
|
0890de4cdd
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-11-20 14:00:12 -05:00 |
|
Albert Santoni
|
cea3fc5302
|
Temporarily fix live stream auth (show source)
|
2014-11-20 13:59:59 -05:00 |
drigato
|
767562922a
|
Schedule->removeItems optimization fix for deleting the current playing track
|
2014-11-19 17:09:54 -05:00 |
|
drigato
|
766c827094
|
Removed undefined index from show info array
|
2014-11-19 16:04:06 -05:00 |
|
drigato
|
5fdca78041
|
Scheduler->removeItems optimization
|
2014-11-19 14:30:18 -05:00 |
|
Albert Santoni
|
9087db2043
|
Removed base URL from saas Selenium tests and added missing Account
Plans tests
|
2014-11-19 11:30:32 -05:00 |
|
Albert Santoni
|
3bf68bdbe6
|
Merge branch '2.5.x' into saas
|
2014-11-19 11:29:34 -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
|
755df62a00
|
Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
airtime_mvc/application/models/StoredFile.php
|
2014-11-18 18:18:44 -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
|
4f7f64af7a
|
Merge branch 'cc-5709-airtime-analyzer' into saas
|
2014-11-18 17:45:08 -05:00 |
|
Albert Santoni
|
cbb8ac7dc6
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2014-11-18 17:45:00 -05:00 |
|
Albert Santoni
|
11a31375df
|
Slightly more robust fix for the last issue
|
2014-11-18 17:41:44 -05:00 |
|
Albert Santoni
|
162995bb49
|
Merge branch 'cc-5709-airtime-analyzer' into saas
|
2014-11-18 17:14:01 -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 |
|
drigato
|
2cfe08b33a
|
Updated FTP upload hook script with new vhost.map file location
|
2014-11-18 14:58:27 -05:00 |
|
Albert Santoni
|
2494e66bb0
|
Merge branch '2.5.x' into saas
|
2014-11-14 11:56:01 -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 |
|
Albert Santoni
|
21ea2a2933
|
Merge branch '2.5.x' into saas
Conflicts:
airtime_mvc/application/models/Show.php
|
2014-11-13 14:22:25 -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 |
omniton
|
2eb1fee4a7
|
fixed po file format
|
2014-11-13 12:09:06 +03:00 |
|
Albert Santoni
|
33c12eddfa
|
Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
|
2014-11-12 17:04:49 -05:00 |
|
Albert Santoni
|
71f2cc11d2
|
Fix for incorrect watchdog disabling
|
2014-11-12 17:04:21 -05: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 |
|
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 |