Commit Graph

7919 Commits

Author SHA1 Message Date
Martin Konecny 24cf9600e2 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-18 13:27:34 -04:00
denise b742033647 - Add Media: fix to accept audio files with ID3 tags liquidsoap complains about 2012-06-18 12:24:13 -04:00
denise f3d0f06397 - Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x) 2012-06-18 12:00:54 -04:00
denise ad978c7843 Merge branch '2.1.x' into devel 2012-06-18 11:23:42 -04:00
Martin Konecny c8559cc88c 2.1.2 preparation 2012-06-17 23:44:36 -04:00
Martin Konecny ff35322ae9 CC-3988: Pypo: pypo doesn't update last schedule update time when pyp… 2012-06-17 23:24:15 -04:00
Martin Konecny e26ea19fdb Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-17 22:53:25 -04:00
Martin Konecny 142289146e better naming of function in upgrade script 2012-06-17 22:53:19 -04:00
James 53af1928cf CC-3988: Pypo: pypo doesn't update last schedule update time when pypo pulls
schedule from the server

- fixed
2012-06-15 21:31:08 -04:00
denise 186b8ef1c2 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-fixed
2012-06-15 16:48:51 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise bb54a9041f CC-3986: 'Add User' does not convert email address to lowercase
-done
2012-06-15 15:03:48 -04:00
denise 87faf47c94 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-15 14:42:37 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-15 12:16:19 -04:00
James 81fb7699a4 CC-3985: Email field on User creation should be required.
- done
2012-06-14 16:11:14 -04:00
James 73a7a76078 Merge branch 'CC-3963' into 2.1.x
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
denise 70bfe031ef Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-14 13:44:56 -04:00
denise f433fd89fe CC-3970: Password Reset: No UI error msg for no mail server founded
-done
2012-06-13 16:04:57 -04:00
denise dbd6b7444b CC-3921: Add mobile phone number field to user record
-committing Doctrine migartion file for new cell_phone column
2012-06-13 14:48:24 -04:00
James b07b83f740 CC-3981: Record Show: Change streams settings during recording will
cause record fail

- added warning message
2012-06-13 14:44:38 -04:00
denise 9cabd4d32c CC-3921: Add mobile phone number field to user record
-done
2012-06-13 13:39:54 -04:00
James 4077858c8e CC-3927: Should automatically switch back to Master/Show stream if there
is a connection interruption

- chaning label and description text
2012-06-13 12:46:26 -04:00
Martin Konecny 1b5ad43197 upgrade script for 2.1.1 2012-06-13 12:37:56 -04:00
denise 3f0a06ee2b CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done
2012-06-13 12:23:00 -04:00
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -04:00
denise 9b31a6daac Merge branch '2.1.x' into devel 2012-06-13 10:10:05 -04:00
Martin Konecny 02b6d04952 CC-3956: PHP script can enter inifinite loop
-small cleanup
2012-06-12 20:18:06 -04:00
Martin Konecny d1c224321b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 18:51:31 -04:00
Martin Konecny b858c34526 CC-3956: PHP script can enter inifinite loop
-fixed
2012-06-12 18:51:22 -04:00
James 776e35dfa9 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 17:49:52 -04:00
James 548a6ce16a CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday
- bug fix
2012-06-12 17:49:34 -04:00
denise f27fbc14f7 CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done (falls back to stream name)
2012-06-12 17:40:00 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined
-done
2012-06-12 17:08:36 -04:00
James 032637049d CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker
open, the change will not take effect

- fixed
2012-06-12 17:07:24 -04:00
denise 8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -04:00
denise 55634ddd46 CC-3928: Use liquidsoap to test whether file is playable on upload.
-done
-tests return value and output
2012-06-12 15:41:10 -04:00
James 57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically
enable source when DJ connects.

- done
2012-06-12 15:38:03 -04:00
denise df518fb03f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 14:58:51 -04:00
denise 8a63478c73 CC-3972: it is not possible to select tracks in Now Playing tab
-fixed
2012-06-12 14:58:33 -04:00
denise b588b3b9a4 CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving
-set track_number as a required field on form
2012-06-12 14:40:18 -04:00
Martin Konecny 22453f3820 CC-3968: Cannot preview file as * .MP3
-fixed
2012-06-12 11:31:10 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise d8a1a17f19 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 18:08:47 -04:00
denise 81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
-fixed
2012-06-11 18:08:36 -04:00
Martin Konecny 2ebf149a65 CC-3949: On edit empty show, time_filled becomes null
fix method of checking null
2012-06-11 17:08:17 -04:00
denise 1b057c8954 Merge branch '2.1.x' into devel 2012-06-11 16:49:03 -04:00
denise 0d770e55ef Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 16:43:35 -04:00
denise ebaff793be CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
-fixed (had to apply custom changes to new version of fullcalendar.js)
2012-06-11 16:43:24 -04:00