Commit Graph

866 Commits

Author SHA1 Message Date
Naomi Aro 2956009f42 CC-3451 : Ability to delete the currently playing clip 2012-03-27 14:11:36 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload
-fixed
2012-03-26 19:00:40 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit
-done
2012-03-26 17:59:44 -04:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
James 1ccf63ab0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-22 16:24:38 -04:00
James f8d3a8c8bb CC-3449: Live Stream: Kick out live dj at the end of the show
- PHP side implementation
2012-03-22 16:23:59 -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
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
Naomi Aro e76cffd8b0 CC-3463 : timeline usability
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
Naomi Aro 8105c6571c CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01: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 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
-done
2012-03-17 23:51:58 -04:00
Martin Konecny 9be6f1bd0e CC-3464: Playout forward cache should be configurable
-Done
2012-03-17 14:53:15 -04:00
Daniel 77e1c1c0cb CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled.
-added check to make the code do nothing when a previous, current and next show id aren't specified.
2012-03-16 17:13:32 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -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 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
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 d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting
- testing lisquidsoap
2012-03-14 14:41:00 -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 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting
- Live source is created when only both port and mount point are specified
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
Daniel f399c7adab CC-3426: apache log errors from plupload
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
2012-03-13 17:46:13 -04:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
-added brackets around other if condition
2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
- added brackets to an statement
2012-03-13 11:31:24 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Schedule.php
2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
2012-03-13 10:21:01 -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
Naomi Aro 3145c24ba2 CC-3174 : showbuilder
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
Naomi Aro 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01:00
Naomi Aro 3b32a16813 CC-3174 : showbuilder
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25: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
Naomi Aro c66b55ec17 CC-733 : playout history
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01: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 fe3c340a90 CC-3174 : showbuilder
making library table only scroll on the table part.
2012-03-07 18:27:32 +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
Naomi Aro a4d07b3060 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +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
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
Martin Konecny c0f83a0e02 CC-3387: Error with accessing database on Now Playing view
-fixed
2012-03-06 00:05:06 -05:00
Martin Konecny 0dfcb77f1a CC-3386: array access for "media_played" flag is hardcoded to 0
-fixed
2012-03-05 23:53:25 -05:00
Martin Konecny 348011dbc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 19:03:23 -05:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete
-Done
2012-03-05 19:02:46 -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 a246f85a5b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
Daniel 51f004933b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated icon in library
2012-03-05 19:00:14 -05:00
Daniel 2de81c6027 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated logic removed when doing a rebase with devel
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
Daniel 228a9787a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 10:59:43 -05:00
Martin Konecny df22ab21a6 CC-3359: Now Playing -> Day view has a bug with supporting UTC time
-fixed
2012-03-02 16:32:16 -05:00
Naomi Aro 29b03c1181 CC-3174 : showbuilder
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
Naomi Aro f61afb0216 CC-3373 : Timeline: only lock the currently playing track and the one after 2012-03-02 14:01:02 +01:00
Naomi Aro 6c749075ac CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
chaning column name to playout_status
2012-03-02 12:22:08 +01:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Daniel f8e7d6eae3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 15:35:21 -05:00
Naomi Aro b68204751e CC-3174 : showbuilder
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
Naomi Aro b813ba1035 CC-3174 : showbuilder
making a time filled formatter to take the code out of show builder.
2012-03-01 17:25:37 +01:00
Naomi Aro 1c43edb40b CC-3174 : showbuilder 2012-03-01 17:05:50 +01:00
Naomi Aro 3bfbe036c7 CC-3174 : showbuilder
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
Naomi Aro 0f9800a6bd CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 2012-03-01 14:59:06 +01:00
Naomi Aro f8608f3511 CC-3174 : showbuilder
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
Naomi Aro b7e5bfe4aa CC-3174 : showbuilder
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Daniel 8b540017a5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-29 14:55:30 -05:00
Daniel 1deee3cb65 CC-3365: Airtime API returns a non-null value for next item when there is no next item.
- Improved check for determining if there is another element in the result set which is used to compute the next value.
2012-02-29 14:54:54 -05:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Naomi Aro 4386690b54 CC-3174 : showbuilder
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Martin Konecny a53d856e8d CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-28 14:56:21 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-28 14:43:39 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Daniel 15552319aa CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
Naomi Aro 31abc21aaa CC-3174 : showbuilder
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00
Naomi Aro b5f510de85 CC-3174 : showbuilder
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
Naomi Aro 997782c73c CC-3354 : playlist drag and drop
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
Martin Konecny 4514967ccd CC-3359: Now Playing -> Day view has a bug with supporting UTC time
-fixed
2012-02-27 21:37:23 -05:00
Daniel fc2b18923e CC-3337: Optimize Schedule/get-current-playlist/format/json
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
2012-02-27 18:09:30 -05:00
Naomi Aro 20a82abb23 CC-3174 : showbuilder
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
Naomi Aro 99d3699e71 CC-3174 : showbuilder
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
Naomi Aro 43d67c921d CC-3174 : showbuilder
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro 6ecf2f94b0 CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-27 20:26:47 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Naomi Aro f01a872bea CC-3174 : showbuilder
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro 318a0345bb CC-3174 : showbuilder
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro 9c248bb34d CC-3174 : showbuilder
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
Naomi Aro 4a02d12600 CC-3174 : showbuilder
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
Naomi Aro 36cf8ded18 CC-3174 : showbuilder
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
James 695535ae64 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
Naomi Aro 4286de7b42 CC-3174 : showbuilder
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro 3ff7d1ac18 CC-3174 : showbuilder
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
Naomi Aro c6edfc3208 CC-3174 : showbuilder
removing columns that no longer should be in cc_schedule.

changing cc_files length column to be of type interval.

adding length formatter to showbuilder.
2012-02-24 16:05:01 +01: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
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring
tracks coloured if boundry/over.

needs better colour selection.
2012-02-23 22:23:21 +01:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-23 15:20:24 -05:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny c5c1dce4d6 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-22 17:29:49 -05:00
Naomi Aro a1e8903a64 CC-3174 : showbuilder
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
Naomi Aro bb49914294 CC-3174 : showbuilder
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
Daniel 8bbccb6f44 CC-3338: Optimize week display
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
2012-02-22 14:32:59 -05:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
Daniel 80e33ee533 CC-3337: Optimize Schedule/get-current-playlist/format/json
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
2012-02-22 11:36:48 -05: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 a633d69c8d Merge branch 'CC-3174' into devel 2012-02-20 20:09:49 +01:00
Naomi Aro c0f16fac3c CC-3174 : showbuilder
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
2012-02-20 18:24:04 +01:00
Naomi Aro 17c3cdcfb2 CC-3174 : showbuilder
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
Daniel 664584ec6b CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
- updated the CreateDatatableRows do perform a check and set on the last items end time. If the end time of the last item exceeds the show time's end I set the items end time to the show's end time.
2012-02-17 17:58:19 -05:00
Daniel c7f4b17e81 CC-3331: Optimize "Now Playing" to load in less than 1/2 second
- cleaned up sql statement Schedule's getScheduleItemsInRange
2012-02-17 17:08:47 -05:00
Daniel 5dd94ce12c Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-17 16:49:44 -05:00
Daniel 5cb99e9532 CC-3331: Optimize "Now Playing" to load in less than 1/2 second
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
2012-02-17 16:47:12 -05:00
James 0db3a45fcf SAAS-196: Stats: Check if easy_install installation method detection
is working properly

- fixed
2012-02-17 15:40:37 -05:00
James 2ef6d230f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-17 15:39:50 -05:00
James bb1cdc4a8f SAAS-196: Stats: Check if easy_install installation method detection
is working properly

- fixed
2012-02-17 15:39:31 -05:00
Daniel 6d71ec8c9c CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
2012-02-17 11:13:34 -05:00
Naomi Aro 09ae26a531 CC-3174 : showbuilder
fixing bug moving item to beginning of show
2012-02-17 12:19:42 +01:00
Naomi Aro ac11d8bcf6 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro 9bed56a2c3 CC-3174 : showbuilder
incorrect variable name fixed for updating last scheduled timestamp.
2012-02-17 11:14:44 +01:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
Naomi Aro f14ebce239 CC-3174 : showbuilder
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05: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
Daniel 14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel 14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05: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 eba84ee878 CC-3174 : showbuilder
disabling editing of past/current shows.
2012-02-14 14:44:46 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro 4f5b5d8562 CC-3174 : Show Content Builder
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
Martin Konecny 3df396756f CC-3323: Don't send description text to Full Calendar since it is never used.
-Done
2012-02-13 12:10:23 -05:00
Martin Konecny 5059d13156 -handle case gracefully when pypo hasn't registered with Airtime server yet. 2012-02-12 01:34:53 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05: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
Daniel 9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
Daniel cdc72beb6b CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
Martin Konecny 6254467e02 CC-3305: 404 Error after meta data edit on Airtime Pro
-Fixed
2012-02-08 16:17:18 -05:00
Naomi Aro d257ddf482 CC-3285 : Nowplaying
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +01:00
Naomi Aro 252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +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 529f3fa52f CC-3174 : showbuilder
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
Naomi Aro aa7afce245 CC-3174 : showbuilder
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
Naomi Aro 251f3a3e5b CC-3174 : showbuilder
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
Naomi Aro f651024a6e CC-3174 : showbuilder
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
Naomi Aro d9947b622a CC-3174 : showbuilder
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
Naomi Aro 613006e69c CC-3174 : showbuilder
merge
2012-02-06 12:57:08 +01:00
Naomi Aro e487b4a444 CC-3174 : showbuilder merges
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
Naomi Aro 9e08f857bf CC-3174 : showbuilder
fixing merge with playlist tooltip
2012-02-06 11:59:20 +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 8212624c4a CC-3174 : showbuilder
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +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 6c2475bf1f CC-3174 : showbuilder
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
Naomi Aro e8f2506474 CC-3174 : showbuilder
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +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
Daniel d6bf95500c CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05: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 1deebedf11 CC-3174 : showbuilder
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +01:00
Naomi Aro 0afa904ffe CC-3174 : showbuilder
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +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 7317b1d5af CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 2012-02-02 15:59:35 -05:00
Daniel Franklin 09ccac3384 CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
Daniel Franklin 61fb8a4fb9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05: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
Martin Konecny 11e0f3ead8 CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled" 2012-02-02 14:11:03 -05:00
Naomi Aro 60ac01dd41 CC-3174 : show builder
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
Naomi Aro e001cd24c1 CC-3174 : show builder
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
Naomi Aro 942cfaac25 CC-3174 : show builder
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro f5b2a23eb1 CC-3174 : showbuilder
group add/delete is working
2012-02-01 18:47:08 +01:00
James 4ffe79a286 CC-3290: A file should be removed from playlists if it is removed
through the interface

- fixed
2012-02-01 10:59:04 -05:00
Daniel Franklin 5d02581d38 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
Daniel Franklin d495eac326 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
Naomi Aro 3d502b748f CC-3174 : showbuilder
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
Daniel Franklin de7bbbb479 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
Daniel Franklin 026f49ab31 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
Naomi Aro fbda0e733b CC-3174 : showbuilder
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
Naomi Aro 3f3117cf0e CC-3174 : Show builder
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
Naomi Aro 1080bf692f CC-3277 : Overbooking a show to include 24+ hours of audio
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01: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
Naomi Aro fa872894f3 CC-3259 : change repeating state of show. 2012-01-18 16:21:46 +01:00
James 087d893a60 Merge branch 'airtime-2.0.x' into devel 2012-01-17 14:48:04 -05:00
Naomi Aro 3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +01: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
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
Yuchen Wang 9629e2bbae Merge branch 'group_action_playlist_builder' into devel 2012-01-13 14:21:29 -05:00
Yuchen Wang 258521ffbf CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
2012-01-13 14:17:39 -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
Martin Konecny 79141fa070 CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends
-Fixed
2012-01-12 12:14:38 -05:00
Martin Konecny d1de836a92 -make rabbitmq_host configurable via $_SERVER var (.htaccess etc.) 2012-01-11 16:28:03 -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 ef141625a3 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 14:46:31 -05:00
Yuchen Wang d1d01e55ce CC-1986: Configurable columns for media search
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
Yuchen Wang 7f6d3cd942 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 09:54:55 -05:00
Yuchen Wang 7a27be878b CC-1986: Configurable columns for media search
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
James 61c5355e8a cc-2977: getting close!!! 2012-01-06 15:47:11 -05:00
Yuchen Wang 1c9b134748 CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time
Done
2012-01-04 17:10:14 -05:00
Martin Konecny 7247f75563 SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts
-Done
2012-01-04 14:18:40 -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
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 7086444247 SAAS-94: Phone home metrics: Gather info about streaming setup
- fixed comment
2011-12-19 15:45:44 -05:00
James 018fa1d79c CC-3213: Customer is unable to save Fade Out/Cue out for playlists
- fixed cue out/in issue
2011-12-19 14:55:23 -05:00
Martin Konecny cdcdd9227d -add vhost support 2011-12-19 00:11:45 -05:00
James 7c81fa29eb CC-3192: Problem with web uploads for Airtime 2.0.0 beta2
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
2011-12-14 15:58:26 -05:00
Martin Konecny 9bbe1d14fa -remove persistent connections from DB connections 2011-12-13 17:16:45 -05:00
Naomi Aro e81c14c1db CC-3185 : Live show can be dragged into a future date after the rebroadcasting 2011-12-13 13:04:03 +01:00
Naomi Aro 9275b21f48 CC-3177 : editing a show in the calendar brakes show edit form 2011-12-13 11:10:04 +01:00
Naomi Aro c887fec86b CC-3179 : shows populated date must be timestamp. 2011-12-12 21:11:05 +01:00
Naomi Aro 72952024b7 CC-3177 : editing a show in the calendar brakes show edit form
will only update shows if the duration is 24:00 or less.
2011-12-12 12:11:31 +01:00
Yuchen Wang 83f02c3408 SAAS-57: Add LiveChat to Airtime Pro
Adding client_id getter/setter to preference
2011-12-08 17:23:46 -05:00
James fd10393b01 SAAS-94: Phone home metrics: Gather info about streaming setup
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
2011-12-07 10:31:16 -05: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
Martin Konecny 2bf4c93e5c CC-3160: Once Hardware dropdown is changed, stream information does not refresh
-Fixed one error...a few more to go.
2011-12-04 21:47:11 -05:00
Martin Konecny efbaebbbf5 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
-fixed
2011-12-02 16:22:54 -05:00
Naomi Aro 966dd49610 CC-3094 : Rebroadcast editing problems 2011-12-02 16:24:11 +01:00
Naomi Aro 198340ac67 CC-3094 : Rebroadcast editing problems 2011-12-02 13:31:54 +01:00
Naomi Aro 878fa3461d CC-3094 : Rebroadcast editing problems 2011-12-02 12:06:09 +01:00
Naomi Aro f15429c8d6 CC-3144 : Search box shows Track, Show Contents box shows Genre
replaces track number with genre.
2011-12-01 11:16:29 +01:00
Yuchen Wang 0d4e1d21e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-30 16:12:53 -05:00
Yuchen Wang 0193eec89e CC-3139: Undefined index errors in Live stream player after fresh install
Got SQL syntax mixed up with PHP...
2011-11-30 16:10:40 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05: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
Yuchen Wang 53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
Naomi Aro f1e1b747ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 13:32:05 +01:00
Naomi Aro 5828b2037d CC-3102 : Show Editing, how it uses day of the week 2011-11-26 13:31:42 +01:00
Martin Konecny b16fa16042 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 00:06:29 -05:00
Martin Konecny 317bed8643 CC-3094: Rebroadcast editing problems
-Fixed
2011-11-26 00:06:17 -05:00
Yuchen Wang 41eeefe427 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-25 21:34:05 -05:00
Yuchen Wang f03b875e06 CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.

Fixed by checking modified_instance column; only return it if modified_instance != TRUE
2011-11-25 21:33:42 -05:00
James 267d48f640 SAAS-82: Add "airtime-system --status" command
- add a function that returns just global data of stream setting
2011-11-25 17:33:59 -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
Naomi Aro c21cbeb73b CC-3102 : Show Editing, how it uses day of the week 2011-11-25 16:07:03 +01: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
Naomi Aro 54ef9f2b03 CC-3102 : Show Editing, how it uses day of the week
not sure if this change should be here anymore yet.
2011-11-24 17:10:49 +01:00
Naomi Aro e68d7afa3f CC-3102 : Show Editing, how it uses day of the week 2011-11-24 16:20:17 +01:00
Naomi Aro 5c7828c1f5 CC-3102 : Show Editing, how it uses day of the week 2011-11-24 11:56:24 +01: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
James ab0dc64ba9 CC-3086: When uploading a file to /tmp filename collisions can occur
- mktemp is used to generate temp name within /tmp dir
- it generate temp file when the file gets uploade to /tmp and then copy to
organize folder as original file name
2011-11-23 14:12:14 -05:00
Naomi Aro 87886b039f CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 19:11:48 +01:00
Naomi Aro 685e5e03c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:49:13 +01:00
Naomi Aro 65fb00ad8d CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 18:47:44 +01:00
Martin Konecny 212205b0ff CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days
-fixed.
2011-11-22 18:03:47 -05:00
Yuchen Wang ac74ca2449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 18:04:19 -05:00
Yuchen Wang 86729475f6 CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone
- Converting times to UTC timezone in ApiController before sending them to model functions

- Added utility functions in DateHelper.php

- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
2011-11-21 18:03:56 -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
Martin Konecny 9ab47d5eba CC-3036: Deleted Show instances reappear
-Renamed deleted_instance to modified_instance
2011-11-18 12:20:25 -05:00
Martin Konecny c773c5c674 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-18 11:59:27 -05:00
Martin Konecny f3e1f63226 CC-3060: Apache errors: Undefined index: deleted_instance
-fixed
2011-11-18 11:59:15 -05:00
Yuchen Wang 15c84ddfdb CC-2950: Tell users if they are running an out-of-date version or not
- changed default url to "http://airtime.sourcefabric.org"
2011-11-17 23:25:46 -05:00
Yuchen Wang 52052bd573 CC-2950: Tell users if they are running an out-of-date version or not
- added error checking to curl call
- added regex validation when storing link to latest version
2011-11-17 15:33:29 -05:00
Yuchen Wang eae90862b1 CC-2950: Tell users if they are running an out-of-date version or not
Get rid of hardcoded url for downloading the latest version, and use the url
stored in the stat server instead
2011-11-17 14:10:26 -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 1fd29def27 CC-2436: Save pulldown settings
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
2011-11-16 16:12:58 -05:00
Yuchen Wang 4820bb617b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 15:52:31 -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
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
Martin Konecny a5939afd3f -fix minor typo 2011-11-16 12:59:01 -05:00
Martin Konecny 1e79363263 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 12:35:44 -05:00
Martin Konecny 17e59f61be CC-3036: Deleted Show instances reappear
-Make sure we ignore deleted show instances in
 all areas of Airtime.
2011-11-16 12:35:02 -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
Yuchen Wang fdff88cb76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 12:38:18 -05:00
Yuchen Wang f6f58c9399 CC-3044: Error in system status seen in apache log
- Added check for length > 0 before trying to get property
- Got rid of repeating code
2011-11-15 12:37:54 -05:00