Commit graph

386 commits

Author SHA1 Message Date
Martin Konecny
ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
denise
4301a221b7 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
denise
72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -04:00
Martin Konecny
3d243468a7 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-10 10:36:53 -04:00
Martin Konecny
dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny
e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -04:00
denise
c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show
-fixed
2012-07-09 14:50:35 -04:00
denise
1cbb0345b3 improved error message for overlapping shows 2012-07-05 11:33:03 -04:00
denise
1fa3da5bd0 CC-4069: Edit Show -> cannot edit show
-fixed
2012-07-04 18:58:22 -04:00
denise
cbf026412c CC-4056: Add Show -> Prevent shows from overlapping
-done
2012-07-04 11:34:18 -04:00
denise
335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James
c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
without possibility to navigate back gracefully

- done
2012-06-20 18:02:46 -04:00
denise
b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -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
6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -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
denise
f3b925daa2 CC-3412: Icecast stream name not defined
-done
2012-06-12 17:08:36 -04:00
denise
8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -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
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
denise
d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -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
denise
ca8187c9c2 CC-3718: Please enable user to input the mail server settings
-done
2012-06-11 12:53:09 -04:00
denise
b586d69d09 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
-fixed
2012-06-08 11:39:04 -04:00
James
fb48184629 CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past
- fixed
2012-06-07 12:25:21 -04:00
James
3c7f3d52e1 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
- bug fix. In case of this error, we should maintain the original start time.
2012-06-07 12:14:22 -04:00
James
2bf6408d90 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show
- fixed
2012-06-06 18:23:27 -04:00
James
e35692e588 CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing
page after error message appears

- fixed
2012-06-06 16:28:41 -04:00
denise
532b2710f0 CC-3932: Master/Source Source Connection URL should be in non-editable box
-done
2012-06-06 13:10:57 -04:00
denise
226ef262ba CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
-retreived hours and minutes via preg_match()
2012-06-06 10:31:49 -04:00
James
b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a
connection interruption

- done
2012-06-05 16:41:41 -04:00
denise
4bcf904f92 CC-3932: Master/Source Source Connection URL should be in non-editable box
-done
2012-06-05 15:13:04 -04:00
denise
8b71ed6078 CC-3850: Use qTip instead of custom tooltips
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
2012-06-05 14:49:31 -04:00
denise
35be145043 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 14:41:19 -04:00
denise
df3a74b501 CC-3850: Use qTip instead of custom tooltips
-removed description from icecast_vorbis_metadata element
2012-06-05 14:40:40 -04:00
James
51227b4cad CC-3934: Master and Show stream override need to be disabled on airtime-demo
- done
2012-06-05 12:18:59 -04:00
denise
a3754be31a CC-3850: Use qTip instead of custom tooltips
-done
2012-06-05 11:24:40 -04:00
denise
19d5655779 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.
-fixed to only allow 24h or less
2012-06-05 11:19:59 -04:00
denise
f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance
-fixed
2012-05-28 15:41:59 -04:00
Naomi Aro
428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
denise
d0211aaca9 SAAS-208: airtime-system: create a option which can set the live stream connection setting
-done
2012-05-18 19:08:50 -04:00
denise
d7eb9a9d95 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
- changed "Airtime System Email" label on System->Preferences form
2012-05-18 14:50:42 -04:00
denise
8710c00970 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command
-these options are hidden is instance is saas
2012-05-18 12:58:09 -04:00
Paul Baranowski
869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
2012-05-17 17:33:50 -04:00
denise
12be26925e -set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called
-this will keep all the cc_live_log data in tact if support-settings are saved
2012-05-14 15:38:04 -04:00
Naomi Aro
1cc84c1c85 CC-3761 : Calendar->Update Show:Try to input wrong number of Colour, Browser hangs 2012-05-07 14:48:33 +02:00
James
0d5f581e35 CC-3731: Can add a show of zero length
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
Naomi Aro
b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00