drigato
|
544767a775
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
|
2014-11-20 17:11:50 -05:00 |
|
drigato
|
8e8fe2d288
|
SAAS-489: Cannot preview tracks stored on disk
|
2014-11-20 17:11:23 -05:00 |
|
Albert Santoni
|
ca7d0688e7
|
Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2014-11-20 16:47:35 -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 |
|
Albert Santoni
|
29fd728d7d
|
Undo live stream auth action breakage
|
2014-11-20 14:30:42 -05:00 |
|
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
|
00fbda193e
|
Schedule->removeItems optimization fix for deleting the current playing track
|
2014-11-20 09:57:37 -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 |
|
Duncan Sommerville
|
c627342e28
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2014-11-19 15:21:14 -05:00 |
|
drigato
|
48ae8ac69c
|
Scheduler->removeItems optimization
|
2014-11-19 15:13:33 -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 |
|
drigato
|
34453b5548
|
Removed setting the directory for cloud files
|
2014-11-18 10:57:21 -05:00 |
|
drigato
|
501b22c48d
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2014-11-18 10:32:28 -05:00 |
|
drigato
|
3c73abc786
|
SAAS-491: Edit meta data not working
Fixed: Propel 1.7 does not cast string types to integers
|
2014-11-18 10:32:03 -05:00 |
|
drigato
|
a9ea3a9c95
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage-saas
|
2014-11-18 09:24:52 -05:00 |
|
drigato
|
4d8b32556b
|
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2014-11-18 09:24:38 -05:00 |
|
drigato
|
91e7f7053d
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2014-11-18 09:16:25 -05:00 |
|
drigato
|
d42db75445
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2014-11-18 09:15:14 -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 |
|
Duncan Sommerville
|
1e8df2b027
|
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
|
2014-11-14 10:02:01 -05:00 |
|
Duncan Sommerville
|
fcbb1c2ee7
|
String updates
|
2014-11-14 10:01:06 -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 |
|
Duncan Sommerville
|
51274920e1
|
Cosmetic updates
|
2014-11-13 10:20:58 -05:00 |
|
Duncan Sommerville
|
6b8163748d
|
Updated styles for csrf elements
|
2014-11-13 09:46:44 -05:00 |
|
drigato
|
6cba0b5bde
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2014-11-13 09:42:15 -05:00 |
|
drigato
|
7d86ea3115
|
Better error handling on media PUT request
|
2014-11-13 09:41:46 -05:00 |
|
drigato
|
eb8ef59d7b
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
|
2014-11-13 09:06:07 -05:00 |
|