Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,539 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

91 Commits

Author SHA1 Message Date
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore 
-done
 2012-03-17 23:51:58 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play 
- done
 2012-03-14 14:43:10 -04:00
James efee025691 CC-3406: Live Stream: Switch off live sources on disconnection 
- done
 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 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
Naomi Aro 99b490129c CC-3174 : showbuilder 
making a dialog on the calendar page.
 2012-03-01 00:19:59 +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 fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Naomi Aro 4691799326 Merge branch 'devel' into CC-3174 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-09 19:41:31 +01:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-08 16:21:57 -05:00
Naomi Aro a2f38b94a2 CC-3174 : showbuilder 
changing show context menus
 2012-02-08 13:12:08 +01:00
Naomi Aro 581f86a1de CC-3174 : showbuilder 
show editing menu added.
 2012-02-08 12:53:46 +01:00
Naomi Aro 216ce80ceb CC-3174 : showbuilder 
have to replace context menus on calendar page.
 2012-02-08 11:16:23 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder 
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
 2012-02-07 23:58:36 +01:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder 
fixing merge, testing that affected functionality still works.
 2012-02-06 11:23:10 +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
james e05e2ea49c CC-3284: Version the javascript directories so that upgrades 
work correctly for clients.

- appended timestamp of last modified time on all js and css file import

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2012-01-27 15:37:53 -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 d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -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
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
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 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
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
Yuchen Wang 329c735ea4 CC-3125: Small capitalization errors on SoundCloud text labels 
Fixed
 2011-11-28 16:20:34 -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
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
Martin Konecny 21bbb983ac CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone 
-fixed
 2011-11-20 14:46:01 -05:00
James e5ac2b75d4 CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to 
recorded show

- fixed.
- extra fix: layout was broken when error is displayed
 2011-11-18 11:36:20 -05:00
Martin Konecny 4f2adc3068 CC-3050: Comb through source code for dates being generated with date() function 
-done
 2011-11-16 14:06:59 -05:00
Naomi Aro 12172e5ad5 CC-3035 : Should be able to resize a show, have it affect all future instances of the show 
added a new resize function to Shows.php,
should not use ShowInstance resize method, since you cannot resize just one instance currently.
 2011-11-16 16:32:04 +01:00
Martin Konecny e5fc5d623d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/DateHelper.php
	airtime_mvc/application/models/Show.php
 2011-11-15 16:14:00 -05:00
Martin Konecny a0217f715f CC-3037: Nowplaying bar not showing current show 
-fixed
 2011-11-15 16:10:45 -05:00
Naomi Aro 4bdf866aca CC-3035 : Should be able to resize a show, have it affect all future instances of the show 
resizing is only working for single instance currently like the past.
 2011-11-15 18:22:21 +01:00
Naomi Aro 6f91a9b107 CC-3046 : Show contents for Rebroadcast in wrong timezone 2011-11-15 15:56:52 +01:00
Martin Konecny fe5191eac1 CC-3042: Disappearing shows from beginning when clicking edit. 
-initial commit
 2011-11-15 00:34:48 -05:00
Yuchen Wang becaf7a152 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 00:35:27 -05:00
Yuchen Wang 1a1db1892f CC-2950: Tell users if they are running an out-of-date version or not 
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
  and store result in db

- created new view helper VersionNotify.php, which queries and calculates version
  difference, then returns the necessary information in html to the view files

- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
  when the version notification icon is clicked, a tooltip is displayed
 2011-11-14 00:34:53 -05:00
Martin Konecny f7fb6ddff0 -better naming of show instance functions 2011-11-11 22:24:37 -05:00
Martin Konecny 42cde33648 CC-3030: Repeating shows is broken in devel branch. 
-working towards using only DateTime objects
 2011-11-11 17:25:49 -05:00
James b04b7ff010 CC-2848: Misc bugs from demo service 
- Handling concurrency issue playlist section and show(canlendar) section
 2011-11-10 15:35:27 -05:00