Albert Santoni
f89c66922b
Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas
2014-05-05 12:42:42 -04:00
drigato
5762bb9df5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 12:26:01 -04:00
drigato
16fb9d75d3
Changed GetDiskUsage so it will always return 0 if the value has not been set yet
2014-05-05 12:25:42 -04:00
drigato
a8c428bfb0
Fix disk quota message
2014-05-05 11:52:13 -04:00
drigato
e11afd4e71
Fix for new saas instances getting created with a 'disk quota reached' message
2014-05-05 11:41:43 -04:00
drigato
39db3d4aee
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
2014-05-05 11:21:02 -04:00
drigato
094382c766
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-05-05 11:19:27 -04:00
drigato
e4e5590b9f
CC-5802: Upgrade application.ini file
...
Remove this upgrade step from the upgrade controller
2014-05-05 11:19:14 -04:00
Albert Santoni
1c33da948e
Removed per-instance application.ini customizations
2014-05-02 16:14:06 -04:00
Albert Santoni
250d5d083e
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-02 16:06:15 -04:00
Albert Santoni
4b4fd5432f
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-05-02 15:52:31 -04:00
Albert Santoni
2d6748457c
Remove database credentials from application.ini
2014-05-02 15:50:37 -04:00
drigato
721e4e1a4a
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-05-01 10:58:51 -04:00
drigato
cb20c30723
CC-5806: Airtime Analyzer: Please implement "remove all files"
...
saas-specific changes for updating disk_usage
2014-04-29 16:08:03 -04:00
drigato
b0a711d918
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 16:06:43 -04:00
drigato
a5eb5e9901
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-04-29 16:06:25 -04:00
drigato
88b6b28c62
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 11:09:55 -04:00
drigato
04da9b3d61
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Imported file path had album name twice - fixed
2014-04-29 11:09:31 -04:00
drigato
f0fdf85524
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:35:58 -04:00
drigato
94375ee441
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Cleaner way of removing empty sub folders after ftp uploads
2014-04-29 10:35:39 -04:00
drigato
6adb7c53ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:05:35 -04:00
drigato
6f1dd7987f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
2014-04-29 10:05:17 -04:00
drigato
c3c5720dac
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:25:13 -04:00
drigato
79687499aa
Logging statement. To remove later.
2014-04-28 16:24:59 -04:00
drigato
48742abd6b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:20:44 -04:00
drigato
f428a2d960
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Delete the empty folder after files have been copied into imported
2014-04-28 16:20:26 -04:00
drigato
9a0abb29b3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 15:52:49 -04:00
drigato
c586e3e2b8
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Was using wrong position when using substr()
2014-04-28 15:52:08 -04:00
drigato
0c0c65f69b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-04-28 14:46:03 -04:00
drigato
fae5b15a9f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
2014-04-28 14:44:52 -04:00
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
Albert Santoni
9b390518b7
CC-5709: Airtime Analyzer
...
* Fix the callback URL
* Imports files successfully now!
2014-03-13 14:59:48 -04:00
Albert Santoni
451b19150b
CC-5709: Airtime Analyzer
...
* Notify airtime_analyzer of new uploads with RabbitMQ
* Use a durable exchange for airtime-uploads
2014-03-13 13:35:48 -04:00
localizer
5dca00c593
updated translation resources
2014-03-13 16:49:36 +00:00
Naomi
b209108604
CC-5732 : History -> Playout History: live chat banner blocks navigator buttons
...
avoid livechat problems
2014-03-13 12:37:56 -04:00
Albert Santoni
f4ea417b83
CC-5709: Airtime Analyzer
...
* Renamed a function in MediaController for clarity
* Updated airtime_analyzer README
2014-03-13 12:12:12 -04:00
Albert Santoni
e6cbbdff33
CC-5709: Airtime Analyzer
...
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
awkward.
* Basic uploading works with the Add Media page again, but messages
aren't dispatched to airtime_analyzer yet (coming next...)
2014-03-13 11:14:30 -04:00
Naomi
d3f9492577
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-12 18:00:24 -04:00
Albert Santoni
c104048bc7
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-12 18:01:51 -04:00
Albert Santoni
5b9ceb8d2d
Made the runtests.sh script work regardless of CWD
2014-03-12 18:01:27 -04:00
Naomi
97989953c8
CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
...
need to modify these to user timezone strings to match the new changes.
2014-03-12 18:00:01 -04:00
drigato
f7602cadd8
Fixed broken test
2014-03-12 17:32:22 -04:00
localizer
e0386f9752
updated translation resources
2014-03-12 09:34:44 +00:00
localizer
9a803b1da5
updated translation resources
2014-03-12 09:30:20 +00:00
Naomi
7078180da0
CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
...
removing flawed functions.
2014-03-11 13:26:05 -04:00
Naomi
f8935a312f
CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
...
fixing listener stat search
2014-03-11 13:24:22 -04:00
Naomi
cd55ed5ee4
CC-5727 : History search range using incorrect timezone offset
...
fixing show fetching times.
2014-03-10 18:48:40 -04:00
Naomi
c668d91e08
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 18:33:15 -04:00
Naomi
8d2926aeed
CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
...
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
drigato
725b5da154
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 17:42:12 -04:00
drigato
14c670aa20
CC-5728: Problem when removing repeat option and changing start date
2014-03-10 17:41:57 -04:00
Naomi
1854d76f03
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-03-10 17:39:36 -04:00
Naomi
5f3199b4bb
CC-5727 : History search range using incorrect timezone offset
2014-03-10 17:39:17 -04:00
drigato
8ad866c2a2
Fixed changing the start date on a non-repeating show
2014-03-10 17:32:54 -04:00
drigato
78d34a6d16
Fixed broken test
2014-03-10 17:31:24 -04:00
Albert Santoni
6d7117f670
CC-5709: Airtime Analyzer
...
* Added MetadataAnalyzer unit tests and test data
* Improved debug logging and squashed pika logging
* Implemented file moving
* Extract the track number/total
* Fixed mapping of mutagen to Airtime fields in a few spots. The mapping
matches the DB column names now.
* Fixed the bin/airtime_analyzer binary
* Started work on PluploadController to make it work with the new File
API
2014-03-10 16:32:23 -04:00
drigato
03bb0e1df9
CC-5725 Changing a show's repeat type removes first instance from repeating seriesCC-5726: Write database test cases for CC-5725
2014-03-07 15:59:57 -05:00
drigato
6b91d2daf8
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-07 14:52:32 -05:00
Albert Santoni
c0818682af
CC-5709: Airtime Analyzer
...
* Fixed the /rest/media endpoint
2014-03-06 17:38:57 -05:00
Albert Santoni
4e39fce701
CC-5709: Airtime Analyzer
...
* Basic HTTP reporting back to the File API works (PUT)
* Use the database table names as JSON field names.
* Fixed result returning bug in message_listener.py
* Fixed API key verification to adhere with the HTTP Basic Auth spec
2014-03-06 16:55:20 -05:00
drigato
35fd639c1c
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 11:18:13 -05:00
drigato
51b5cc2052
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 10:54:40 -05:00
drigato
bcda9ea5e6
Broke unit test for adding content to single show
2014-03-05 14:50:35 -05:00
drigato
426b75b635
CC-5724: Changing start date of a repeating show will update content incorrectly
2014-03-05 14:37:07 -05:00
drigato
ebc68b980c
CC-5718: Show content can get scheduled in instances that are in the past
...
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
2014-03-05 13:12:27 -05:00
drigato
7660e0cd84
CC-5719: Incorrect show content start time
...
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
2014-03-04 11:29:49 -05:00
drigato
b433a529ab
CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
2014-03-03 16:42:52 -05:00
drigato
b6dd2e3152
CC-5701: Airtime File API
2014-03-03 16:04:34 -05:00
drigato
f33f49259d
CC-5701: Airtime File API
...
Fixed http response code for delete
2014-03-03 11:28:18 -05:00
drigato
aba2fb44d1
CC-5701: Airtime File API
...
-put and delete actions working
2014-03-03 11:21:25 -05:00
drigato
64c1dd2c1e
CC-5701: Airtime File API
...
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
drigato
1715f2187d
CC-5715: Write database test to check the schedule start times after editing a repeating show and changing the repeat day
2014-02-27 13:08:41 -05:00
drigato
4cb785a062
CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day
2014-02-27 12:10:28 -05:00
drigato
e5cdaf3785
Temporarily commenting out test
2014-02-27 09:32:28 -05:00
drigato
1acdf2ca80
CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day
2014-02-27 07:35:08 -05:00
drigato
753003639f
CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
...
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
2014-02-25 17:22:17 -05:00
drigato
f1658f6490
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
2014-02-25 17:16:14 -05:00
drigato
3db1cd412a
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Optimized how we store the instance ids that already exist
2014-02-25 16:51:48 -05:00
drigato
cd592827fd
CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items
...
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
2014-02-24 17:46:16 -05:00
drigato
6cd84363a6
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Added comment
2014-02-24 16:04:48 -05:00
drigato
787f19f69a
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
2014-02-24 14:49:11 -05:00
Albert Santoni
86dafaf61c
SAAS-404: Separate the Airtime API version from the Airtime version
...
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
localizer
003f9ed6b2
updated translation resources
2014-02-12 10:54:11 +00:00
localizer
b7b92fc19e
updated translation resources
2014-02-11 20:09:12 +00:00
drigato
acb3b9b179
Merge branch '2.5.x' into 2.5.x-saas
2014-02-11 10:29:50 -05:00
drigato
8bbc243cf6
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-02-10 16:19:40 -05:00
drigato
3b9608a8df
CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
...
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
Albert Santoni
7ee5c8ffd7
Another dummy commit for Bamboo
2014-02-10 13:32:41 -05:00
Albert Santoni
36d6a6b2bf
Dummy commit to test web hook
2014-02-10 13:18:28 -05:00
Albert Santoni
034d1dc9f8
Unit test docs update
2014-02-10 13:03:11 -05:00
Albert Santoni
02a96646e1
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
python_apps/pypo/listenerstat.py
2014-02-05 17:35:59 -05:00
Albert Santoni
296adfdb24
CC-5651: Unit Test the Scheduler
...
* Added a beastly unit test for Application_Model_Schedule::isFileScheduledInTheFuture
2014-02-05 15:37:47 -05:00
localizer
c84c6d9d22
updated translation resources
2014-02-04 18:20:15 +00:00
localizer
93eb5ff1de
updated translation resources
2014-02-04 14:07:13 +00:00
localizer
f056eeac0a
updated translation resources
2014-02-04 11:49:16 +00:00
localizer
ce819b18e7
updated translation resources
2014-02-04 11:32:05 +00:00
localizer
c549544146
updated translation resources
2014-02-04 11:31:56 +00:00
localizer
2d61459620
updated translation resources
2014-02-04 11:25:37 +00:00
localizer
f2ce85a212
updated translation resources
2014-02-04 11:24:32 +00:00
localizer
b209c58dbf
updated translation resources
2014-02-04 10:32:05 +00:00
drigato
09040dc021
Merge branch '2.5.x' into 2.5.x-saas
2014-02-03 12:33:57 -05:00
drigato
63ec20d9f1
CC-5681: I18N: Fail to switch language
...
Check if Zend_Auth class exists with the autoloader
2014-02-03 12:33:35 -05:00
localizer
5d19a22b2d
updated translation resources
2014-02-03 12:35:10 +00:00
drigato
ba84e609e7
Moved commit hook scripts to dev_tools directory
2014-01-31 16:42:53 -05:00
drigato
6d63b81f76
Testing commit triggers....
2014-01-31 15:56:59 -05:00
drigato
a00ab8bc79
Added comment for phpunit
2014-01-31 15:31:40 -05:00
drigato
f71909d255
CC-5651: Unit Test the Scheduler
...
Some fine tuning
2014-01-31 15:22:19 -05:00
drigato
b7c79df6ec
Merge branch 'unittests' into 2.5.x
2014-01-31 15:02:41 -05:00
Albert Santoni
c7c2d37b30
Merge branch '2.5.x' into 2.5.x-saas
2014-01-31 13:21:33 -05:00
drigato
e24d25e398
CC-5651: Unit Test the Scheduler
...
Log results in xml file for junit parser
2014-01-31 12:41:15 -05:00
drigato
5c01234445
CC-5651: Unit Test the Scheduler
...
Small fix to runtests script
2014-01-31 11:18:46 -05:00
drigato
4beb06a1d9
CC-5651: Unit Test the Scheduler
...
Creat a rabbitmq vhost and user before running tests so airtime doesn't have to be installed
2014-01-31 11:09:22 -05:00
localizer
4a39097daf
updated translation resources
2014-01-31 07:52:07 +00:00
localizer
5730c13da6
updated translation resources
2014-01-30 20:37:06 +00:00
drigato
484f1d9502
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-01-30 12:38:49 -05:00
drigato
883e8885c7
CC-5677: Library -> Scheduled column gets updated on incorrect file
2014-01-30 12:38:18 -05:00
root
91c89e91f3
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-01-30 17:07:52 +00:00
drigato
ce7eddf563
CC-5678: Scheduler: Show's contents won't follow show's scheduled time change
...
Fixed by storing original cc_show_day object by value
2014-01-30 12:07:24 -05:00
root
3f15bf6e80
updated translation resources
2014-01-30 17:06:38 +00:00
Albert Santoni
d68227939f
Merge branch '2.5.x-saas' of github.com:sourcefabric/Airtime into 2.5.x-saas
2014-01-29 17:20:53 -05:00
Albert Santoni
03015a6b69
Nerf the APC cache on SaaS
...
* We have multiple webservers on SaaS so we need a distributed data
cache like memcached.
* Fixes CC-5671: Live streaming: UI won't update connection status unless reload apache2
2014-01-29 17:19:24 -05:00
Daniel James
eb35dcac5f
Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt!
2014-01-29 17:54:28 +00:00
drigato
719d582e0f
Merge branch '2.5.x' into 2.5.x-saas
2014-01-29 12:13:24 -05:00
drigato
7a04f7d98e
CC-5672: Webstream warnings on SaaS
...
Don't parse/use header info if get_headers returns false
2014-01-29 12:09:05 -05:00
drigato
a59453cde5
CC-5651: Unit Test the Scheduler
2014-01-27 17:17:03 -05:00
Albert Santoni
a0cae1d8f3
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 15:23:01 -05:00
drigato
55665fb246
CC-5651: Unit Test the Scheduler
...
Added test for weekly repeat show R&R show creation
2014-01-27 15:10:42 -05:00
Albert Santoni
c9d98e4e10
Small Airtime Pro fix for ShowFormService
2014-01-27 14:31:33 -05:00
drigato
697e50c50d
CC-5651: Unit Test the Scheduler
...
Added test for non-repeating record and rebroadcast shows
2014-01-27 13:23:28 -05:00
drigato
6da493110f
CC-5651: Unit Test the Scheduler
...
Fixed linked show test
2014-01-27 12:23:46 -05:00
Albert Santoni
ed78625fce
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 12:01:11 -05:00
drigato
d6aabfdc88
CC-5651: Unit Test the Scheduler
...
Added some linked show tests
2014-01-24 17:25:40 -05:00
drigato
2bbc42f532
CC-5651: Unit Test the Scheduler
...
Moved test data outside of services
2014-01-24 16:08:38 -05:00
drigato
e0650fb840
CC-5651: Unit Test the Scheduler
...
Overlapping show tests
2014-01-24 15:14:31 -05:00
drigato
2076b3c069
CC-5651: Unit Test the Scheduler
...
Add logging class to bootstrap
2014-01-24 11:39:15 -05:00
drigato
c04d8714bb
Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests
2014-01-23 17:06:34 -05:00
drigato
ca09ad2896
CC-5593: Overlapping Show Bug
...
Added tests for checking if shows overlap
2014-01-23 17:06:27 -05:00
Albert Santoni
ab96e1e0b2
CC-5651: Unit Test the Scheduler
...
* Temporarily disabling the one Preferences unit test that's failed
until I fix it.
2014-01-23 17:06:13 -05:00
Albert Santoni
162a873f9d
CC-5651: Unit Test the Scheduler
...
* Continued refactoring of the database creation.
* Database now persists after running tests but most of the tables are
cleared.
* The unit tests run WAY faster now. :-)
2014-01-23 17:04:29 -05:00
Albert Santoni
aa2e084a09
Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests
2014-01-23 13:10:41 -05:00
Albert Santoni
5d2aae4525
Updated readme for unit testing
2014-01-23 12:51:53 -05:00
drigato
fc4dfd5cb0
CC-5651: Unit Test the Scheduler
...
Moved common database setup functions to helper class
2014-01-23 11:37:20 -05:00
Albert Santoni
52c3971fc6
Fixed a bug in Application_Model_SetShowsPopulatedUntil
2014-01-22 17:58:25 -05:00
Albert Santoni
3826a88d1f
Disable code coverage report because autoloader is not working
2014-01-22 17:00:23 -05:00
drigato
e9d1a1fd91
CC-5651: Unit Test the Scheduler
2014-01-21 16:56:01 -05:00
drigato
56a2c37c11
CC-5651: Unit Test the Scheduler
2014-01-21 16:55:52 -05:00
drigato
c14640c81e
CC-5651: Unit Test the Scheduler
...
Added database test
2014-01-21 16:43:45 -05:00
drigato
b2cff12569
CC-5651: Unit Test the Scheduler
...
Typo
2014-01-21 15:58:05 -05:00
drigato
78120a69e8
CC-5651: Unit Test the Scheduler
...
Added comments about why all show dates are hard coded and not relative
2014-01-21 15:55:05 -05:00
drigato
63087610dc
CC-5651: Unit Test the Scheduler
...
Added more database tests
2014-01-21 12:29:56 -05:00
drigato
d5112f0368
Added comments for a show_service function
2014-01-20 17:05:37 -05:00
drigato
2faa2db55d
CC-5651: Unit Test the Scheduler
...
Added 2 unit tests
2014-01-20 17:03:29 -05:00
drigato
e9d2874e83
CC-5651: Unit Test the Scheduler
...
Fixed show_service unit tests so they can access private/protected methods
2014-01-20 12:20:05 -05:00
drigato
bdf5dc4982
CC-5651: Unit Test the Scheduler
2014-01-16 17:16:29 -05:00
drigato
c329d54252
CC-5651: Unit Test the Scheduler
2014-01-16 17:01:22 -05:00
drigato
01ec611ae2
CC-5651: Unit Test the Scheduler
...
Reorganized tests
2014-01-15 11:51:20 -05:00
drigato
005d4b9b6d
CC-5651: Unit Test the Scheduler
...
Added test for deleting an entire repeating show
2014-01-14 16:40:11 -05:00
drigato
59f0e63763
CC-5651: Unit Test the Scheduler
...
Added test for editing a repeating show instance
2014-01-14 16:08:11 -05:00
drigato
0b4ae6b94d
CC-5651: Unit Test the Scheduler
...
Added test for deleting repeating show instances
2014-01-14 14:16:37 -05:00
drigato
a658dbf27c
Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests
...
Conflicts:
airtime_mvc/tests/application/models/ShowTest.php
2014-01-13 12:00:16 -05:00
drigato
8457a3403b
CC-5651: Unit Test the Scheduler
2014-01-13 11:53:00 -05:00
drigato
8e8f59a83c
CC-5651: Unit Test the Scheduler
...
Added test for deleting a show instance
2014-01-13 11:43:17 -05:00
drigato
8c720d8802
CC-5651: Unit Test the Scheduler
...
Added new test for creating a weekly repeating show
Renamed xml files to better reflect which test it belongs to
2014-01-13 11:43:17 -05:00
drigato
b076e86844
CC-5651: Unit Test the Scheduler
...
Removed unused code
2014-01-13 11:43:17 -05:00
drigato
75eb76062f
CC-5651: Unit Test the Scheduler
...
Added test for a non-repeat and non-record show
Added a helper class
2014-01-13 11:43:17 -05:00
drigato
60f80dbb57
Added missing ShowData.php thingy for unit testing
2014-01-13 11:43:17 -05:00
drigato
a7dcfe000c
CC-5651: Unit Test the Scheduler
...
Created file that returns test data
Added a non-repeating, non-record&rebroadcast show creation test (not working yet)
Updated the cc_show_seed.xml file to include all 5 show tables
2014-01-13 11:43:17 -05:00
Albert Santoni
fe9beec778
CC-5651: Unit Test the Scheduler
...
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2014-01-13 11:43:17 -05:00
drigato
72da8be2f2
CC-5651: Unit Test the Scheduler
...
First test passes!
2014-01-13 11:43:17 -05:00
drigato
da05426bca
CC-5651: Unit Test the Scheduler
...
Got test to run!
2014-01-13 11:43:17 -05:00
Albert Santoni
c94f51b9f6
CC-5651: Unit Test the Scheduler
...
* Fixed the test airtime.conf a bit
* Create the database tables and db properly
2014-01-13 11:43:17 -05:00
Albert Santoni
32e9edf644
CC-5651: Unit Test the Scheduler
...
* Mock config for database connections
2014-01-13 11:43:17 -05:00
drigato
e5d23ca900
CC-5651: Unit Test the Scheduler
...
Remove zend session stuff
Add services, install scripts to include path
2014-01-13 11:43:17 -05:00
Albert Santoni
3c9b0c0cb2
CC-5651: Unit Test the Scheduler
...
* Comments
2014-01-13 11:43:17 -05:00
Albert Santoni
e4cdce9ff2
CC-5651: Unit Test the Scheduler
...
* Improved bootstrapping, fixed a bunch of errors
* Start a session, got Zend_Application working
2014-01-13 11:43:17 -05:00
Albert Santoni
37a95519c1
CC-5651: Unit Test the Scheduler
...
* More database connection stuff
2014-01-13 11:43:17 -05:00
Albert Santoni
6026ec58db
CC-5651: Unit Test the Scheduler
...
* Got the database connection working in our unit test
2014-01-13 11:43:17 -05:00
Albert Santoni
42aebe50af
CC-5651: Unit Test the Scheduler
...
* README.txt update for unit tests
2014-01-13 11:43:16 -05:00
Albert Santoni
6cb38d021e
CC-5651: Unit Test the Scheduler
...
* Updated README
2014-01-13 11:43:16 -05:00
drigato
947a093e29
CC-5651: Unit Test the Scheduler
...
Added xml cc_show seed file and cc_show creation test file
2014-01-13 11:43:16 -05:00
drigato
8485e136fe
CC-5651: Unit Test the Schedule
...
Remove Zend library from tests folder
2014-01-13 11:43:16 -05:00
Albert Santoni
ae6efc8fc8
CC-5651: Unit Test the Scheduler
...
* Unit test bootstrapping work.
* Added a README.txt for the unit testing environment
2014-01-13 11:43:16 -05:00
drigato
0f107dbad3
Initial unit test configuration
2014-01-13 11:43:16 -05:00
drigato
9e5cfe0d39
CC-5666: Deleting a show instance can revert the 'no end' option
2014-01-13 11:41:44 -05:00
drigato
0f4099e481
CC-5651: Unit Test the Scheduler
...
Added test for deleting a show instance
2014-01-09 16:58:56 -05:00
drigato
4e668b9d77
CC-5651: Unit Test the Scheduler
...
Added new test for creating a weekly repeating show
Renamed xml files to better reflect which test it belongs to
2014-01-09 14:38:03 -05:00
drigato
a648f7fa2d
CC-5665: Timeout can occur when scheduling large playlists into linked shows
...
Added a temporary fix by extending the php time limit
2014-01-09 11:57:32 -05:00
drigato
71022b1413
CC-5651: Unit Test the Scheduler
...
Removed unused code
2014-01-08 15:52:46 -05:00
drigato
ef13d5966f
CC-5651: Unit Test the Scheduler
...
Added test for a non-repeat and non-record show
Added a helper class
2014-01-08 15:51:11 -05:00
drigato
3baf7929ce
Added missing ShowData.php thingy for unit testing
2014-01-07 13:03:34 -05:00
drigato
94912ed445
CC-5651: Unit Test the Scheduler
...
Created file that returns test data
Added a non-repeating, non-record&rebroadcast show creation test (not working yet)
Updated the cc_show_seed.xml file to include all 5 show tables
2014-01-06 18:09:13 -05:00
drigato
2cdad4932a
CC-5660: Unable to create shows with a rebroadcast
...
Used wrong formating for minutes
2014-01-06 14:04:18 -05:00
drigato
11284d0d41
CC-5660: Unable to create shows with a rebroadcast
...
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
2014-01-06 13:51:06 -05:00
Albert Santoni
fea3f4073a
CC-5651: Unit Test the Scheduler
...
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2013-12-19 16:58:11 -05:00
drigato
298a9e6b7c
CC-5651: Unit Test the Scheduler
...
First test passes!
2013-12-19 16:03:16 -05:00
drigato
3b27e74ca0
CC-5651: Unit Test the Scheduler
...
Got test to run!
2013-12-19 15:31:12 -05:00
Albert Santoni
c4adbab04e
CC-5651: Unit Test the Scheduler
...
* Fixed the test airtime.conf a bit
* Create the database tables and db properly
2013-12-19 12:01:32 -05:00
Albert Santoni
b95fb38164
CC-5651: Unit Test the Scheduler
...
* Mock config for database connections
2013-12-19 11:40:35 -05:00
drigato
6512f033d1
CC-5651: Unit Test the Scheduler
...
Remove zend session stuff
Add services, install scripts to include path
2013-12-19 11:16:06 -05:00
Albert Santoni
585d62bfef
CC-5651: Unit Test the Scheduler
...
* Comments
2013-12-19 11:11:26 -05:00
Albert Santoni
a7353ba6ca
CC-5651: Unit Test the Scheduler
...
* Improved bootstrapping, fixed a bunch of errors
* Start a session, got Zend_Application working
2013-12-19 11:09:49 -05:00
Albert Santoni
813043f52a
CC-5651: Unit Test the Scheduler
...
* More database connection stuff
2013-12-18 18:59:42 -05:00
Albert Santoni
1cf5d3489e
CC-5651: Unit Test the Scheduler
...
* Got the database connection working in our unit test
2013-12-18 17:40:13 -05:00
Albert Santoni
083ca601c9
CC-5651: Unit Test the Scheduler
...
* README.txt update for unit tests
2013-12-18 16:42:32 -05:00
Albert Santoni
dbc83d37d6
Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests
2013-12-18 16:26:42 -05:00
Albert Santoni
bc7f83c9ff
CC-5651: Unit Test the Scheduler
...
* Updated README
2013-12-18 16:26:22 -05:00
drigato
73130f02e5
CC-5651: Unit Test the Scheduler
...
Added xml cc_show seed file and cc_show creation test file
2013-12-18 16:11:03 -05:00
drigato
6aaa2c83aa
CC-5651: Unit Test the Schedule
...
Remove Zend library from tests folder
2013-12-18 16:07:01 -05:00
Albert Santoni
84c7e21bea
CC-5651: Unit Test the Scheduler
...
* Unit test bootstrapping work.
* Added a README.txt for the unit testing environment
2013-12-18 16:05:31 -05:00
drigato
e638101a97
Initial unit test configuration
2013-12-18 15:48:32 -05:00
Naomi Aro
49474ab5c4
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
drigato
dc05d9ddaf
CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange
2013-12-17 17:09:59 -05:00
Albert Santoni
653f0e02a4
CC-5648: Events are shifted down in the month view
...
* Fixed it.
2013-12-17 15:25:43 -05:00
Naomi
8daca16fac
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-16 17:14:55 -05:00
Naomi
424de61a11
CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.
...
upgrading to jPlayer 2.5.0
2013-12-16 17:14:00 -05:00
drigato
27c3637591
CC-5640: End time does not get updated when editing the current playing show
...
Was checking if the start time was in the past, but we should check if the
end time is in the past. This way you can extend or shrink shows that are currently playing.
2013-12-16 15:27:51 -05:00
Albert Santoni
0afaeadb15
CC-5641: Can Create Zero or Negative Length Shows
...
* Fixed two underlying causes of zero or negative length shows
that could be created over DST time changes:
- Fixed incorrect end time arithmetic which did not preserve the
show duration.
- Fixed a desynchronization issue due to FullCalendar handling
events over DST differently from Airtime.
2013-12-14 22:38:33 -05:00
Albert Santoni
f16d8ca2ea
Fixed a bunch of annoying/major graphical issues with the calendar
...
* Fixed a bug where the calendar would keep shrinking smaller and
smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
part).
2013-12-14 00:05:13 -05:00
Albert Santoni
15370702a4
Use the user timezone, not the station timezone in the Add Show form (by
...
default)
* Fixes really annoying problem where you click on the calendar, and it
adds your show in the wrong spot.
2013-12-13 18:27:36 -05:00
Albert Santoni
6a468ff549
Fix a rendering problem if a zero length show happens
2013-12-13 18:27:14 -05:00
Albert Santoni
346036a9ca
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
...
Conflicts:
airtime_mvc/application/models/Show.php
2013-12-13 16:12:26 -05:00
Albert Santoni
fa0a190277
Prevent division by zero if show lengths end up being zero
2013-12-13 16:10:36 -05:00
Naomi
99902bc10c
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:16:51 -05:00
Naomi
445f1ebe4f
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
removing old crappy method.
2013-12-13 15:14:38 -05:00
Naomi
7a51b8d2ad
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:06:52 -05:00
Naomi
a45235d39b
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-13 15:03:02 -05:00
drigato
1dfcfd3e34
CC-5639: Repeating show's instances will vanish when editing single instance with overlapping warning
...
The wrong action was getting set when there were errors in the show form
2013-12-13 14:20:43 -05:00
drigato
d841f11de3
CC-5638: Shows become unlinked when moving the end time back
...
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
drigato
e8a8aeaf00
CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated
...
Made all show fields readonly when editing a repeating instance
2013-12-13 12:13:58 -05:00
Naomi
bbccc2e7d3
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 17:18:17 -05:00
Naomi
87ac5dc294
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-12 17:18:03 -05:00
drigato
d0474f4247
Changed function title when editing a repeating instance
...
Removed a function call we don't need when editing a repeating instance
2013-12-12 16:47:55 -05:00
Albert Santoni
1577b7c41e
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Use the user timezone in eventFeedAction(), will fix a bug where
shows at the edge of a week can disappear from the calendar if
the user timezone is not the same as the station timezone.
2013-12-12 16:39:20 -05:00
Albert Santoni
27f0fa27e9
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 13:32:25 -05:00
Albert Santoni
a96c2551ef
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
the station timezone. This fixes negative remaining time that could
occur in the embeddable JS Airtime widgets if you were logged in to
Airtime while you viewed your website. (The widgets display in
the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
consistently in the user timezone now.
2013-12-12 13:28:51 -05:00
drigato
f37b9a3796
CC-5634: Can add/remove content to a linked show while one instance is currently playing
...
small logic fix
2013-12-12 13:23:20 -05:00
drigato
fb793ff3e1
CC-5634: Can add/remove content to a linked show while one instance is currently playing
...
Fixed by removing option from context menu
2013-12-12 13:01:33 -05:00
drigato
974be86691
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:48:11 -05:00
drigato
9bbc3cf713
CC-5633: Can schedule overlapping shows
...
The overlapping show check was returning false too early
2013-12-12 11:48:00 -05:00
Albert Santoni
f2fe04ba1d
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:33:28 -05:00
Albert Santoni
8986f1bc4f
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Changed getRangeStartAndEnd() to use UTC explictly
2013-12-12 11:32:40 -05:00
Naomi
37ea29380b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:56:29 -05:00
Naomi
67031a75fe
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 18:56:19 -05:00
Albert Santoni
abf3a50694
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:22:08 -05:00
Albert Santoni
a9bd34fbcb
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Eliminate more strtotime usage, could fix on air light weirdness in
some circumstances.
2013-12-11 18:20:40 -05:00
Naomi
e6c971387b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 17:35:47 -05:00
Naomi
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
drigato
3a50f7a6dc
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 16:55:47 -05:00
drigato
cfb6195523
CC-5632: System preferences don't get saved
2013-12-11 16:55:35 -05:00
Albert Santoni
d575a478b5
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 15:56:03 -05:00
Albert Santoni
4d77d14d33
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Removed strtotime usage from AddShowRepeats.php
2013-12-11 15:54:13 -05:00