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
785651ec4b
Merged 2.5.x into 2.5.x-installer
2014-11-10 17:15:41 -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
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
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
drigato
77ee84584c
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 13:06:41 -05:00
drigato
c63627267c
composer.lock
2014-11-07 13:06:18 -05:00
drigato
776b891894
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
2014-11-07 13:05:29 -05:00
drigato
fa88e72d82
Removed composer.lock from gitignore
2014-11-07 13:02:09 -05:00
drigato
da42e39178
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:49:27 -05:00
drigato
ecc0225ff5
Added apache-libcloud dependency to airtime_analyzer
2014-11-07 12:49:10 -05:00
drigato
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
Duncan Sommerville
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
drigato
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -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
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -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
drigato
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
drigato
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -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
