Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6223 commits 3 branches 0 tags 405 MiB
Commit graph

382 commits

Author SHA1 Message Date
James
2027db3609 SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:12:19 -05:00
Naomi Aro
ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
Yuchen Wang
93dfb253c1 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-18 10:28:41 -05:00
James
087d893a60 Merge branch 'airtime-2.0.x' into devel 2012-01-17 14:48:04 -05:00
James
3a8ba36e0d SAAS-155: Add possibility to show additional information on 
login page (for demo site)

- username and password are auto filled on demo site
- added informative msg on demo site about username and password
 2012-01-17 14:47:26 -05:00
Naomi Aro
424206b9a9 CC-3174 : Show Builder 
data tables column resizing, starting separating out events.
 2012-01-17 11:18:17 +01:00
Martin Konecny
54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro
df33a457b1 Merge branch 'devel' into CC-3174 2012-01-16 09:58:02 +01:00
Naomi Aro
859213b760 CC-3174 Show Builder 
experimenting
 2012-01-16 09:56:57 +01:00
James
c82394b7a0 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:57:02 -05:00
James
ccef97190a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:56:29 -05:00
James
bcbbf42f62 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:56:02 -05:00
Yuchen Wang
d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -05:00
James
41b072b412 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-12 17:55:25 -05:00
James
08a09e4096 CC-2977: Never delete files from the database 
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
 2012-01-12 17:55:05 -05:00
James
09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James
04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- fixed
 2012-01-12 16:36:14 -05:00
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
Martin Konecny
c3430e5411 -various optimizations 2012-01-09 17:47:58 -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
Martin Konecny
14b7fd03bb -remove show-recorder from status page if saas enabled. 2012-01-04 18:57:28 -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