Commit Graph

314 Commits

Author SHA1 Message Date
denise 64185dac95 CC-84: Smart Playlists
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
2012-07-23 12:42:00 -04:00
denise 952a584f10 CC-84: Smart Playlists
- form cleanup
2012-07-23 10:45:17 -04:00
denise c99e1b892c CC-84: Smart Playlists
-divided criteria into sub form to handle multiple sets
2012-07-23 10:40:53 -04:00
denise a67b2fa300 CC-84: Smart Playlists
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
denise 9fcc851523 CC-84: Smart Playlists
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
2012-07-19 14:52:39 -04:00
denise 2d8a9188eb CC-84: Smart Playlists
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
2012-07-18 15:48:15 -04:00
denise 7c5291fe0c CC-84: Smart Playlists
- ui cleanup
2012-07-18 11:55:29 -04:00
James 2a38527161 CC-84: Smart Playlists
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
denise 0aae7c75ae CC-84: Smart Playlists
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
James 7c07bf146c Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-17 11:07:38 -04:00
James a4ba776b0f CC-84: Smart Playlists
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
denise e0a674a96c CC-84: Smart Playlists
-added save button for static playlists
2012-07-16 18:24:46 -04:00
denise 1bb97c8603 CC-84: Smart Playlists
- ui clean-up
2012-07-16 14:44:50 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
James ae9442d7f5 CC-84: Smart Playlists
- editing playlist
2012-07-13 15:58:23 -04:00
James 207582eb7e CC-84: Smart Playlists
- temp commit
2012-07-13 14:23:30 -04:00
denise d81253cccc CC-84: Smart Playlists
- send playlist id on generate/save action
- fixed some small UI bugs
2012-07-12 17:19:53 -04:00
denise 31bb07b4f0 CC-84: Smart Playlists
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
denise e8a2f23856 CC-84: Smart Playlists
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise c27b886817 CC-84: Smart Playlists
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise 4842f1a5a1 CC-84: Smart Playlists
-removed limit checkbox
2012-07-11 15:52:46 -04:00
denise 7358b00c81 CC-84: Smart Playlists
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise 5fb0364f2d CC-84: Smart Playlists
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
denise a1ceb4bfa0 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
denise b7cd90bc28 CC-84: Smart Playlists
-created form and view script
2012-07-11 10:42:51 -04:00
Martin Konecny 7ce4934cdc CC-4090: Make code style PSR compliant
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
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
Martin Konecny 06455c65e3 CC-3714: Create show with start time as 0xx:xx will freeze the browser
-fixed
2012-04-25 12:07:58 -04:00
Martin Konecny a291f42112 CC-3716: cannot create show start before 10:00
-fixed
2012-04-25 12:02:06 -04:00
Martin Konecny eec14f9592 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 09:19:26 -04:00
Martin Konecny bf96207849 CC-3714: Create show with start time as 0xx:xx will freeze the browser
-fixed
2012-04-25 09:19:15 -04:00
Naomi Aro 7aeddf5bb0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 12:51:00 +02:00
Naomi Aro 439ebb1128 CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 12:50:21 +02:00
Naomi Aro 4cdfd33044 CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 11:32:43 +02:00
James 2cb17a3b08 CC-3660: Cannot click Airtime Manual link on override info popup
- replaced the popup with qtip
2012-04-24 11:26:22 -04:00
James 3849e944cf CC-3682: System-> Stream - Tooltips on port ranges should be introduced
- fixed
2012-04-19 15:22:02 -04:00
James 92671f5723 CC-3681: the value range for the Master, Show Source posrts should be
corrected (shrinked)

- added validator that check if the value is between 1024 and 49151
2012-04-19 15:18:53 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
James 1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
2012-04-16 18:21:28 -04:00
James d11fca8ac8 CC-3444: Ability to edit currently playing show (end time and permissions
- fixed
2012-04-16 16:48:04 -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
denise b0948e8848 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:01:55 -04:00
Martin Konecny 8303eb728e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 11:54:58 -04:00
Martin Konecny 5a8df0321e CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-12 11:54:51 -04:00
denise 3d156a0516 CC-3612: Stream->Preferences-> inappropriate error message is popped up
-fixed
2012-04-12 10:01:22 -04:00
Martin Konecny bdd3444acf CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-11 16:45:03 -04:00
James c510286614 CC-3596: Playlist->Library->Edit Metadata: Throw exception after
inputing string in "BPM"

- added digit validator
2012-04-11 14:09:51 -04:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
James 56ce2b0da5 - text change on live stream section on show form 2012-04-09 17:04:53 -04:00