Commit Graph

6877 Commits

Author SHA1 Message Date
James 63df3d5295 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 10:19:54 -04:00
James 0ad9177dac CC-3648: Airtime Station time is broken
- fixed
2012-04-16 10:19:34 -04:00
denise c61f74b06f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 18:06:16 -04:00
denise 82130560f5 CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
-fixed
2012-04-13 18:05:31 -04:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
James a6f44226b9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 17:18:52 -04:00
James 9cafc91785 CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
play unavailable track leads to platform hanging

- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
Martin Konecny 8442932b7d CC-3520: Change default password of monit
-fix names
2012-04-13 17:07:59 -04:00
Martin Konecny 6a72d6a8e8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 16:58:18 -04:00
Martin Konecny 5a2d55ef84 CC-3520: Change default password of monit
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
denise eff9ca85be CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
-fixed
2012-04-13 16:52:22 -04:00
Martin Konecny 2e4cab45b3 -Logging::log works with arrays 2012-04-13 16:50:54 -04:00
Martin Konecny 377fb509a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 15:23:12 -04:00
Martin Konecny 26be52c459 CC-3462: If destination file already exists in pypo cache, double check if it's the correct file size
-had two copy functions :S
2012-04-13 15:23:01 -04:00
James 3ae8eb9105 CC-3622: When changing location of the stor directory, the "organize"
subfolder is not being created

- fixed
2012-04-13 15:09:59 -04:00
James 36ca2c29fc CC-3634: Media Folder: if file was deleted from file system, and the file was
scheduled in the future, it wasn't marking the file as deleted

- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
James 7a983b52ed CC-3641: Stream Transition: When a song is added to the for the first time
, the transition fade effects fade in

- fixed
2012-04-13 13:25:40 -04:00
James 1bb04296a9 CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
Naomi Aro ef908ee894 CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences) 2012-04-13 11:09:52 +02:00
Martin Konecny 169a4827e4 -cleanup unused variables.
-use lambda functions instead of littering class with small functions
2012-04-12 23:14:02 -04:00
Martin Konecny 00c5ef4331 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 19:12:38 -04:00
Martin Konecny f96b990275 Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
2012-04-12 19:10:17 -04:00
James 6e1bf50009 CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
- fixed
2012-04-12 18:49:24 -04:00
James fd700c225c CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
be remover from server

- RecallByMd5() was checking against all cc_files entries which includes
 deleted files
2012-04-12 17:37:14 -04:00
James 56ceeded86 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:23:42 -04:00
James c706bc32fd CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
- fixed
2012-04-12 17:23:26 -04:00
Martin Konecny 6c17cf6e24 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:23:03 -04:00
Martin Konecny fe3dfb6b0c CC-3635: Pypo needs subsecond accuracy for start time
-Done
2012-04-12 17:21:42 -04:00
James 86718cc58e CC-3628: Media Monitor not sending a delete message to Airtime
- fixed
2012-04-12 17:20:31 -04:00
James d4533ca545 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:19:03 -04:00
James c6ad9462af CC-3634: Media Folder: if file was deleted from file system, and the file
was scheduled in the future, it wasn't getting deleted from Airtime

- fixed a bug
2012-04-12 17:18:45 -04:00
denise 62cd704d1c --added comment 2012-04-12 17:12:43 -04:00
Martin Konecny a594569ddc CC-3625: "Now Playing->delete the current playing items" will stop output of pypo-liquidsoap
-fixed
2012-04-12 17:09:54 -04:00
denise 9d4a474521 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
-fixed
2012-04-12 17:07:27 -04:00
Vladimir b0ac86ba43 CC-3416, style changes 2012-04-12 22:33:54 +02:00
denise fe68d0fc87 CC-3498: Calendar -> Show Content better representation of duration needed
-fixed
2012-04-12 16:25:01 -04:00
James f522c7a7af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 16:17:36 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
2012-04-12 16:17:19 -04:00
Martin Konecny c2db20f004 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-cleanup
2012-04-12 15:10:40 -04:00
Martin Konecny bfed474b7b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:41:18 -04:00
denise a2fedaa3f1 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
-fixed
2012-04-12 13:36:45 -04:00
Martin Konecny 83d78eb0dd -check if exec function is available before using it 2012-04-12 13:36:36 -04:00
denise 7276d3d895 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:34:48 -04:00
Martin Konecny 380094b4cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:29:58 -04:00
Martin Konecny 04718a88ae CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-done
2012-04-12 13:29:49 -04:00
Martin Konecny fbef6aa3c4 -remove reference to deleted meio mask jquery library 2012-04-12 13:11:45 -04:00
denise 0b1b7d0e9f CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer
-play/pause removed
2012-04-12 12:25:35 -04:00
James 4ef18fb00f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:36 -04:00
James c90a8006cc CC-3622: When changing location of the stor directory, the "organize"
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
denise 390f9b44fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:09 -04:00