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 |
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
90ff323d1d
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2014-11-11 14:00:37 -05:00 |
|
drigato
|
dbc55632e1
|
Changed print statements so they go to the pypo log
|
2014-11-11 13:58:55 -05:00 |
|
drigato
|
b304e2fa34
|
Bug fix
|
2014-11-11 13:56:17 -05:00 |
|
drigato
|
49f3881da0
|
rmq_config_path fix
|
2014-11-11 13:56:02 -05:00 |
|
drigato
|
eb0f12c709
|
Change back rabbitmq config file param name
|
2014-11-11 13:55:46 -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 |
|
drigato
|
4893d087e2
|
Bug fix
|
2014-11-10 12:53:07 -05:00 |
|
drigato
|
41acfd3840
|
rmq_config_path fix
|
2014-11-10 12:35:41 -05:00 |
|
drigato
|
413c7fd604
|
Change back rabbitmq config file param name
|
2014-11-10 12:25:40 -05:00 |