Martin Konecny
239a228175
CC-4434: Make Application_Model_Preference::getValue and setValue private methods
...
-small fix
2012-09-14 14:36:31 -04:00
denise
8f48544bb7
-implemented UI changes for Now Playing page
2012-09-13 17:10:38 -04:00
Martin Konecny
a418f5777c
CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
...
-initial commit
2012-09-12 15:43:50 -04:00
denise
8ec9ccedf3
CC-4358: Calendar: Show Content: Undefined Index
...
-fixed
2012-09-05 16:07:40 -04:00
Martin Konecny
122bfc6e97
CC-4070: Built-in help text is wrongly worded about adding files
...
-fixed
2012-09-04 16:25:05 -04:00
Rudi Grinberg
3911662cff
Remove unused function
2012-08-30 16:30:49 -04:00
Martin Konecny
7f8b5ab92e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 17:40:07 -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
5effb253bf
CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
...
-done
2012-08-29 11:38:47 -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
James
2ca4a369b2
CC-4264: Smart Block: Fail to generate block with some unavailable files
...
- fixed
2012-08-24 17:02:37 -04:00
James
c561f36aa1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-24 15:26:27 -04:00
James
baf5460e14
CC-4284: Calendar: AddContentToShow -> "Processing..." message pops up and never goes away
...
- fixed
2012-08-24 15:26:12 -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
denise
9dfbd90e0f
CC-4270: Media Library: Sample Rate is broken to 2 lines in context view
...
-fixed
2012-08-23 13:50:46 -04:00
James
a94039a0c6
CC-4268: Playlist: No "preview" button if a track of the playlist does not exist any more
...
- fixed
2012-08-23 11:32:37 -04:00
James
c2d475e6d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
2012-08-23 10:43:28 -04:00
James
de0aeee594
CC-4254: Library: advanced search on library
...
- initial commit
2012-08-23 10:41:40 -04:00
denise
ef5427d0bc
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-22 14:18:48 -04:00
Martin Konecny
9885374d34
CC-1665: Scheduled stream rebroadcasting and recording
...
-more work to make webstreams behave like playlist creator
2012-08-21 18:55:38 -04:00
denise
d06f02f1f5
CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
...
-fixed
2012-08-21 14:08:30 -04:00
Martin Konecny
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
denise
4cd5dbb926
CC-4205: Smart Playlist Builder: Change text on button mouseovers
...
-changed save button text
2012-08-21 10:42:10 -04:00
Martin Konecny
337e5fec8a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-20 18:36:32 -04:00
Martin Konecny
3230f14231
CC-1665: Scheduled stream rebroadcasting and recording
...
-Fixed delete button on right side of library screen not working
2012-08-20 18:35:10 -04:00
James
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
Martin Konecny
398fbb04db
CC-1665: Scheduled stream rebroadcasting and recording
...
-don't show delete button until a stream has been saved
2012-08-17 17:29:17 -04:00
Martin Konecny
284b028521
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 16:51:45 -04:00
Martin Konecny
4216440670
CC-1665: Scheduled stream rebroadcasting and recording
...
-previewing streams have NaN:NaN:NaN as length
2012-08-17 16:51:23 -04:00
denise
76833344d6
CC-4250: Smart Playlists: Remove save button from form
...
-done
2012-08-17 16:24:11 -04:00
denise
36a080ac13
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 14:30:46 -04:00
denise
e2fe6d4284
CC-4243: Playlist Builder: Remove main fade block if there are no fades to set
...
-fixed
2012-08-17 12:56:45 -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
fa87393ba9
CC-4216: Playlist: 'Close' button for fade in/out is out of the border when it's empty
...
-fixed
2012-08-13 14:53:21 -04:00
Martin Konecny
d84ad78984
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
-play icons are now white, not orange
2012-08-10 12:53:22 -04:00
Martin Konecny
41320d0e5d
CC-1665: Scheduled stream rebroadcasting and recording
...
-remove warning icons from playlists with streams
2012-08-10 12:52:36 -04:00
Martin Konecny
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
Martin Konecny
35e3b3bc02
CC-1665: Scheduled stream rebroadcasting and recording
...
-use mime type so that webstreams can play with invalid filenames
2012-08-10 12:40:28 -04:00
denise
5e1d8eabb3
Smart Playlists: moved Save button from right side to left side
2012-08-10 12:34:45 -04:00
denise
c774e3b9bd
Smart Playlists: got rid of horitzontal scrolling
2012-08-10 10:42:01 -04:00
denise
10ea825536
CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
...
-fixed
2012-08-09 18:24:22 -04:00
denise
321e6c6524
CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view
...
-fixed
2012-08-09 17:55:08 -04:00
denise
23683ccccb
Smart Playlists: changed positioning of error message on click 'Save'
2012-08-09 17:43:12 -04:00
denise
f75cf5ffe2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 17:24:00 -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
Martin Konecny
952f18dc3c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-09 14:39:42 -04:00
Martin Konecny
b53bc36f4f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
James
ef0e800c92
CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
...
- fixed
2012-08-09 14:12:30 -04:00
denise
677d523ef4
CC-4187: Media Library -> Regular Playlist : Use legend instead of label for different elements in context view
...
-done
2012-08-09 11:20:49 -04:00
James
cf1178522a
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- changes made on phtml were cause some errors. fixed.
2012-08-09 10:47:43 -04:00
James
ab19d6f511
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-08 15:29:28 -04:00
James
d1e6f8178b
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
denise
50f9582b95
CC-4179: Media Library -> In brief view of Dynamic Smart Playlist, 'does not contain' will be broken to 2 lines
...
-fixed
2012-08-08 13:24:53 -04:00
James
83917ed894
CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
...
- fixed
2012-08-08 12:23:07 -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
Martin Konecny
0ea66fc33f
CC-1665: Scheduled stream rebroadcasting and recording
...
-ability to edit playlists
2012-08-03 15:59:34 -04:00
denise
2a7c5eef64
CC-84: Smart Playlists
...
- added no-wrap class to qtip
2012-08-02 17:17:44 -04:00
denise
ef994aa449
CC-84: Smart Playlists
...
- block options scroll for small screens
2012-08-02 16:40:32 -04:00
James
028e089c82
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
James
0d2d8218bf
CC-84: Smart Playlists
...
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
Martin Konecny
a146fdcd37
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-02 16:27:00 -04:00
Martin Konecny
9cc152c0ae
CC-1665: Scheduled stream rebroadcasting and recording
...
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
denise
9479aeb3dd
CC-84: Smart Playlists
...
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
denise
ddd6016b28
CC-84: Smart Playlists
...
- qtip cleanup
2012-08-01 16:36:12 -04:00
Martin Konecny
2ef4fd314c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-01 15:37:58 -04:00
Martin Konecny
b9bb87f69d
CC-1665: Scheduled stream rebroadcasting and recording
...
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
denise
bcab41cb86
- 'New User' button text was wrapping onto two lines
2012-08-01 15:30:35 -04:00
denise
13bb036bad
CC-84: Smart Playlists
...
-on criteria qtip limit was displaying more than once
-fixed
2012-08-01 15:00:41 -04:00
denise
7d788c51b2
CC-84: Smart Playlists
...
- added scrolling on qtip
2012-08-01 14:43:52 -04:00
denise
8f063367cc
CC-84: Smart Playlists
...
- qtip cleanup for dynamic playlists
2012-08-01 13:49:16 -04:00
denise
c9afac239a
CC-84: Smart Playlists
...
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
2012-08-01 12:04:48 -04:00
denise
cbbdd5a1fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-31 10:05:50 -04:00
denise
1b1b7e11d0
CC-84: Smart Playlists
...
-fixed spacing of modifier '+' button
2012-07-31 10:05:38 -04:00
Martin Konecny
ab85ab59d9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-30 21:48:25 -04:00
Martin Konecny
7e433b61fb
CC-1665: Scheduled stream rebroadcasting and recording
...
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
James
019d13b4c9
CC-84: Smart Playlists
...
- backend implementation
- UI for blocks within playlist
2012-07-30 17:55:22 -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
Martin Konecny
648b8ae296
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:47:26 -04:00
Martin Konecny
f0f9e8e215
CC-1665: Scheduled stream rebroadcasting and recording
...
-minor fixes
2012-07-27 14:47:15 -04:00
denise
2083d04107
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-27 14:32:39 -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
Martin Konecny
ebed110429
CC-1665: Scheduled stream rebroadcasting and recording
...
-code cleanup
2012-07-26 17:51:47 -04:00
Martin Konecny
c90495d2d3
CC-1665: Scheduled stream rebroadcasting and recording
...
-getting closer to being able to schedule a webstream
2012-07-26 14:49:32 -04:00
Martin Konecny
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
Martin Konecny
be8262b67c
CC-1665: Scheduled stream rebroadcasting and recording
...
-fixed web stream length not showing up correctly
2012-07-26 14:49:32 -04:00
Martin Konecny
8b2facaa96
CC-1665: Scheduled stream rebroadcasting and recording
...
-playlists load contents now correctly identify tracks vs streams
2012-07-26 14:49:32 -04:00
Martin Konecny
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
Martin Konecny
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
James
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -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
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
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
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
denise
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -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
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
James
10fc5038c8
CC-3965: Clarify input/output stream settings by addding appropriate labels
...
- fixed
2012-06-20 17:39:52 -04:00
denise
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
denise
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
denise
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
denise
f3b925daa2
CC-3412: Icecast stream name not defined
...
-done
2012-06-12 17:08:36 -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
5b9add360c
CC-3718: Please enable user to input the mail server settings
...
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
denise
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
denise
16b6f09420
CC-3959: Make default username "source" for master and show inputs
...
-done (just added tooltip)
2012-06-11 14:55:26 -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
532b2710f0
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-06 13:10:57 -04:00
denise
f57d316b6c
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-changed support feedback message
-fixed whitespace in register-dialog.phtml
2012-06-06 11:10:29 -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
5966c7feda
fixed merge conflit
2012-06-05 14:47:11 -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
e3bacba39b
CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES
...
-done
2012-06-05 11:20:00 -04:00
denise
25ff2b3c3a
CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it
...
-added "Back to login screen" link
2012-06-05 11:19:59 -04:00
Martin Konecny
43f57c0f8b
CC-3902: Help -> Getting Started: Step 2 is optional now
...
-fixed
2012-06-03 22:55:49 -04:00
Martin Konecny
54d741972a
CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
...
-fixed
2012-06-03 22:51:23 -04:00
Paul Baranowski
4fec2d3982
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 13:59:34 -04:00
Paul Baranowski
81fb81af74
CC-3904: Help -> about: Year 2011 should be 2012
...
Fixed.
2012-05-30 13:59:06 -04:00
Naomi Aro
6b8adff769
CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show
2012-05-24 15:08:54 +02:00
James
a6dc2adb78
CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
...
you can't even login as admin user
- fixed
2012-05-23 17:14:59 -04:00
Naomi Aro
95003c3571
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:45:42 +02:00
Naomi Aro
78fe946e57
CC-3712 : Trial end date overlaps with Airtime Clock
2012-05-22 12:40:08 +02:00
Naomi Aro
d47514c4db
CC-3845 : General UI cleanup
2012-05-21 18:28:19 +02:00
Naomi Aro
4fe80194b6
CC-3845 : General UI cleanup
2012-05-21 17:07:34 +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
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
Naomi Aro
bb084f5a85
CC-3845 : General UI cleanup
2012-05-18 16:11:22 +02:00
Naomi Aro
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
denise
8ad336858e
CC-3747: Metadata popup should also show the filepath of the track
...
- fixed 'File Path' from breaking into 2 lines in Chrome
2012-05-17 18:53:40 -04:00
Paul Baranowski
6d75b4fc06
The fix for long connection strings in "Add Show" form caused the tooltips to
...
be displayed incorrectly (hidden). Reverted that change.
Fixed display of "Stream URL" in the stream settings.
2012-05-17 18:07:41 -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
Paul Baranowski
228f699943
CC-3609: Stream settings page layout works better now, the two panels
...
are now placed next to each other.
2012-05-17 15:06:14 -04:00
Naomi Aro
ccbe4f1998
CC-3420 : Custom UI for jplayer from CC-3395
...
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
denise
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
James
c9df8e8b15
CC-3722: Create loading indicator for AJAX call when calculating Show length
...
- done
2012-04-26 11:56:14 -04:00
James
cf4101cdcd
CC-3720: Switch order of streams in dashboard
...
- done
2012-04-26 11:22:57 -04:00
Naomi Aro
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
Naomi Aro
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
Naomi Aro
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +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
Naomi Aro
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
denise
64e8640795
CC-3668: Live stream player - volume control needs improved usability
...
-new layout done, mute/un-mute image blurry (need new one)
2012-04-19 12:34:51 -04:00
denise
de89db7c36
CC-3668: Live stream player - volume control needs improved usability
...
-in progress
2012-04-18 18:24:50 -04:00
denise
7659ae6384
added missing bracket on <span>
2012-04-18 12:26:10 -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
denise
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
denise
0b1b7d0e9f
CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer
...
-play/pause removed
2012-04-12 12:25:35 -04:00
James
0ec58f0bc3
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
Denise Rigato
26d13e7184
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-11 11:01:22 -04:00
Denise Rigato
e4fc5fafb5
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-10 16:30:46 -04:00
Naomi Aro
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
James
b32e463350
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- fixed
2012-04-09 12:19:22 -04:00
James
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Martin Konecny
8050a1ce29
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-05 14:45:16 -04:00
Naomi Aro
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
James
ebbaa02210
CC-3514: Playlist-> Metadata list of fields is not matching to that of
...
Playlist->Edit Metadata
- fixed
2012-04-03 18:09:03 -04:00
James
eb8bdabe91
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- fixing user info display
2012-04-03 14:15:15 -04:00
James
a49a3a1d2e
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- master panel UI integration
2012-04-03 11:58:48 -04:00
James
286c240012
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- done
2012-03-30 15:11:24 -04:00
Naomi Aro
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
Naomi Aro
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
Naomi Aro
1b8a967cc0
CC-3174 : timeline
...
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
Naomi Aro
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
Naomi Aro
1e9348f27f
CC-3509: "Add Files" button (make it look better)
2012-03-28 17:50:14 +02:00
james
2bb9b03b19
CC-3507: Live Stream status: naming
...
- naming change on stream setting page
2012-03-28 09:55:04 -04:00
James
44e8e96cc8
CC-3507: Live Stream status: naming
...
- fixed
2012-03-26 17:29:09 -04:00
James
e76f4baf18
CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
...
- done
2012-03-26 15:09:27 -04:00
Naomi Aro
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
James
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
Daniel
4bb0421cf7
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -04:00
James
b7634098d3
CC-3471: Stream setting page looks much worse in Chrome than in Firefox
...
- fixed
2012-03-19 15:02:29 -04:00
Naomi Aro
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
Martin Konecny
5a7a502d45
CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
...
-Done
2012-03-17 15:24:19 -04:00
Daniel
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
Daniel
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
james
559acfd5a1
CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
...
able to control switches and able to kick out connection
- refactoring code
2012-03-15 14:33:59 -04:00
james
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
Naomi Aro
fa1f03ed58
CC-3174 : showbuilder
...
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
Naomi Aro
ae646545c4
CC-3201 : file import more visible
2012-03-15 11:36:32 +01:00
James
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James
2ee4b227fc
CC-3439: Live Stream: Only admin should be able to turn on/of switch and
...
able to see kick out button
- done
2012-03-14 14:43:11 -04:00
James
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
James
e31ac81e74
CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
...
button with new stream source indicator
- Initial commit
2012-03-14 14:43:10 -04:00
James
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
James
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
James
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
james
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
James
ca04a7a686
CC-3224: "On-the-fly" stream rebroadcasting
...
- Form in preference section
2012-03-14 14:41:00 -04:00
Martin Konecny
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Daniel
d713f830cd
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
Naomi Aro
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
Naomi Aro
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Daniel
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
Naomi Aro
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
Naomi Aro
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Daniel
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
Daniel
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
Daniel
b8452928da
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
Daniel
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
Daniel
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
Naomi Aro
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
Naomi Aro
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro
872bd27847
CC-3174 : showbuilder
...
getting rid of useless views.
2012-02-29 18:06:53 +01:00
Naomi Aro
a9e7a70dfb
CC-3174 : showbuilder
...
fix audio preview.
2012-02-29 16:23:41 +01:00
Daniel
9736fd7deb
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
2012-02-27 17:28:06 -05:00
Naomi Aro
19d13889af
CC-3351 : Track length should only show to tenths of a second in the library
...
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Daniel
1677bc6816
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
Updated the logic in Version Notify so that if the currently installed version of airtime is greater then the official version a notification does not appear saying Airtime needs to be updated.
2012-02-22 16:06:06 -05:00
Naomi Aro
c89451f880
CC-3340 : Remove "Search" tab from library view
2012-02-22 21:56:55 +01:00
Naomi Aro
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Naomi Aro
b1fbeeb448
CC-3174 : showbuilder
...
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Naomi Aro
941da1fe44
CC-3174 : showbuilder
...
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
Naomi Aro
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
Naomi Aro
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
Naomi Aro
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
Naomi Aro
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
Naomi Aro
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
Daniel Franklin
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00