Martin Konecny
|
9609a4e220
|
Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
|
2012-11-02 20:16:54 -04:00 |
James
|
9d495ebc03
|
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
- done
|
2012-10-30 17:57:58 -04:00 |
James
|
3e60ac4393
|
remove \r line endings
|
2012-10-30 13:23:09 -04:00 |
Rudi Grinberg
|
dc00528cd5
|
Merged baseUrl related conflicts
|
2012-10-29 11:56:20 -04:00 |
denise
|
3a7700eaac
|
CC-4583: Use AJAX calls instead of refreshing entire page
-done
|
2012-10-26 18:09:30 -04:00 |
denise
|
c51fb8a040
|
CC-4549: Tooltip for source username cannot be shared between input and output settings
-fixed
|
2012-10-22 16:37:06 -04:00 |
denise
|
d32495d100
|
CC-2184: Hardcoded CSS path should be relative path instead
|
2012-10-19 11:09:34 -04:00 |
Daniel James
|
095c2c7cc6
|
CC-4559: More useful tooltip for Find Shows button in Now Playing page
|
2012-10-15 12:41:39 +01:00 |
Daniel James
|
f77ec31a8d
|
CC-4552: Small formatting improvement
|
2012-10-11 17:44:08 +01:00 |
Daniel James
|
843a456b3b
|
CC-4552: Fixed various errors in Support Feedback page
|
2012-10-11 17:03:09 +01:00 |
denise
|
968c719fa1
|
CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
-done
|
2012-10-02 14:12:22 -04:00 |
james
|
8652681eda
|
CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length
- fixed
|
2012-09-19 12:51:03 -04:00 |
denise
|
a75a12a198
|
-smart block criteria UI change for small screen resolution
|
2012-09-14 18:02:40 -04:00 |
denise
|
84deda99c5
|
CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible
-fixed
|
2012-09-14 17:35:14 -04:00 |
denise
|
da107f5120
|
-small UI fix
|
2012-09-14 15:55:55 -04:00 |
denise
|
0524e4e5d2
|
-implemented UI changes for playlist/block/webstream builder
|
2012-09-14 15:49:39 -04:00 |
denise
|
8f48544bb7
|
-implemented UI changes for Now Playing page
|
2012-09-13 17:10:38 -04:00 |
Martin Konecny
|
859445c766
|
CC-3301: Add ability to switch stereo/mono stream in stream settings
-fixed
|
2012-08-29 17:39:24 -04:00 |
denise
|
9d90e8c531
|
CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
-done
|
2012-08-28 16:17:37 -04:00 |
denise
|
69b61c4cfe
|
CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
-fixed
|
2012-08-28 12:13:58 -04:00 |
denise
|
dc8e3da6db
|
CC-4283: Password Reset: Please let user input username they want to reset
-done
|
2012-08-24 12:40:30 -04:00 |
James
|
a24da9e324
|
CC-4256: Smart Playlist: change name to smart block and etc
- done
|
2012-08-20 17:17:48 -04:00 |
James
|
2d80131351
|
CC-4229: Smart Playlist: refactor code
- bug fixes
|
2012-08-15 16:22:56 -04:00 |
James
|
9fc5411895
|
CC-4229: Smart Playlist: refactor code
- done
|
2012-08-15 11:36:41 -04:00 |
denise
|
c62d89d5da
|
CC-4220: Smart Playlists: Change indexing of criteria elements
-changed indexing on UI
|
2012-08-14 10:02:36 -04:00 |
denise
|
c774e3b9bd
|
Smart Playlists: got rid of horitzontal scrolling
|
2012-08-10 10:42:01 -04:00 |
denise
|
e674654cb1
|
CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
-done
|
2012-08-09 17:23:52 -04:00 |
denise
|
823ab1dd41
|
CC-4162: Smart Playlist Builder: extra space in between limit and error message
-fixed
|
2012-08-07 15:20:12 -04:00 |
denise
|
ef994aa449
|
CC-84: Smart Playlists
- block options scroll for small screens
|
2012-08-02 16:40:32 -04:00 |
denise
|
1b1b7e11d0
|
CC-84: Smart Playlists
-fixed spacing of modifier '+' button
|
2012-07-31 10:05:38 -04:00 |
denise
|
e04273c335
|
CC-84: Smart Playlists
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
|
2012-07-29 15:47:42 -04:00 |
denise
|
d7cf50b2f4
|
CC-84: Smart Playlists
- changed error handling and criteria saving to handle same criteria rows
|
2012-07-27 14:32:31 -04:00 |
denise
|
722e470f6f
|
CC-84: Smart Playlists
- changed playlist controller to also handle Blocks
- created new view for smart blocks
|
2012-07-25 11:00:46 -04:00 |
denise
|
c82ea30809
|
CC-84: Smart Playlists
- removed criteria subform and reverted back to original criteria options design
|
2012-07-24 12:12:47 -04:00 |
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
|
c99e1b892c
|
CC-84: Smart Playlists
-divided criteria into sub form to handle multiple sets
|
2012-07-23 10:40:53 -04:00 |
denise
|
9bdb4a40e0
|
CC-84: Smart Playlists
-fixed playlist type spacing on UI
|
2012-07-20 12:32:18 -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
|
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 |
denise
|
a8ca9accdb
|
CC-84: Smart Playlists
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
and vice versa
|
2012-07-17 14:40:52 -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
|
46294c3f40
|
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts:
airtime_mvc/application/forms/SmartPlaylistCriteria.php
|
2012-07-13 16:00:02 -04:00 |
James
|
ae9442d7f5
|
CC-84: Smart Playlists
- editing playlist
|
2012-07-13 15:58:23 -04:00 |
denise
|
b48fb49947
|
CC-84: Smart Playlists
-fixed add/remove behaviour
|
2012-07-13 15:15:11 -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 |