0aae7c75ae
CC-84: Smart Playlists
...
- added shuffle button
- moved all callbacks into one function
2012-07-17 15:32:26 -04:00
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
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
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
e0a674a96c
CC-84: Smart Playlists
...
-added save button for static playlists
2012-07-16 18:24:46 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
601263b7a0
CC-84: Smart Playlists
...
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -04:00
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
ae9442d7f5
CC-84: Smart Playlists
...
- editing playlist
2012-07-13 15:58:23 -04:00
b48fb49947
CC-84: Smart Playlists
...
-fixed add/remove behaviour
2012-07-13 15:15:11 -04:00
971b4cf7cf
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-13 14:32:31 -04:00
bf46605ea1
CC-84: Smart Playlists
...
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
fcc4c1f9af
CC-84: Smart Playlists
...
-fixed merge conflict
2012-07-13 14:26:17 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
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
64857410a6
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 15:28:11 -04:00
f0134ba3fa
CC-84: Smart Playlists
...
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
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
470fef80ba
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-12 12:05:51 -04:00
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
393495433f
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:17:22 -04:00
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
d52c079606
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 16:14:59 -04:00
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
4842f1a5a1
CC-84: Smart Playlists
...
-removed limit checkbox
2012-07-11 15:52:46 -04:00
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
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
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
646e028037
Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
2012-07-11 10:47:14 -04:00
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
a1ceb4bfa0
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
b7cd90bc28
CC-84: Smart Playlists
...
-created form and view script
2012-07-11 10:42:51 -04:00
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
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
dc2b4fed0a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-10 10:19:35 -04:00
00a2a19833
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-09 23:41:00 -04:00
e91c96b90e
CC-4090: Make code style PSR compliant
...
StreamSetting.php
2012-07-09 23:32:21 -04:00
6369c85ed1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-09 14:50:49 -04:00
c6c0a70152
CC-4075: Calendar -> Can create overlapping show by repeating show
...
-fixed
2012-07-09 14:50:35 -04:00
c279e008d0
Merge branch '2.1.x' into devel
2012-07-06 15:52:09 -04:00
63856ea918
CC-4079: Apache error: missing $startDt variable
...
- fixed
2012-07-06 15:40:16 -04:00
e4fb42cbd0
CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
...
-done
2012-07-06 15:26:51 -04:00
denise
James
Martin Konecny