Commit graph

239 commits

Author SHA1 Message Date
Martin Konecny
d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
James
332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2012-04-05 16:03:15 -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
ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up
-fixed
2012-04-05 15:49:58 -04:00
Martin Konecny
176e5fdbd7 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 15:30:21 -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
James
ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for
the recorded show

- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -04:00
James
5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on
'When' section

- UI portion of the feature
2012-04-04 14:53:26 -04:00
Naomi Aro
f2a05adf49 CC-3481 : Calendar->AddRemoveShow->Content management dialog can't be moved 2012-04-03 16:23:37 +02:00
Naomi Aro
079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro
eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Martin Konecny
8cb5ccbe41 CC-3516: Creating a show has a long execution time
-cool effect now works under firefox
2012-03-28 23:52:17 -04:00
James
d7819b6dd2 CC-3489: Live Stream: When Custom Auth check box is checked, Custom
Username and Custom Password field must be required

- fixed spacing
2012-03-26 17:21:13 -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
Martin Konecny
0525f182ef CC-3516: Creating a show has a long execution time
-grey out add-show form while busy
2012-03-25 22:56:51 -04:00
Naomi Aro
8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro
7ab0289d12 CC-3360 : timeline css
changed library search width calculation to be in library.js
2012-03-22 23:31:18 +01:00
Naomi Aro
1fdb3cf163 CC-3360 : Timeline Css
adding Css to timeline.
2012-03-22 18:04:22 +01:00
Naomi Aro
7a5054655e CC-3174 : showbuilder
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +01:00
Naomi Aro
b8ca0ef740 CC-3174 : showbuidler
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
Naomi Aro
62c07107c1 CC-3174 : showbuilder
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +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
0ba3049528 CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Martin Konecny
54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Naomi Aro
4f5b5d8562 CC-3174 : Show Content Builder
adding time filled/empty row data.
2012-02-13 18:29:39 +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
c23491b257 CC-3285 : show over booked error message
checking if percentage is over 100.
2012-02-08 15:13:17 +01: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
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
Naomi Aro
a69be24831 CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +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
722306928b CC-3114: Show Content Dialog doesn't display total time
Done
2012-01-04 17:15:15 -05:00
James
9048de16e2 CC-3211: When TimeTicker is open and user clicks on the calendar,
it resets the time value

- There was an extra white space at the end. Trim solved a problem.
2011-12-19 13:20:11 -05:00
James
a23807e0c7 CC-3211: When TimeTicker is open and user clicks on the calendar,
it resets the time value

- fixed
- removed some unnecessary code
2011-12-19 11:39:07 -05:00
james
17e09b64af CC-3210 Show: Date mask does not work when you
"Add This Show" -> "Close" -> "+ Show"

- moved masking function to more appropriate place which also
fixed the bug
2011-12-18 22:55:03 -05:00
james
ce27632ec9 CC-3212: TimeTicker and DateTicker are both open at the same time
on Chrome (13v)

- turn off autoTab option
- removed unnecessary code
2011-12-18 22:42:35 -05:00
james
d97b9ad164 CC-3197: "Add/update show" usability issues
- done.
2011-12-16 15:36:37 -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
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
add6d167e3 CC-3071: Show adding "When" improvements
- fixed
- the issue is that it wasn't incrementing the date.
- rewrote the code(cleaner and more intuitive)
2011-11-22 10:35:01 -05:00
James
bbbdfac21f CC-3071: Show adding "When" improvements
- fixed
2011-11-21 15:01:55 -05:00
james
ad708d9983 CC-2156: Searching for a host and hitting ENTER submits the show form
- done. Had to port the code manually
2011-11-16 18:14:10 -05:00
Yuchen Wang
a0bf7c90ba CC-2436: Save pulldown settings
Fixing the issue of "show entries" dropdown setting not being saved.
After some investigation, it seems like we're destroying the calendar
everytime we modify the dropdown value, and create a new one,
which explains why the new setting is not being saved.

Fixed by moving the code that handles the updating to the place after
we create the new calendar. This makes the code cleaner as well.
2011-11-16 15:52:05 -05:00