Commit Graph

12075 Commits

Author SHA1 Message Date
Albert Santoni 0a906ba6ec Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 17:42:52 -04:00
Albert Santoni 9fdfc0a957 CC-5709: Airtime Analyzer
* Catch exceptions related to unpickling the HTTP request queue
2014-04-23 17:42:09 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
Naomi 578f758274 CC-5810 : Installation can have race conditions with the cache
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
2014-04-23 15:41:15 -04:00
Albert Santoni f2ce77fecb Remove python-magic 2014-04-23 14:20:48 -04:00
Albert Santoni f98dabcc02 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 14:18:08 -04:00
Albert Santoni 4f3298b986 Installer fix 2014-04-23 14:17:58 -04:00
Naomi e0d550c194 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-23 12:54:02 -04:00
Naomi 3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni b920ed2598 Fixed a bunch of installer stuff for Naomi 2014-04-23 12:21:39 -04:00
Albert Santoni 41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
Albert Santoni e7482e52f7 Double equals typo *ducks* 2014-04-22 15:56:29 -04:00
Albert Santoni dc27465b21 Fix config parsing for dev_env
Conflicts:
	airtime_mvc/application/configs/conf.php
2014-04-22 15:29:21 -04:00
Albert Santoni d77f107df5 CC-5808: Fixed breakage at shutdown 2014-04-22 15:03:46 -04:00
Albert Santoni f65e7dd721 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-21 17:50:34 -04:00
Albert Santoni 6a86a75cee CC-5709: Airtime Analyzer
* Fixed CC-5799: Incorrect Mime on import
2014-04-21 17:50:10 -04:00
drigato df9482f2ff CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path
Media monitor was still being used to delete the file from stor
2014-04-17 16:08:02 -04:00
drigato f27ce3af9e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-16 17:24:15 -04:00
drigato a3be55fd60 CC-5781: Upgrade script for new storage quota implementation
Changed airtime conf file path so it works for saas or self-hosted users
2014-04-16 17:24:02 -04:00
Albert Santoni cdce4ca104 CC-5709: Airtime Analyzer
* Fixed the unit tests
* Improved length testing because it seems to fluctuate a bit with
  your mutagen version (great, eh?)
2014-04-16 16:42:37 -04:00
Albert Santoni 9a3c88f009 CC-5709: Airtime Analyzer
* Explicitly set the locale in upstart conf to avoid UTF-8/unicode
  errors from python. Fixes CC-5794.
2014-04-16 15:33:02 -04:00
Albert Santoni d6bc3aa4cc Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-16 13:05:24 -04:00
Albert Santoni b0670f5f47 CC-5709: Airtime Analyzer
* Log tracebacks from child process
2014-04-16 13:05:02 -04:00
drigato a4de61c2b5 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-16 12:15:45 -04:00
drigato f5a2e59b6d Removed disk space check from StoredFile. This is now done in the Media controller 2014-04-16 12:15:34 -04:00
Albert Santoni 4d1843ca1f Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-16 11:11:24 -04:00
Albert Santoni f491211167 CC-5709: Airtime Analyzer
* Retry HTTP requests (kinda crappy, should find a better design pattern to
  solve this) - CC-5775
* Persist failed HTTP requests at shutdown
2014-04-16 11:10:06 -04:00
drigato 7aba416c3b Small fix to ftp hook script.
Removed space that was getting added to the api key
2014-04-16 10:54:55 -04:00
drigato 53ffa29b6b CC-5786: Quota Enforcement in the File Upload API
small fix
2014-04-14 12:21:59 -04:00
drigato acf91bc627 CC-5786: Quota Enforcement in the File Upload API
Small refactor
2014-04-14 12:13:48 -04:00
drigato 63e2eda64b CC-5786: Quota Enforcement in the File Upload API
Tweaked this so it will work on self-hosted instances
2014-04-14 12:09:15 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
localizer abe3b79fed updated translation resources 2014-04-11 13:13:12 +00:00
drigato 7fbd285dd0 Fix typo 2014-04-10 15:55:21 -04:00
drigato 819862c37b CC-5781: Upgrade script for new storage quota implementation
cleaned up upgrade controller
2014-04-10 10:55:47 -04:00
drigato b9b3e95caa CC-5781: Upgrade script for new storage quota implementation
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
2014-04-10 09:28:23 -04:00
drigato bae0c564d0 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-10 07:12:52 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
Albert Santoni 4fe9fc189a CC-5709: Airtime Analyzer
* CC-5772: Recent Upload table times should be shown in local time
2014-04-09 14:57:30 -04:00
Albert Santoni 1e62908e66 CC-5709: Airtime Analyzer
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
2014-04-09 11:28:41 -04:00
Albert Santoni e4af3a5a0e CC-5709: Airtime Analyzer
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
2014-04-08 17:28:50 -04:00
Albert Santoni b90356b74c Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-08 14:16:20 -04:00
Albert Santoni 84ee3d26cb CC-5709: Airtime Analyzer
* Fixed metadata import, whoops
2014-04-08 14:16:07 -04:00
drigato 0a400081cd Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-08 10:32:41 -04:00
drigato 3adaf8e370 CC-5781: Upgrade script for new storage quota implementation
Upgrade script for local installs
SAAS requires a different script
2014-04-08 10:32:27 -04:00
Albert Santoni 312cf57154 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-07 16:20:07 -04:00
Albert Santoni b8b913ff68 CC-5709: Airtime Analyzer
* Fixed daemonization stuff for upstart
* Adding missing unit test files
2014-04-07 16:19:44 -04:00
drigato 70e660e7da CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:26:56 -04:00
drigato c18c4da629 CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:18:33 -04:00
drigato aa531c882f CC-5781: Upgrade script for new storage quota implementation 2014-04-07 15:16:32 -04:00