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 |
|
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
|
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 |
|