Commit Graph

6226 Commits

Author SHA1 Message Date
Daniel 9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
Naomi Aro e07ad45b1a incorrect path for the new qtip. 2012-02-09 18:07:32 +01:00
paul.baranowski 5200f93bce Updated CREDITS for 2.0.1 2012-02-09 17:10:07 +01:00
Daniel 73555714b8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-08 17:56:42 -05:00
Daniel cdc72beb6b CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
James 9ae0bed01a CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:43:32 -05:00
James 86150a5fba CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:42:42 -05:00
James cd9e7550aa Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 16:23:17 -05:00
James 860a5e4f7e - version string change for 2.0.1 2012-02-08 16:23:01 -05:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
2012-02-08 16:21:57 -05:00
Martin Konecny 0f9d3021cd Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 16:17:35 -05:00
Martin Konecny 6254467e02 CC-3305: 404 Error after meta data edit on Airtime Pro
-Fixed
2012-02-08 16:17:18 -05:00
James a1dfad0c50 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:57:59 -05:00
James ba3cc45d36 CC-3284: Don't make browser users clear their cache when Airtime is upgraded
- use airtime version string instead of filemtime function
2012-02-08 15:57:42 -05:00
Daniel 51f97361bb CC-3289: Widgets should have a version string so users can make sure widgets are up to date
- cleaned up the code, removed comment and added a period to throw message
2012-02-08 15:34:14 -05:00
James af305fce47 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:16:11 -05:00
James 68bec7ac1b Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:15:26 -05:00
James 5b47402ed0 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:14:58 -05:00
Daniel b1a281be4e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 14:59:11 -05:00
Daniel 5d31e4c2a0 CC-3289: Widgets should have a version string so users can make sure widgets are up to date
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
2012-02-08 14:57:48 -05:00
Martin Konecny 09ef22520e CC-3310: Editing metadata of a song shows Artist instead of Creator.
-fixed
2012-02-08 14:15:15 -05:00
Martin Konecny 7df2827178 -remove old install files from install_minimal 2012-02-08 13:44:59 -05:00
Martin Konecny 103b4abdeb Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 11:42:44 -05:00
Martin Konecny 6c0f035b0b CC-3307: airtime-full-install fails on Ubuntu 11.10 2012-02-08 11:42:21 -05:00
Naomi Aro 0402a6ac61 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 17:40:05 +01:00
Naomi Aro 624669a6bf CC-3273 : flash player
mp3 latency problem in firefox needed an extra option set in JPlayer
2012-02-08 17:39:16 +01:00
Martin Konecny 82459d257f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 11:03:25 -05:00
Martin Konecny 799e11921b CC-3307: airtime-full-install fails on Ubuntu 11.10
-fixed
2012-02-08 11:03:11 -05:00
Naomi Aro d257ddf482 CC-3285 : Nowplaying
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +01:00
Naomi Aro 252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +01:00
Naomi Aro c23491b257 CC-3285 : show over booked error message
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
Naomi Aro a2f38b94a2 CC-3174 : showbuilder
changing show context menus
2012-02-08 13:12:08 +01:00
Naomi Aro 581f86a1de CC-3174 : showbuilder
show editing menu added.
2012-02-08 12:53:46 +01:00
Naomi Aro 216ce80ceb CC-3174 : showbuilder
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
Naomi Aro c6addf37ba Merge branch 'CC-3174' into devel 2012-02-08 00:00:48 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
james b08e7787d3 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:37:42 -05:00
james 22a53dd250 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues

Conflicts:

	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-02-07 13:37:27 -05:00
james 951f90adc0 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:35:55 -05:00
james e5a8d65576 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues
2012-02-07 13:35:46 -05:00
Naomi Aro 668e214371 CC-3174 : showbuilder
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
Naomi Aro 529f3fa52f CC-3174 : showbuilder
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
Naomi Aro aa7afce245 CC-3174 : showbuilder
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
Naomi Aro 251f3a3e5b CC-3174 : showbuilder
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
Naomi Aro f651024a6e CC-3174 : showbuilder
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
Martin Konecny da2ab1caa9 Merge branch 'cc-3297-php-db-and-zendframework-external' into 2.0.x 2012-02-06 20:29:12 -05:00
Martin Konecny 5dcb033c84 CC-3297: Depend on zendframework and php-pear as external packages
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05:00
Martin Konecny 51e181b445 CC-3297: Depend on zendframework and php-pear as external packages
-removed pear files
2012-02-06 15:16:57 -05:00
Martin Konecny c229097470 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 15:10:03 -05:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00