Yuchen Wang
6b7523513e
Merge branch 'group_action_playlist_builder' into devel
2012-01-12 14:28:12 -05:00
Yuchen Wang
186aa9e898
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
Fixed bugs introduced by backend changes from before
2012-01-12 14:27:43 -05:00
Yuchen Wang
4a372715a3
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-12 12:19:05 -05:00
James
d5d4d50a9e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
2012-01-11 12:31:54 -05:00
James
f6f1b143d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-11 12:18:28 -05:00
James
04b48d47cc
CC-2977: Never delete files from the database
...
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
Yuchen Wang
f3ce8e77d1
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 10:42:35 -05:00
Yuchen Wang
cf045652ec
CC-1986: Configurable columns for media search
...
- Fixed some hardcoded array access
- Fix js error in ColReorder
2012-01-11 10:41:58 -05:00
Yuchen Wang
7f6d3cd942
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 09:54:55 -05:00
Yuchen Wang
7d9aa3ca5d
CC-2299: Better column options in playlist/file list on playlist builder
...
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
2012-01-10 09:52:32 -05:00
Yuchen Wang
a1ccb9c42a
CC-1986: Configurable columns for media search
...
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
2012-01-08 10:33:11 -05:00
Yuchen Wang
8833f4462e
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
2012-01-07 23:37:37 -05:00
James
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
Yuchen Wang
1044881666
CC-3114: Show Content Dialog doesn't display total time
...
Somehow this file didn't get committed...
2012-01-05 10:30:37 -05:00
James
5fa92f3d17
- temp commit on group action
2012-01-04 12:47:27 -05:00
Naomi Aro
905775552d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-27 14:34:27 -08:00
Naomi Aro
53d504f26e
CC-3110 : Password reset
2011-12-27 14:33:22 -08:00
james
9216da7f03
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-24 11:03:02 -05:00
james
c9c6a08a1c
CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
...
changed and click save
- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
Martin Konecny
f4449865cc
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-22 17:21:43 -05:00
Martin Konecny
a55b47efff
-Allow etc and stor directories to be configurable
2011-12-22 17:21:18 -05:00
Naomi Aro
52b0e3c5f9
CC-3110 : Password reset
...
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
James
30b192a809
CC-3218: tream-settings: Spaces and other illegal characters should not
...
be allowed in the fields: server, username, password, URL, and mount point
- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
2011-12-21 17:30:42 -05:00
Yuchen Wang
b42d217684
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Show the menu item when the show is rebroadcasting.
2011-12-14 22:21:02 -05:00
Yuchen Wang
7542d86b94
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Fixed by checking if the show is a repeating show.
2011-12-14 10:12:17 -05:00
Naomi Aro
3cd11c696f
CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global"
2011-12-13 12:10:25 +01:00
Naomi Aro
85b2bf6e55
CC-3181 : re-uploaded to soundcloud creates the file name in a different format
2011-12-12 16:04:16 +01:00
Yuchen Wang
343cd8274d
SAAS-57: Add LiveChat to Airtime Pro
...
Forgot to remove the code from ApiController...
2011-12-09 11:25:50 -05:00
Yuchen Wang
c49cd436fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-08 16:46:13 -05:00
Yuchen Wang
201667936c
SAAS-57: Add LiveChat to Airtime Pro
...
Adding code to non-saas side
2011-12-08 16:45:11 -05:00
Naomi Aro
36d9b15435
CC-3150 : Editor box still open with show details for a deleted show
2011-12-08 17:49:00 +01:00
Martin Konecny
73c0408315
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-05 12:56:16 -05:00
James
043f0c29a1
CC-3074: Give users the choice of which hardware sound API they wish to
...
use (instead of hardcoded to ALSA)
- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Naomi Aro
878fa3461d
CC-3094 : Rebroadcast editing problems
2011-12-02 12:06:09 +01:00
Naomi Aro
b7a9e89095
CC-3143 : Allow content to be scheduled in an overlapping show.
...
removing check for scheduling an overlapping show, doesn't make sense with new resize rules.
2011-12-01 11:37:55 +01:00
James
9c65bfeba7
CC-3131: Latency of stream authentication warning in Stream Settings page
...
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
Naomi Aro
01576b33c8
CC-3137 : Cleaning Up Old Playlist Stuff
...
when a user clicks new the intermediate playlist metadata screen in gone now, just can edit title/desciption inline on the main editor.
2011-11-29 16:20:09 +01:00
Naomi Aro
c17be6d938
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 15:30:30 +01:00
Naomi Aro
8646432cce
CC-3038 : Playlists offsets not dynamically updating
...
refreshes view when a cue/fade is set like all other playlist actions
calling function setSPLContent
2011-11-29 15:30:05 +01:00
Yuchen Wang
329c735ea4
CC-3125: Small capitalization errors on SoundCloud text labels
...
Fixed
2011-11-28 16:20:34 -05:00
Martin Konecny
ff998ea6f2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-25 17:36:23 -05:00
Martin Konecny
b1193318ed
CC-3105: Settings dates (the popup select date calendar) shows Today by local machine timezone and not Airtime timezone.
...
-fixed
2011-11-25 17:36:11 -05:00
James
c9644d4a73
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- cleaning up some code
2011-11-25 15:38:29 -05:00
Yuchen Wang
370d6e1fba
CC-3104: Timezone issues in the widget
...
Added is_numeric check
2011-11-24 17:08:52 -05:00
Yuchen Wang
b84c51212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-24 14:05:38 -05:00
Yuchen Wang
276607c302
CC-3104: Timezone issues in the widget
...
For a previous ticket, I changed the code so that both "Today's Program" widget
and "Now Playing" widget both use the liveInfoAction, but forgot that for "Now Playing" widget, it retrieves
the shows within next 48 hours instead of within end of day today...
Fixed by passing GET parameters to liveInfoAction, specify whether we want to retrieve shows within an
interval or end of day. Also added a GET parameter for specifying the number of shows to display.
2011-11-24 13:54:58 -05:00
Naomi Aro
40b99dfc0f
CC-3085 : Repeating shows get added to the wrong days
2011-11-24 19:39:08 +01:00
Martin Konecny
37c89d96d9
CC-3095: Context menu of rebroadcasting show doesn't work
...
-fixed
2011-11-23 18:24:11 -05:00
James
a886b53d74
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- done
2011-11-23 17:03:30 -05:00
James
7ac13d26f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-23 14:12:34 -05:00