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
|
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
|
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
|
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
|
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 |
|
Albert Santoni
|
2494e66bb0
|
Merge branch '2.5.x' into saas
|
2014-11-14 11:56:01 -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
|
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
|
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 |
|