Albert Santoni
325310f681
CC-5818: Fix Live Chat on Airtime Pro (2.5.3)
2014-04-28 11:23:59 -04:00
drigato
b4a9882e9c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 10:27:07 -04:00
drigato
d081ff10b2
CC-5807: Disk Space will be updated when file is not actually deleted
2014-04-28 10:25:36 -04:00
drigato
1de58c64d6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-28 09:44:14 -04:00
drigato
42806b1cbf
CC-5802: Upgrade application.ini file
2014-04-28 09:43:21 -04:00
drigato
2fdb8d1deb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 15:00:29 -04:00
drigato
8d9b9c1fb7
Moved deleting the maintenace temporary file flag to very end of upgrade task
2014-04-25 15:00:13 -04:00
drigato
f98b03f270
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 14:54:47 -04:00
drigato
66000a2847
CC-5802: Upgrade application.ini file
...
Changed where we insert new application.ini file lines
2014-04-25 14:53:58 -04:00
drigato
61df7c1a44
Moved some comments around
2014-04-25 14:20:04 -04:00
drigato
57ad1beaa9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 14:18:56 -04:00
drigato
f432ea9f75
CC-5802: Upgrade application.ini file
...
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
2014-04-25 14:16:18 -04:00
localizer
2be889f2af
updated translation resources
2014-04-25 15:58:16 +00:00
drigato
aeec9172f9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-04-25 11:16:21 -04:00
drigato
1009719e1c
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-25 11:05:51 -04:00
drigato
6890dcc3bc
CC-5802: Upgrade application.ini file
...
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
2014-04-25 11:05:33 -04:00
drigato
25e484cc2f
Delete code that was copied in twice
2014-04-25 10:22:38 -04:00
Albert Santoni
22b9cc3be1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:08:24 -04:00
Albert Santoni
d9adba117a
One more time...
2014-04-25 01:08:08 -04:00
Albert Santoni
7a2f27fe41
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:03:05 -04:00
Albert Santoni
cdc88d25e1
Argh, fixed typo... it's late
2014-04-25 01:02:47 -04:00
Albert Santoni
3e2a165dd2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 00:48:54 -04:00
Albert Santoni
e7ea5e5301
Try fixing UpgradeController version check again...
2014-04-25 00:48:13 -04:00
Albert Santoni
446eca057c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/fr_FR/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/it_IT/LC_MESSAGES/airtime.po
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
airtime_mvc/locale/template/airtime.po
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Albert Santoni
54db74f622
Allow upgrades from Airtime 2.5.1 because the version wasn't bumped
...
internally to 2.5.2
2014-04-25 00:40:51 -04:00
drigato
42f3bb17e1
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:23:57 -04:00
drigato
f536a7b1b4
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:19:55 -04:00
Albert Santoni
571e903871
Overwrite locale files with those from 2.5.x
2014-04-24 13:13:23 -04:00
Albert Santoni
4b916f74b2
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-24 12:53:48 -04:00
Albert Santoni
caa82f2091
Regenerate messed up translations
2014-04-24 12:53:31 -04:00
drigato
fcd8ea8ba5
CC-5802: Upgrade application.ini file
2014-04-24 10:22:52 -04:00
drigato
069ebd3991
CC-5802: Upgrade application.ini file
2014-04-24 10:12:24 -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
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
Naomi
3e34f1cf96
fixing up some datatables queries, propel usage.
2014-04-23 12:53:43 -04:00
Albert Santoni
41e2b5d840
Fix the failed uploads view
2014-04-23 11:52:10 -04:00
drigato
50ab4cc9bc
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-22 16:11:59 -04:00
drigato
1a71a848e1
CC-5802: Upgrade application.ini file
...
Attempting to write new lines to application.ini file via the upgrade controller
2014-04-22 16:11:46 -04:00
Albert Santoni
0a4a0d387a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/configs/conf.php
2014-04-22 15:57:08 -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
97ce5bdbc5
Fix config parsing for dev_env
2014-04-22 15:27:43 -04:00
Albert Santoni
43483dc112
Added dev env to RabbitMQ stuff for Analyzer (fixed)
2014-04-22 12:28:20 -04:00
Albert Santoni
a79f53758f
Fixed the RabbitMQ thingy
2014-04-22 11:40:35 -04:00
Albert Santoni
f106bf8fad
Separate RabbitMQ settings by development environment
2014-04-22 11:13:15 -04:00
drigato
411af6838b
Remove logging statement
2014-04-17 17:02:14 -04:00
drigato
64ebd9e720
Logging statement
2014-04-17 16:15:04 -04:00
drigato
8979e4e5a9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-17 16:09:03 -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
d00e390511
Removed last change
2014-04-17 13:58:56 -04:00
drigato
0a6b72ad99
Removing something for testing purposes
2014-04-17 13:56:02 -04:00
drigato
c8121f9bc8
CC-5781: Upgrade script for new storage quota implementation
...
Was using du wrong. Wasn't returning value in bytes
2014-04-17 13:53:24 -04:00
drigato
3ebf9e56dd
Upgrade script testing
2014-04-16 17:30:44 -04:00
drigato
b348286448
Upgrade script testing
2014-04-16 17:28:55 -04:00
drigato
456ac40fe6
Upgrade action testing
2014-04-16 17:27:15 -04:00
drigato
cd6c4f7ede
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 17:24:56 -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
drigato
edeb4b052a
Remove logging statements
2014-04-16 16:53:17 -04:00
drigato
f33317ebee
Logging for testing
2014-04-16 16:44:31 -04:00
drigato
7c39ab294d
Logging for testing
2014-04-16 16:37:38 -04:00
drigato
837decb5c3
Logging for testing
2014-04-16 16:36:19 -04:00
drigato
284a1b8895
Upgrade logging test
2014-04-16 16:29:36 -04:00
drigato
db62ffff90
Log statment for testing upgrades
2014-04-16 16:01:48 -04:00
drigato
634b429391
Logging statment for testing upgrades - will be removed
2014-04-16 15:56:45 -04:00
drigato
d05eae629a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 12:16:08 -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
drigato
5045d3ab7c
Remove logging statements
2014-04-16 12:11:46 -04:00
drigato
10cf16f53a
Logging statments
2014-04-16 12:04:18 -04:00
drigato
51af3ba36e
Undo-ing imported filepath change
2014-04-16 11:56:14 -04:00
drigato
368be9002e
Changing imported path for ftp script
2014-04-16 11:54:20 -04:00
drigato
a4b1db91b1
Logging for ftp
2014-04-16 11:41:29 -04:00
drigato
9cea1f079b
Logging for ftp script
2014-04-16 11:31:42 -04:00
drigato
0c2092b33f
Logging for ftp script
2014-04-16 11:04:46 -04:00
drigato
cf13952b45
Logging messages for debugging the ftp script
2014-04-16 11:01:02 -04:00
drigato
87f365038f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:22:15 -04:00
drigato
53ffa29b6b
CC-5786: Quota Enforcement in the File Upload API
...
small fix
2014-04-14 12:21:59 -04:00
drigato
e8cf288d5d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:14:02 -04:00
drigato
acf91bc627
CC-5786: Quota Enforcement in the File Upload API
...
Small refactor
2014-04-14 12:13:48 -04:00
drigato
9041801103
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:09: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
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -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
4afccfe225
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:55:49 -04:00
drigato
7fbd285dd0
Fix typo
2014-04-10 15:55:21 -04:00
drigato
51c80bc033
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:50:58 -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
drigato
56d85f1ac8
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-09 15:04:37 -04:00
drigato
47215eb541
CC-5781: Upgrade script for new storage quota implementation
...
Removing scripts from public folder (was only there for testing)
2014-04-09 15:04:15 -04:00
Albert Santoni
652ae8d398
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
2014-04-09 15:01:19 -04:00
Albert Santoni
8fb95316f2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -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
drigato
661ab7f647
CC-5781: Upgrade script for new storage quota implementation
...
Copied upgrade files to public folder.
Seeing if we can execute the scripts with a URL
2014-04-09 12:32:20 -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
e044187aed
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-04-04 19:48:22 -04:00
drigato
cdcdf7d912
SAAS-382: Reimplement Storage Quota
...
Changed status page to use new disk_usage value from cc_pref table.
2014-04-04 13:30:46 -04:00
Albert Santoni
cf492045cc
CC-5709: Airtime Analyzer
...
* A bunch of cleanup and fix for metadata extraction on files mutagen can't read
2014-04-04 12:35:50 -04:00
Albert Santoni
64a95c7c59
CC-5709: Airtime Analyzer
...
* Nuked another unused function
2014-04-03 16:36:42 -04:00
Albert Santoni
95b369c54d
CC-5709: Airtime Analyzer
...
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
2014-04-03 16:13:26 -04:00
Albert Santoni
0398072d45
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-03 11:35:37 -04:00
drigato
2ca911616f
Setting hidden flag to true on post request
2014-04-03 10:12:20 -04:00
Albert Santoni
e3757d892b
CC-5709: Airtime Analyzer
...
* Fix hack for Airtime Pro
2014-04-02 17:27:10 -04:00
Albert Santoni
aabb8ec01f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:48:04 -04:00
drigato
3c5b7b5853
CC-5733: RESTful API data sanitization and validation
...
small fix - was setting the hidden flag twice
2014-04-02 11:33:47 -04:00
drigato
3b2e4ffa64
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-02 11:23:10 -04:00
drigato
5ddbb4ddd1
CC-5733: RESTful API data sanitization and validation
...
Validate field types on post/put requests using the EditAudioMD form
2014-04-02 11:22:56 -04:00
localizer
a33c85b38a
updated translation resources
2014-04-02 12:25:06 +00:00
localizer
4d480f613a
updated translation resources
2014-04-02 12:15:06 +00:00
localizer
ce8ab2edcd
updated translation resources
2014-04-02 12:14:06 +00:00
localizer
09ae38914b
updated translation resources
2014-04-02 12:13:06 +00:00
localizer
f893f74221
updated translation resources
2014-04-02 10:51:07 +00:00
localizer
505b3a9878
updated translation resources
2014-04-02 10:50:06 +00:00
localizer
168af47e9f
updated translation resources
2014-04-02 10:48:06 +00:00
localizer
53eb4d3130
updated translation resources
2014-04-02 09:55:14 +00:00
Albert Santoni
afc7df8469
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 16:41:25 -04:00
Albert Santoni
19f231bd11
CC-5709: Airtime Analyzer
...
* Add Media page CSS file that I forgot to commit ages ago
2014-04-01 16:40:54 -04:00
Albert Santoni
a6e80e2789
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 12:29:20 -04:00
Albert Santoni
7ea2eef233
CC-5709: Airtime Analyzer
...
* Use system-wide config for Airtime PHP->airtime_analzyer RabbitMQ
communication on Airtime Pro
2014-04-01 12:07:29 -04:00
drigato
70228a675e
Changed default import_status value on cc_files table to 1 (pending)
2014-04-01 11:28:33 -04:00
Albert Santoni
6e6d20d3fc
Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
...
Conflicts:
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
drigato
9eda78f8f9
CC-5733: RESTful API data sanitization and validation
...
Added more fields to the black list
Using the "Edit Metadata" form for field validation on put requests
2014-03-31 17:57:32 -04:00
Albert Santoni
1c5e2d6205
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/public/index.php
* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
only one way to find out...
2014-03-27 16:38:03 -04:00
Albert Santoni
9e9e676b54
CC-5709: Airtime Analyzer
...
* Make the Recent Uplods file actions a bit clearer
2014-03-25 15:35:50 -04:00
Albert Santoni
db2b52a1bf
CC-5709: Airtime Analyzer
...
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
imports.
2014-03-24 17:14:04 -04:00
Albert Santoni
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -04:00
Albert Santoni
61c2c90b7e
CC-5709: Airtime Analyzer
...
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
Albert Santoni
e5e4d5bb01
SAAS-417: quick fix for typo
2014-03-21 16:27:32 -04:00
Albert Santoni
efca227388
SAAS-417: Disable Live Chat for Starter Plans
...
* Disable Live Chat for Starter Plans
2014-03-21 14:30:41 -04:00
Albert Santoni
8f7ecafcf6
CC-5709: Airtime Analyzer
...
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
Albert Santoni
f120caa093
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-21 13:26:47 -04:00
Albert Santoni
878dd11ccc
CC-5709: Airtime Analyzer
...
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
drigato
7800cb1e15
SAAS-382: Reimplement Storage Quota
...
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
2014-03-21 09:50:03 -04:00
Albert Santoni
210348e8cc
Merge branch '2.5.x' into 2.5.x-saas
2014-03-19 17:35:19 -04:00
Albert Santoni
80f09959bb
Fixed permissions of unit tests
2014-03-19 17:34:07 -04:00
drigato
2b696dbee5
CC-5741: Create a download action for the File API
2014-03-18 13:04:06 -04:00
Albert Santoni
2a783f3825
Merge branch '2.5.x' into 2.5.x-saas
2014-03-17 15:41:14 -04:00
Albert Santoni
16c56e6aff
CC-5709: Airtime Analyzer
...
* Fixed error in media API authentication
* Improved documentation
2014-03-17 14:43:50 -04:00
drigato
13a664207f
CC-5742: Airtime isn't handling caught exceptions properly
2014-03-17 11:19:06 -04:00
drigato
86a34635bb
CC-5701: Airtime File API
...
Fixed saving filepath and directory
2014-03-17 10:56:49 -04:00
Albert Santoni
f7cb923ceb
CC-5709: Airtime Analyzer
...
* Fixed breakage
2014-03-17 10:25:26 -04:00
Albert Santoni
e1f69b26af
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-03-17 10:22:54 -04:00
Albert Santoni
50a42f12bb
CC-5709: Airtime Analyzer
...
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
and in the RESTful media API
2014-03-17 10:19:39 -04:00
drigato
65ab49baee
CC-5733: RESTful API data sanitization and validation
...
Renamed sanitize function to sanitizeResponse
2014-03-14 17:53:03 -04:00
drigato
820f7f257a
CC-5733: RESTful API data sanitization and validation
...
Stripped out fields that are readonly to the RESTful API from the request data for POST and PUT.
Stripped out fields that should never be visible outside of Airtime in response data.
Set uploaded and modified timestamp on POST request.
Set modified timestamp on PUT request.
2014-03-14 17:34:56 -04:00
drigato
6a68967f81
CC-5734: RESTful API media ownership
2014-03-13 17:00:15 -04:00