denise
9203e8c5d6
CC-3768: Reduce number of columns selected by default on the Playlist Builder screen
...
-fixed
2012-05-07 16:24:59 -04:00
denise
b4d8c72869
CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name
...
-fixed
2012-05-07 16:08:26 -04:00
denise
0a03bba5b7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 15:08:47 -04:00
denise
9a9add9732
SAAS-235: Metrics: "Trial End Date" should be sent to stat server (only for SaaS customers)
...
-done
2012-05-07 15:07:29 -04:00
Martin Konecny
1d245ed79d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:26:00 -04:00
Martin Konecny
c466b946a0
CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
...
-change read permissions on files right after they're uploaded
2012-05-07 13:12:20 -04:00
Naomi Aro
abd63e736a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 18:19:26 +02:00
Naomi Aro
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
denise
bdf314b93a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
denise
3a6a1d8691
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 12:02:15 -04:00
denise
96fa5ac715
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-added soundclound_enabled check
2012-05-07 12:01:36 -04:00
Naomi Aro
6a93a479f8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 17:49:35 +02:00
Naomi Aro
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
denise
678e573e7a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-done
2012-05-07 11:24:40 -04:00
denise
b5db91f0f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 10:22:41 -04:00
Naomi Aro
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
Naomi Aro
1cc84c1c85
CC-3761 : Calendar->Update Show:Try to input wrong number of Colour, Browser hangs
2012-05-07 14:48:33 +02:00
Naomi Aro
41e7150462
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:29:02 +02:00
Naomi Aro
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
Martin Konecny
bd6686a243
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
fixed
2012-05-06 20:45:52 -04:00
Martin Konecny
77bffcd8e9
join function should be static
2012-05-06 20:30:49 -04:00
Martin Konecny
6135660d0f
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
2012-05-06 20:05:14 -04:00
Martin Konecny
4ad3286db2
CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u"
2012-05-06 15:34:41 -04:00
Martin Konecny
adee58bcbc
-better handling of timezones
2012-05-05 22:29:31 -04:00
Martin Konecny
1f214747b2
-catch all exceptions in Preference model and make header 503
2012-05-05 22:29:16 -04:00
Martin Konecny
5204da4502
-new logging class
...
-don't log errors to stdout
-log all errors to /var/log/airtime/zendphp.log
2012-05-05 22:28:52 -04:00
denise
7c06e27e7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 15:58:14 -04:00
denise
f50d7c3c03
SAAS-157:Automated metrics: gather info about soundcloud usage
...
-added soundcloud_enabled option
2012-05-04 15:58:07 -04:00
Martin Konecny
9092b7f725
CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
...
-fixed
2012-05-04 12:47:29 -04:00
Martin Konecny
c85c44dbb4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:40:52 -04:00
Martin Konecny
22c5da1629
CC-3755: Found Exception in apache's error log
...
-Return error code so that python services automatically retry later.
2012-05-04 12:40:44 -04:00
Naomi Aro
7f18f3b329
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 18:16:37 +02:00
Naomi Aro
f78e6eaeca
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:16:10 +02:00
Naomi Aro
025822ce35
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:13:01 +02:00
Martin Konecny
b4cd429204
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:06:41 -04:00
Martin Konecny
65e771d189
CC-3756: Cannot download/preview tracks in Media Library
...
-Fixed
2012-05-04 12:02:42 -04:00
Naomi Aro
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
Naomi Aro
96d2f657f7
CC-3741 : Timeline's cursors looks a little bit far from timeline
2012-05-04 15:49:05 +02:00
Naomi Aro
edaec54a5d
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
...
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
Naomi Aro
12a5f17ff5
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
2012-05-04 11:50:51 +02:00
Martin Konecny
10704be503
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 16:14:03 -04:00
root
80898ec898
CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0
...
-fixed
2012-05-03 16:13:50 -04:00
denise
fe83a57fc8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 13:56:05 -04:00
denise
13e147540d
SAAS-214: "--email" being inserted for "city" field in statistics
...
-fixed quote insertion if string is empty
2012-05-03 13:55:55 -04:00
Naomi Aro
769dfa76af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 18:00:20 +02:00
Naomi Aro
0a17b34885
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-03 18:00:10 +02:00
denise
81d7e0c80f
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed filepath join
2012-05-03 09:59:31 -04:00
Naomi Aro
9b52115abc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 15:04:56 +02:00
Naomi Aro
c2c6e1b114
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
...
updating datatables to stable 1.9.1 release.
optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
2012-05-03 15:04:23 +02:00
denise
37190c25c6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-reverting previous commit
2012-05-02 17:02:05 -04:00
denise
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
denise
0d5b9ebada
CC-3734: Library/Timeline: Use horizontal scrollbar when there isnt enough room for column data
...
-fixed
2012-05-02 11:26:39 -04:00
Naomi Aro
08d939d736
CC-3742 : Library: could be confused by carrying over selected state betwee pages
2012-05-02 14:40:27 +02:00
Naomi Aro
c5f9288aab
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-02 11:15:20 +02:00
Naomi Aro
b5b24ae8f1
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-02 11:14:53 +02:00
James
8a2b9e7221
CC-3746: Calendar: Duration of 24hrs show is 00h 00m
...
- fixed
2012-05-01 17:05:18 -04:00
denise
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
denise
3c53d5c7e6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-01 10:51:28 -04:00
denise
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
James
5ec2408478
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-27 14:07:30 -04:00
James
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
Naomi Aro
f6ff289506
CC-3677 : Tooltips improvements
2012-04-27 15:53:37 +02:00
Naomi Aro
e6b724c45a
CC-3729 : Create same UI for timeline to select checkboxes.
2012-04-27 15:44:40 +02:00
Naomi Aro
d7dcd03de5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-27 14:42:21 +02:00
Naomi Aro
c42aebe5e9
CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none
2012-04-27 14:41:52 +02:00
Naomi Aro
b9e13d3b08
CC-3715 : Library- carry over selected state between pages, be like gmail include select all/none
2012-04-27 11:22:44 +02:00
Martin Konecny
88100e79ad
CC-3725: Make it so that ON-AIR light never goes off between tracks.
...
-fixed
2012-04-26 15:26:07 -04:00
James
c9df8e8b15
CC-3722: Create loading indicator for AJAX call when calculating Show length
...
- done
2012-04-26 11:56:14 -04:00
James
cf4101cdcd
CC-3720: Switch order of streams in dashboard
...
- done
2012-04-26 11:22:57 -04:00
James
0fe4478bb5
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- added exception handling
2012-04-26 10:56:08 -04:00
Martin Konecny
a9d125bc4d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 10:15:40 -04:00
Martin Konecny
9c9abfab8d
CC-3704: No default checked day when creating repeat show
...
better validation of user input
2012-04-26 10:15:30 -04:00
Naomi Aro
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
Naomi Aro
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
James
28d27b8932
CC-3719: "Start time" check will block editing ON AIR show
...
- fixed
2012-04-25 18:01:37 -04:00
James
b5a65ae7e4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 17:22:05 -04:00
James
fe71487fa2
CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
...
switching to Daylight Saving Time)
- fixed
2012-04-25 17:21:25 -04:00
Martin Konecny
e12bd35ee2
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
-use str formatter for padding
2012-04-25 16:39:58 -04:00
Martin Konecny
517013ffc3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 16:21:15 -04:00
Martin Konecny
d04e053814
CC-3704: No default checked day when creating repeat show
...
-fixed
2012-04-25 16:21:03 -04:00
James
5c401cb472
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
- fixed
- moved pad function into common.js
2012-04-25 16:04:36 -04:00
Martin Konecny
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
Martin Konecny
b5bf5e9598
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:08:05 -04:00
Martin Konecny
06455c65e3
CC-3714: Create show with start time as 0xx:xx will freeze the browser
...
-fixed
2012-04-25 12:07:58 -04:00
Martin Konecny
a291f42112
CC-3716: cannot create show start before 10:00
...
-fixed
2012-04-25 12:02:06 -04:00
Naomi Aro
d2448b804f
CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show
2012-04-25 17:09:40 +02:00
Naomi Aro
7e0e631740
CC-3616 : ShowBuilder-> A tooltip remains in the Showbuilder frame permanently
2012-04-25 15:52:11 +02:00
Naomi Aro
9b4c3efe8e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 15:22:51 +02:00
Naomi Aro
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
Martin Konecny
eec14f9592
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 09:19:26 -04:00
Martin Konecny
bf96207849
CC-3714: Create show with start time as 0xx:xx will freeze the browser
...
-fixed
2012-04-25 09:19:15 -04:00
Naomi Aro
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +02:00
Naomi Aro
439ebb1128
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 12:50:21 +02:00
Naomi Aro
4cdfd33044
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 11:32:43 +02:00
Martin Konecny
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
Martin Konecny
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
James
18caafac48
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-24 16:49:26 -04:00
James
957b750d6a
CC-3711: Verify Propel hasn't broken anything with its different handling
...
of boolean columns compared to Pear
- fixed
2012-04-24 16:49:14 -04:00
Martin Konecny
172bbf9d7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-24 16:47:48 -04:00
Martin Konecny
dd72090c3f
CC-3711: Verify Propel hasn't broken anything with its different handling of boolean columns compared to Pear.
...
-fixed in ShowBuilder controller
2012-04-24 16:46:51 -04:00
Martin Konecny
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
James
5be12c0a93
CC-3695: Non-admin user cannot preview the contents
...
- guest doesn't have access to playlist builder, hence allowing DJ, PM and
admin to access the preview.
2012-04-24 15:57:43 -04:00
James
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
James
a41f100545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-24 11:26:39 -04:00
James
2cb17a3b08
CC-3660: Cannot click Airtime Manual link on override info popup
...
- replaced the popup with qtip
2012-04-24 11:26:22 -04:00
Naomi Aro
8020ae0a29
CC-3688 : Make sure timeline knows to refresh itself when a rebroadcast file has been scheduled
...
forgot I commented out the check when fixing something in the past....
2012-04-24 17:21:59 +02:00
Martin Konecny
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
Martin Konecny
5e5ced6fe5
CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system)
...
-fixed
2012-04-22 14:28:02 -04:00
Martin Konecny
4d776772a9
CC-3698: php5-fpm service with airtime pool won't start because of php_admin_value[phar.readonly] = off
...
-fixed
2012-04-22 13:45:38 -04:00
Martin Konecny
6e9b179afc
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
-fixed
2012-04-20 16:57:32 -04:00
Martin Konecny
2a9ea435f2
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 15:37:51 -04:00
Martin Konecny
85bc150159
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 14:46:23 -04:00
Martin Konecny
9d9f9bda40
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 13:11:35 -04:00
Martin Konecny
5aa2339a1d
CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace.
...
-Fixed
2012-04-20 13:11:28 -04:00
denise
558d2e5d9a
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
2012-04-20 13:01:47 -04:00
Martin Konecny
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
Martin Konecny
da8a5296b0
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
denise
4fcb4a530f
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-added README for jquery.contextMenu.js bug fix
2012-04-20 10:21:14 -04:00
Naomi Aro
ed812159c2
Merge branch 'CC-3174' into devel
2012-04-20 16:19:29 +02:00
Naomi Aro
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
denise
9afdbe2fbc
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-consider it wrapped
2012-04-20 10:03:12 -04:00
Naomi Aro
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
Naomi Aro
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
denise
636c40eb11
CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata
...
-fixed
2012-04-19 18:23:30 -04:00
denise
710389a416
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 18:21:45 -04:00
Martin Konecny
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
Martin Konecny
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
paul.baranowski
235997c616
CC-1927 Remove PEAR DB
...
* Removed the DEB package "php-db" from the full install script as it is
no longer needed.
* Missed one call to PEAR::isError()
2012-04-19 16:35:19 -04:00
paul.baranowski
9ec584e90c
CC-1927 Remove PEAR DB
...
Removed remaining references to $CC_DBC
2012-04-19 16:35:19 -04:00
paul.baranowski
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
paul.baranowski
c0da27b445
CC-1927: Remove Pear DB
...
Final touches on install/upgrade scripts, now they are working.
Still need to remove last traces of PEAR throughout the code.
2012-04-19 16:34:14 -04:00
paul.baranowski
95d69a3bbe
CC-1927: Remove PEAR DB
...
Fixed all install/upgrade scripts.
2012-04-19 16:34:14 -04:00
paul.baranowski
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
paul.baranowski
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
James
a482a8fe07
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- done
2012-04-19 15:55:55 -04:00
James
295eab430a
CC-3671: add show on week/day view doesn't get start time/end time filled in
...
- fixed in both day and week view
2012-04-19 15:45:13 -04:00
James
3849e944cf
CC-3682: System-> Stream - Tooltips on port ranges should be introduced
...
- fixed
2012-04-19 15:22:02 -04:00
James
92671f5723
CC-3681: the value range for the Master, Show Source posrts should be
...
corrected (shrinked)
- added validator that check if the value is between 1024 and 49151
2012-04-19 15:18:53 -04:00
Martin Konecny
92f2027fc4
-missing CC_CONFIG global..
2012-04-19 15:06:15 -04:00
Martin Konecny
1e111f176e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 15:03:28 -04:00
Martin Konecny
458aae33a1
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-Removed use of filemtime
-audiopreview is now in correct directory
2012-04-19 15:03:17 -04:00
denise
1dd579d54e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 13:47:33 -04:00
James
ee7829d920
CC-3663: Cannot edit rebroadcast show
...
-fixed
2012-04-19 12:57:13 -04:00
James
32eb80bdeb
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 12:56:31 -04:00
James
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
denise
0f6a72f6f8
CC-3668: Live stream player - volume control needs improved usability
...
-fixed centered volume control
2012-04-19 12:51:36 -04:00
denise
ad769b53d8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-19 12:35:05 -04:00
denise
64e8640795
CC-3668: Live stream player - volume control needs improved usability
...
-new layout done, mute/un-mute image blurry (need new one)
2012-04-19 12:34:51 -04:00
James
a7fc31012f
CC-3689: Remove Edit Show Instance ability
...
- done
2012-04-19 11:29:19 -04:00
James
8bd3a35789
CC-3683: Upgraded database not equivalent to fresh install database part 1
...
- fixed
2012-04-19 11:24:30 -04:00
denise
1b92f82c1f
CC-3668: Live stream player - volume control needs improved usability
...
-un-minified jplayer.blue.monday.css
2012-04-19 10:00:30 -04:00
Martin Konecny
c6222849df
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-comment out questionable css modification
2012-04-18 19:10:14 -04:00
Martin Konecny
bd8ce4b0a7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 19:02:53 -04:00
Martin Konecny
5bea867bec
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
-fixed
2012-04-18 19:02:29 -04:00
denise
de89db7c36
CC-3668: Live stream player - volume control needs improved usability
...
-in progress
2012-04-18 18:24:50 -04:00
denise
8588857def
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed
2012-04-18 16:49:32 -04:00
denise
7de74f2540
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 16:14:04 -04:00
denise
79f3473dfe
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed for Now Playing
2012-04-18 16:13:52 -04:00
James
58f4727f17
CC-3666: Default Playlist fade in/out time is not zero.
...
- fixed
2012-04-18 16:06:23 -04:00
Martin Konecny
70a51f1aca
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 15:45:15 -04:00
James
dacdc4e432
CC-3672: Source switch stays connected if current show is cancelled
...
- fixed
2012-04-18 15:38:47 -04:00
James
d3d6b10528
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 14:03:47 -04:00
James
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
denise
843299361a
Merge branch 'cc-3637-fix-external-source-dashboard-display' into devel
2012-04-18 12:32:21 -04:00
denise
3ddabf5cf7
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
479e112317
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
a7fb8ea3f2
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-semi-fixed
2012-04-18 12:30:37 -04:00
denise
ddf1a6d027
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:30:37 -04:00
denise
1c9871a6ed
fixed whitespace
2012-04-18 12:30:37 -04:00
denise
a58dc95f07
changed "current" label - not perfect
2012-04-18 12:30:37 -04:00
denise
fffaac726c
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-semi-fixed
2012-04-18 12:26:10 -04:00
denise
7659ae6384
added missing bracket on <span>
2012-04-18 12:26:10 -04:00
denise
a7ac80e785
CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source
...
-fixed
2012-04-18 12:26:10 -04:00
denise
ef22a33258
fixed whitespace
2012-04-18 12:26:10 -04:00
denise
91cc633139
changed "current" label - not perfect
2012-04-18 12:26:10 -04:00
James
000f7d549c
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- fixed a bug where variable name wasn't changed
2012-04-18 12:25:10 -04:00
denise
53a85204da
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed (check for array length after explode())
2012-04-17 16:52:59 -04:00
Martin Konecny
64a7a13f79
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 16:25:57 -04:00
Martin Konecny
d258e39b2e
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage.
...
-Remove unecessary "continue;" statements
2012-04-17 16:25:10 -04:00
James
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
James
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
Naomi Aro
467fbc2c4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 19:00:57 +02:00
Naomi Aro
4732c0ad67
CC-733 : Broadcast Log
2012-04-17 18:59:17 +02:00
Martin Konecny
29e24d1847
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 12:24:05 -04:00
Martin Konecny
cdf92b016f
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-undone
2012-04-17 12:23:56 -04:00
Naomi Aro
102bcb1d46
CC-3416 : Create password reset form
2012-04-17 18:16:10 +02:00
Martin Konecny
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
Martin Konecny
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
James
4527da6cdf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:22:03 -04:00
James
1d91d1b11b
CC-3659: Override on Master/Show Source connection needs to have
...
better description about what the override field actually does.
- fixed description
- extra fix:
- using variable instead of hard coded text
- removed unnecessary code
2012-04-16 18:21:28 -04:00
denise
27e5a6db5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:36:19 -04:00
denise
e786514f27
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-fixed
2012-04-16 17:31:16 -04:00
James
da691dcfb7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:29:18 -04:00
James
c08800468f
CC-3658: DJ assigned to the Show can't switch/kick streams
...
- fixed
2012-04-16 17:29:02 -04:00
denise
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
James
2f4861db26
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- added comment
2012-04-16 17:06:06 -04:00
James
d11fca8ac8
CC-3444: Ability to edit currently playing show (end time and permissions
...
- fixed
2012-04-16 16:48:04 -04:00
James
2e811dfef8
CC-3642: System->Streams->DJ URL changes are not reflected in Calendar
...
->LiveStream
- fixed
2012-04-16 15:23:37 -04:00
James
90edd9d1b0
CC-3643: System->Streams - Master URL GUI is broken after overriding URL
...
setting
- fixed
2012-04-16 15:10:01 -04:00
James
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
James
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
Naomi Aro
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
Naomi Aro
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
Naomi Aro
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
Martin Konecny
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
Naomi Aro
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
Naomi Aro
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
James
63df3d5295
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 10:19:54 -04:00
James
0ad9177dac
CC-3648: Airtime Station time is broken
...
- fixed
2012-04-16 10:19:34 -04:00
denise
c61f74b06f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 18:06:16 -04:00
denise
82130560f5
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 18:05:31 -04:00
James
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
James
a6f44226b9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 17:18:52 -04:00
James
9cafc91785
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
...
play unavailable track leads to platform hanging
- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
Martin Konecny
8442932b7d
CC-3520: Change default password of monit
...
-fix names
2012-04-13 17:07:59 -04:00
Martin Konecny
6a72d6a8e8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 16:58:18 -04:00
Martin Konecny
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
denise
eff9ca85be
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 16:52:22 -04:00
Martin Konecny
2e4cab45b3
-Logging::log works with arrays
2012-04-13 16:50:54 -04:00
James
3ae8eb9105
CC-3622: When changing location of the stor directory, the "organize"
...
subfolder is not being created
- fixed
2012-04-13 15:09:59 -04:00
James
36ca2c29fc
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't marking the file as deleted
- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
James
1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
Naomi Aro
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00
James
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
James
fd700c225c
CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
...
be remover from server
- RecallByMd5() was checking against all cc_files entries which includes
deleted files
2012-04-12 17:37:14 -04:00
James
c706bc32fd
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- fixed
2012-04-12 17:23:26 -04:00
James
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
James
c6ad9462af
CC-3634: Media Folder: if file was deleted from file system, and the file
...
was scheduled in the future, it wasn't getting deleted from Airtime
- fixed a bug
2012-04-12 17:18:45 -04:00
denise
62cd704d1c
--added comment
2012-04-12 17:12:43 -04:00
denise
9d4a474521
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 17:07:27 -04:00
Vladimir
b0ac86ba43
CC-3416, style changes
2012-04-12 22:33:54 +02:00
denise
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
James
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
James
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
Martin Konecny
c2db20f004
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-cleanup
2012-04-12 15:10:40 -04:00
Martin Konecny
bfed474b7b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:41:18 -04:00
denise
a2fedaa3f1
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 13:36:45 -04:00
Martin Konecny
83d78eb0dd
-check if exec function is available before using it
2012-04-12 13:36:36 -04:00
denise
7276d3d895
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:34:48 -04:00
Martin Konecny
380094b4cc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:29:58 -04:00
Martin Konecny
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
Martin Konecny
fbef6aa3c4
-remove reference to deleted meio mask jquery library
2012-04-12 13:11:45 -04:00
denise
0b1b7d0e9f
CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer
...
-play/pause removed
2012-04-12 12:25:35 -04:00
James
4ef18fb00f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:36 -04:00
James
c90a8006cc
CC-3622: When changing location of the stor directory, the "organize"
...
ubfolder is not being created.
- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
denise
390f9b44fd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:09 -04:00
Naomi Aro
0486d33e27
Merge branch 'CC-3174' into devel
2012-04-12 18:12:01 +02:00
denise
b0948e8848
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:01:55 -04:00
Naomi Aro
adddd1085c
CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment
...
added a flag whether to check user permissions or not.
2012-04-12 18:00:38 +02:00
Martin Konecny
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
Martin Konecny
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
James
18391604b5
CC-3424: UI Design for new drop down menu
...
- html integration
2012-04-12 10:26:11 -04:00
denise
3d156a0516
CC-3612: Stream->Preferences-> inappropriate error message is popped up
...
-fixed
2012-04-12 10:01:22 -04:00
denise
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
James
0ec58f0bc3
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -04:00
Martin Konecny
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
James
f0be7cc995
- comments and removing logging
2012-04-11 16:06:10 -04:00
James
7986c8d77a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 15:55:10 -04:00
James
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
Vladimir
37250d9508
CC-3250 , new warning icon
2012-04-11 20:43:38 +02:00
James
c510286614
CC-3596: Playlist->Library->Edit Metadata: Throw exception after
...
inputing string in "BPM"
- added digit validator
2012-04-11 14:09:51 -04:00
Vladimir
5291c27c2c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 18:36:56 +02:00
Vladimir
29b8e0f682
CC-3424 , CSS and icon changes for the new context menu. Added icons for all actions
...
Signed-off-by: Vladimir <vladimir.stefanovic@sourcefabric.org>
2012-04-11 18:35:47 +02:00
James
13502b4c08
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 12:27:54 -04:00
James
f82aef2a85
CC-3566: Preferences->"Fade In" is not respected when Show starts
...
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
Martin Konecny
4ff0962b60
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 11:22:07 -04:00
Denise Rigato
26d13e7184
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-11 11:01:22 -04:00
Martin Konecny
a09a31bc88
CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
...
-pypo side fixed
2012-04-10 23:13:52 -04:00
James
1017b4e449
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-10 17:37:15 -04:00
Denise Rigato
e4fc5fafb5
CC-3468: Stream settings: Need detailed tooltip for "override" fields
...
-fixed
2012-04-10 16:30:46 -04:00
James
148fdfb8f9
Merge branch 'CC-3603' into devel
2012-04-10 15:28:38 -04:00
Naomi Aro
428d04d77f
CC-3605 : Create 2.1 upgrades
2012-04-10 18:07:39 +02:00
Naomi Aro
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
Naomi Aro
1dcced18ac
CC-3605 : Create 2.1 upgrades
2012-04-10 14:45:48 +02:00
James
56ce2b0da5
- text change on live stream section on show form
2012-04-09 17:04:53 -04:00
James
32548de639
CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting
...
entire text and typing does not erase the highlighted text.
- removed all the masking
- meioMask is very outdated so it's removed from the project.
2012-04-09 16:35:39 -04:00
James
839a49f3e5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 16:09:28 -04:00
Denise Rigato
7fc575e750
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 15:51:37 -04:00
Denise Rigato
ee0a08be15
CC-3487: Improved restart warning message for stream settings page
...
-fixed
2012-04-09 15:51:17 -04:00
Denise Rigato
516f71c23e
CC-3487: Improved restart warning message for stream settings page
...
-fixed
2012-04-09 15:49:39 -04:00
James
a57f8e2554
CC-3488: Update pop up window for jplayer so the size is exactly the same
...
size as the player.
- done
2012-04-09 15:28:38 -04:00
Martin Konecny
5bc1fe84ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 12:43:46 -04:00
Martin Konecny
54ec6445c6
CC-3606: System->Media Folders-> system seems to search
...
-fixed. Need to check if directory actually exists.
2012-04-09 12:43:40 -04:00
James
b32e463350
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
- fixed
2012-04-09 12:19:22 -04:00
James
6785a373a1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-09 10:50:51 -04:00
James
d035681f35
CC-3596: Playlist->Library->Edit Metadata: Throw exception after
...
inputing string in "BPM"
- added validator on the form
2012-04-09 10:50:32 -04:00
James
064490a2fd
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- temp commit
2012-04-09 10:37:44 -04:00
Martin Konecny
d562a26f4b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-07 22:33:47 -04:00
Martin Konecny
548c4ffb8d
-change it so that user can access API actions if logged in.
2012-04-07 22:28:10 -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
Naomi Aro
35a89e0308
CC-3174 : timeline
2012-04-05 15:52:16 +02:00
Naomi Aro
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
Naomi Aro
cf2813a545
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:56:06 +02:00
Naomi Aro
35d2ded26b
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:47:35 +02:00
James
cde8e07c0b
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- fixed
2012-04-04 16:26:28 -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
Martin Konecny
3be1944fa4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:29:44 -04:00
Martin Konecny
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
James
e5843dc54e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:09:39 -04:00
James
ebbaa02210
CC-3514: Playlist-> Metadata list of fields is not matching to that of
...
Playlist->Edit Metadata
- fixed
2012-04-03 18:09:03 -04:00
Martin Konecny
edcce7432d
CC-3409: System status page times out if monit is not running.
...
-Fixed
2012-04-03 17:38:59 -04:00
James
bcdd27863f
CC-3513: Playlist Builder->Download makes user be redirected to a blank page
...
- fixed
2012-04-03 16:30:54 -04:00
James
4cb64b0eb1
CC-3569: Update total track metric to only report tracks that exist
...
- fixed
2012-04-03 15:53:55 -04:00
James
eb8bdabe91
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- fixing user info display
2012-04-03 14:15:15 -04:00
James
012ecc4698
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 13:53:24 -04:00
James
44e3217f3a
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- fixed order of css insertion.
2012-04-03 13:53:08 -04:00
Naomi Aro
057ca55074
CC-3589 : Send cancel recording message to pypo
2012-04-03 18:43:13 +02:00
Naomi Aro
1da134f967
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-03 18:26:13 +02:00
Naomi Aro
711105aade
CC-3588 : Cancelling Empty Show gives "Invalid Request"
2012-04-03 18:26:04 +02:00
James
a49a3a1d2e
CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
...
- master panel UI integration
2012-04-03 11:58:48 -04:00
Naomi Aro
d2d45dcae6
CC-3587 : index problem in scheduling.
2012-04-03 17:56:50 +02: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
db1287d6ec
CC-3508 : Double Scrollbar in Show Builder menu
2012-04-03 15:19:38 +02:00
Naomi Aro
6c5eb384a5
CC-3508 : Double Scrollbar in Show Builder menu
2012-04-03 14:58:10 +02:00
Naomi Aro
cf4704ad89
CC-3174 : timeline
2012-04-03 12:30:53 +02:00
Naomi Aro
0c2066a90e
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 12:12:50 +02:00
Naomi Aro
09bebaa68b
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 12:07:51 +02:00
Naomi Aro
2f712535ad
CC-3550 : Playlist Library -> Ctrl or Shift selection is not possible
2012-04-03 11:57:53 +02:00
Naomi Aro
5dfaa00c25
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-03 11:15:22 +02:00
Naomi Aro
d27470da99
Merge branch 'CC-3174' into devel
2012-04-03 10:58:39 +02:00
Vladimir
416b9d1dc2
CC-3482
2012-04-02 17:28:05 -04:00
Martin Konecny
1519ada85c
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fix problem when constant isn't defined
2012-04-02 17:28:05 -04:00
Martin Konecny
709f38e4ed
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fixed
2012-04-02 17:28:05 -04:00
Martin Konecny
2e88801dad
CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next
...
-fixed
2012-04-02 17:28:05 -04:00
Naomi Aro
6c25423f4e
CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct
...
removing table tools.
replacing with something simpler that will preserve order on screen.
2012-04-02 19:03:11 +02:00
Naomi Aro
c5b761bff3
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:31:02 +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
Naomi Aro
9f0741a684
CC-3174 : timeline
...
don't highlight empty timeline.
2012-04-02 11:07:28 +02:00
Naomi Aro
ebf530a97c
CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears
2012-04-02 11:02:03 +02:00
James
2395415292
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-30 15:11:54 -04:00
James
286c240012
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- done
2012-03-30 15:11:24 -04:00
Naomi Aro
b5a8db6720
CC-3174 : timeline
2012-03-30 18:15:27 +02:00
Naomi Aro
fcbf547456
CC-3174 : timeline
2012-03-30 18:03:45 +02:00
Naomi Aro
cfb5fbc0c9
CC-3518 : Airtime requires internet access to run
2012-03-30 17:37:21 +02:00
Naomi Aro
6dc9193682
CC-3553 : Now Playing screen-> Tooltip change for "jump to current item" button
2012-03-30 17:26:20 +02:00
Naomi Aro
5242ac45a9
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 17:13:17 +02:00
Naomi Aro
2ab6ea98a6
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 16:33:43 +02:00
Naomi Aro
6ddc8288be
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
2012-03-30 16:04:00 +02:00
Naomi Aro
bb1f94c796
CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized
...
fixing now playing screen.
2012-03-30 15:33:52 +02:00
Naomi Aro
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
Naomi Aro
9e9ae11725
CC-3551 : Change Cue Out for currently deleted track
2012-03-30 12:24:55 +02:00
Vladimir
206a8f111c
CC-3482 and CC-3455
2012-03-30 00:35:49 +02:00
James
5b65b56b93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-29 16:57:49 -04:00
James
7325d51ada
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
Naomi Aro
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
Naomi Aro
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
Naomi Aro
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
Naomi Aro
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
Naomi Aro
1b8a967cc0
CC-3174 : timeline
...
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
Naomi Aro
0746115d2c
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-29 11:06:57 +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
Martin Konecny
bc629bf441
CC-3537: When you try to navigate away while uploading you get a "false" message
...
-fixed
2012-03-28 23:27:31 -04:00
James
4f5d7efaa1
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- done
2012-03-28 15:12:01 -04:00
Naomi Aro
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
Naomi Aro
1e9348f27f
CC-3509: "Add Files" button (make it look better)
2012-03-28 17:50:14 +02:00
Naomi Aro
8910d93c55
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-28 17:30:21 +02:00
Naomi Aro
aca6e995dd
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 17:29:34 +02:00
james
ac35ba5a93
CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
...
- fixed a bug when master and dj port are both empty, it was returnning error
2012-03-28 10:15:54 -04:00
Naomi Aro
fe21abf16d
CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not
2012-03-28 16:14:02 +02:00
james
2bb9b03b19
CC-3507: Live Stream status: naming
...
- naming change on stream setting page
2012-03-28 09:55:04 -04:00
james
478cb57228
CC-3527: Airtime reinstallation-> it would be better to have 'Scheduled Play'
...
thread enabled
- set default data for this switch
2012-03-28 09:48:45 -04:00
Naomi Aro
03c5daa9e7
CC-3534 : Check Scheduling Edge Cases
2012-03-28 14:26:38 +02:00
Naomi Aro
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
Naomi Aro
b70773489a
CC-3534 : Check Scheduling Edge Cases
...
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
James
b935c82b83
CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings
...
- fixed
2012-03-27 17:14:34 -04:00
Naomi Aro
9dbe8a5e5e
CC-3463 : Usability improvements for timeline
2012-03-27 18:40:17 +02:00
Naomi Aro
c1bdc6ff0f
CC-3463 : Usability improvements for timeline
...
working on timeline context menu.
cursor/play functions.
2012-03-27 18:27:58 +02:00
Naomi Aro
d9a42c4e40
CC-3463 : Usability improvements for timeline
2012-03-27 17:47:21 +02:00
Naomi Aro
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
Naomi Aro
dfc6ae6273
CC-3463 : Usability improvements for timeline
...
started to add cursor options to context menu.
2012-03-27 15:46:25 +02:00
Naomi Aro
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
Naomi Aro
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
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
712371bde4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 19:02:05 -04:00
Martin Konecny
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
James
0bdfa74566
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 18:39:24 -04:00
James
7e92b96a67
CC-3507: Live Stream status: naming
...
- fixed css width
2012-03-26 18:39:10 -04:00
Martin Konecny
a50b1ffe73
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 17:59:53 -04:00
Martin Konecny
d7af91f306
CC-3520: Change default password of monit
...
-done
2012-03-26 17:59:44 -04:00
James
44e8e96cc8
CC-3507: Live Stream status: naming
...
- fixed
2012-03-26 17:29:09 -04:00
James
191d0f0e4d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 17:21:30 -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
Martin Konecny
3308cbb7de
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 16:18:43 -04:00
Martin Konecny
ccfa954f0e
CC-3174: Show Content Builder
...
-fixed indentation
2012-03-26 15:43:29 -04:00
James
375be99fbd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-26 15:09:56 -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
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
Naomi Aro
7a6cdeaf10
CC-3174 : timeline
2012-03-26 12:36:06 +02:00
Naomi Aro
5facac4cd6
CC-3174 : timeline
2012-03-26 12:31:35 +02:00
Naomi Aro
91d44847cb
CC-3506 : Timeline: smaller columns for time values
2012-03-26 12:24:16 +02: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
ac9fc9f665
CC-3436 : timeline usability
2012-03-23 18:54:03 +01:00
Naomi Aro
2f287274f6
CC-3463 : timeline usability
2012-03-23 18:33:40 +01:00
Naomi Aro
95f97ccc55
CC-3463 : Usability improvements for timeline
2012-03-23 18:27:47 +01:00
Naomi Aro
a77ac56621
CC-3463 : timeline usability
...
removing auto scrolling to now playing item, bad idea.
2012-03-23 16:46:08 +01:00
Naomi Aro
3ab8c3d57b
Merge branch 'CC-3174' into devel
2012-03-23 16:42:40 +01:00
Naomi Aro
711d1f202a
CC-3463 : Usability of timeline
...
changing buttons to be jquery ui icons.
adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
Naomi Aro
13bbdc327e
CC-3360 : timeline css
...
mistyped selector.
2012-03-23 01:56:56 +01:00
Naomi Aro
8af4f052e0
CC-3360 : timeline css
2012-03-23 01:46:45 +01:00
Naomi Aro
f1d76443ab
CC-3360 : timeline css
2012-03-23 00:11:49 +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
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
James
24260e8908
CC-3408: Live Stream: Check if the selected port is available to use
...
- done
2012-03-22 16:21:23 -04:00
Naomi Aro
da02bb7076
CC-3360 : Timeline Css
2012-03-22 19:15:39 +01:00
Naomi Aro
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
James
b4e9f9699c
CC-3483: Live Stream: default fade in/out for live stream transition
...
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04: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
Daniel
4bb0421cf7
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -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
ff2907823b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-20 11:14:26 +01:00
Naomi Aro
642270998c
CC-3174 : showbuilder
...
adding semi colon.
2012-03-20 11:14:00 +01:00
Martin Konecny
2d6e6b82aa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-19 17:35:38 -04:00
Martin Konecny
d7b05827e6
CC-3477: Apache complains the # symbol is deprecated. Use ; instead
...
-done
2012-03-19 17:35:20 -04:00
Daniel
064f7cf591
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-19 16:14:16 -04:00
Daniel
acf0eb4eb2
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- updated the logic in jplayer to include supplied m4v, but hide the video viewer through the size option.
2012-03-19 16:09:59 -04:00
James
e194ff0dc8
CC-3469: Stream settings: Connection URLs are not generated correctly
...
- done
2012-03-19 16:08:23 -04:00
James
b7634098d3
CC-3471: Stream setting page looks much worse in Chrome than in Firefox
...
- fixed
2012-03-19 15:02:29 -04: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
970c2fc47a
CC-3453 : Playlist
...
fixing description
2012-03-19 14:21:34 +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
Naomi Aro
b5f92dfa93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-19 10:18:52 +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
5a7a502d45
CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
...
-Done
2012-03-17 15:24:19 -04:00
Martin Konecny
9be6f1bd0e
CC-3464: Playout forward cache should be configurable
...
-Done
2012-03-17 14:53:15 -04:00
Daniel
7914b30233
CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
...
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
2012-03-16 18:03:35 -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
Naomi Aro
8925d44252
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-16 11:26:08 +01:00
Naomi Aro
d03e565861
CC-3174 : showbuilder
...
adding more length options to library, these ones should still fit without scrolling the page.
2012-03-16 11:26:03 +01:00
James
5156f8067e
CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
...
able to control switches and able to kick out connection
- refactoring code
2012-03-15 20:52:22 -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
559acfd5a1
CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
...
able to control switches and able to kick out connection
- refactoring code
2012-03-15 14:33:59 -04:00
james
04c2c2f920
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-15 14:29:48 -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
Naomi Aro
6409003b3f
CC-3174 : showbuilder
...
putting qtip on missing file alert.
2012-03-15 16:29:52 +01:00
Naomi Aro
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
Naomi Aro
2beadc9301
CC-3174 : showbuilder
2012-03-15 14:14:02 +01:00
Naomi Aro
fa1f03ed58
CC-3174 : showbuilder
...
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
Naomi Aro
3019cb9c42
CC-3434 : playlist
...
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro
ae646545c4
CC-3201 : file import more visible
2012-03-15 11:36:32 +01:00
James
03c8c10ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 15:26:26 -04:00
James
16c0756d76
CC-3224: "On-the-fly" stream rebroadcasting
...
- css fix
2012-03-14 15:26:07 -04:00
Naomi Aro
94e5a3d423
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 20:10:22 +01:00
Naomi Aro
68a4443c36
CC-3174 : showbuilder
...
changing get to post.
2012-03-14 20:10:10 +01:00
James
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James
2ee4b227fc
CC-3439: Live Stream: Only admin should be able to turn on/of switch and
...
able to see kick out button
- done
2012-03-14 14:43:11 -04:00
James
06e810c35d
CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch
...
status when it restarts
- missed one file from previous commit
2012-03-14 14:43:10 -04:00
James
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
James
e31ac81e74
CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
...
button with new stream source indicator
- Initial commit
2012-03-14 14:43:10 -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
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
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
Naomi Aro
309c6da83d
CC-3440 : Calendar time picker is hidden for day and week views
2012-03-14 18:05:50 +01:00
Naomi Aro
59e0436597
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-14 17:51:00 +01:00
Naomi Aro
eb389d99d2
CC-3434 : Playlist Builder fast deleting
2012-03-14 17:50:48 +01: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
0b82107d28
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-13 14:12:36 -04:00
Daniel
927e5033c8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated detection of ogg or mp3 files
2012-03-13 14:12:14 -04:00
Naomi Aro
dff0265e55
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-13 16:41:19 +01:00
Naomi Aro
7e7820d366
CC-733 : broadcast logs
...
adding table scroll height.
2012-03-13 16:41:06 +01: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
9e850838ca
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
2012-03-13 10:36:11 -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
Naomi Aro
a8d61ff19c
CC-3328 : Scrolling behaviour in Chrome on OSX makes Airtime unusable
2012-03-13 14:19:25 +01:00
Naomi Aro
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01: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
Martin Konecny
926231513e
-remove unused function
2012-03-12 12:24:54 -04:00
Daniel
09b5d9003b
CC-3395 Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated library.js because I lost my changes during merge
2012-03-12 11:57:30 -04:00
Daniel
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -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
Daniel
d713f830cd
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
Daniel
48aeaaf05a
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- merging with devel
2012-03-12 10:20:58 -04:00
Naomi Aro
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
Naomi Aro
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +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
Daniel
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
Naomi Aro
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +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
7a5054655e
CC-3174 : showbuilder
...
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +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
Martin Konecny
5f4738dc7a
CC-3389: Login page says copyright is 2010-2011 rather than 2010-2012
...
-fixed
2012-03-06 11:46:42 -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
64fe303b20
CC-3174 : showbuilder
...
fixing indentation.
2012-03-06 13:35:21 +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
aacbac4757
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Updated functionality so user can play a track and in jplayer and jump around it.
2012-03-05 19:00:14 -05:00
Daniel
7d95e4ffa7
CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip)
...
- added accept ranges header to the response to enable seek ahead in the music file.
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
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
Daniel
6ff24bd1fd
Updated Library logic so I can play a song in the library.
...
Still need to be able to get the song file from the element and
update the playlist builder so its player respects cuein/cueout and fadein/fadeout
2012-03-05 19:00:14 -05:00
Martin Konecny
463fc1ff08
CC-3382: Include jPlayer sources in release tarball for GPL compliance
...
-Done
2012-03-05 16:17:00 -05:00
Naomi Aro
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Daniel
228a9787a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 10:59:43 -05: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
Paul Baranowski
d250e2a297
CC-3380 Better names for items in the System menu
2012-03-02 17:50:52 -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
59b7f4ab56
CC-3174 : showbuilder
...
adding timeout for the now playing song, as well as polling every 20 seconds.
2012-03-02 18:16:44 +01:00
Naomi Aro
f4fac98221
CC-3174 : showbuilder
...
adding back polling.
2012-03-02 17:25:44 +01:00
Naomi Aro
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
Naomi Aro
98d50ae4a7
CC-3174 : showbuilder
...
different width added for dialog builder.
2012-03-02 15:47:50 +01:00
Naomi Aro
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +01:00
Naomi Aro
b358c90cfb
CC-3174 : showbuilder
...
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro
9e1b3e7e6e
CC-3174 : showbuilder
...
edge checking on empty datatables.
2012-03-02 14:16:11 +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
Martin Konecny
508c623850
-remove comments that should not have been committed
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
Martin Konecny
323aec218f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 12:16:04 -05:00
Martin Konecny
d9967b9a77
-function incorrectly capitalized
2012-03-01 12:15:58 -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
Martin Konecny
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05: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
Naomi Aro
872bd27847
CC-3174 : showbuilder
...
getting rid of useless views.
2012-02-29 18:06:53 +01:00
Naomi Aro
a8f53d169b
CC-3174 : showbuilder
...
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
Naomi Aro
a9e7a70dfb
CC-3174 : showbuilder
...
fix audio preview.
2012-02-29 16:23:41 +01:00
Naomi Aro
7c74023ef0
CC-3174 : showbuilder
...
removing ugly dsahed border, keeping height for the library dragging helper.
2012-02-29 16:09:39 +01:00
Naomi Aro
bc1d519408
CC-3174 : showbuilder
...
showing message if some files could not be deleted since they were scheduled.
2012-02-29 16:02:41 +01:00
Naomi Aro
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01: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
Naomi Aro
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
Martin Konecny
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -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
9b639a9b6d
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-28 15:38:57 +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
5972aba46e
CC-3174 : showbuilder
...
changing playlist placeholder to be a li item thanks
to a hack on stack overflow.
2012-02-27 23:58:08 +01:00
Daniel
9736fd7deb
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
2012-02-27 17:28:06 -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
Naomi Aro
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Martin Konecny
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
Naomi Aro
28759a2d34
CC-3354 : timeline drag and drop
...
changing helper to say just the number of items being moved like gtalk.
2012-02-27 16:01:05 +01: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
8ae303de83
CC-3174 : showbuilder
...
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
Naomi Aro
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +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
Naomi Aro
99b3ec6b9c
Merge branch 'CC-3174' into devel
2012-02-24 21:22:46 +01:00
Naomi Aro
66ff3c61c3
CC-3330 : library behaviour.
2012-02-24 21:21:53 +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
Naomi Aro
1c462aa770
Merge branch 'CC-3174' into devel
2012-02-24 19:58:36 +01:00
Naomi Aro
1864447d7e
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
2012-02-24 19:58:06 +01: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
194de3c2bf
Merge branch 'CC-3174' into devel
2012-02-24 18:22:59 +01:00
Naomi Aro
4286de7b42
CC-3174 : showbuilder
...
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro
09ce2bc8c5
Merge branch 'CC-3174' into devel
2012-02-24 16:18:39 +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
b9e99afc5d
Merge branch 'CC-3174' into devel
2012-02-24 16:07:12 +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
0446fcfb25
Merge branch 'CC-3174' into devel
2012-02-24 15:07:38 +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
bc8106c5fa
Merge branch 'CC-3174' into devel
2012-02-24 00:56:46 +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
418326c258
Merge branch 'CC-3174' into devel
2012-02-23 23:12:50 +01:00
Naomi Aro
5364894833
CC-3174 : showbuilder
...
don't want to select empty rows anymore.
2012-02-23 23:12:30 +01:00
Naomi Aro
8b02f3d902
Merge branch 'CC-3174' into devel
2012-02-23 22:54:41 +01:00
Naomi Aro
e0134ed6d1
CC-3174 : showbuilder
...
made width not inline.
2012-02-23 22:54:13 +01:00
Naomi Aro
9c6bd4bf4d
Merge branch 'CC-3174' into devel
2012-02-23 22:24:17 +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
Paul Baranowski
e99b23434e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-23 15:24:40 -05:00
Paul Baranowski
1682ce8879
Updated copyright date.
2012-02-23 15:24:20 -05: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
d93041edb9
CC-3174 : showbuilder
...
change default value to prevent apache error logs.
2012-02-23 18:06:08 +01: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
Naomi Aro
b357b80054
CC-3174 : showbuilder
...
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.
starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro
aabcaafff0
CC-3174 : showbuilder
...
nowplaying uses current datatables.
2012-02-23 11:10:49 +01:00
Naomi Aro
4bc51cbad1
CC-3174 : showbuilder
...
forgotten unused var.
2012-02-23 11:01:52 +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
Daniel
1677bc6816
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
Updated the logic in Version Notify so that if the currently installed version of airtime is greater then the official version a notification does not appear saying Airtime needs to be updated.
2012-02-22 16:06:06 -05:00
Naomi Aro
c89451f880
CC-3340 : Remove "Search" tab from library view
2012-02-22 21:56:55 +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
2ac4940fd5
CC-3339 : showbuilder column names
2012-02-22 15:57:21 +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
2aae318a5a
CC-3174 : showbuilder
...
remembering state for the timeline datatable.
2012-02-22 12:42:24 +01:00
Naomi Aro
5703508beb
CC-3174 : showbuilder
...
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
2012-02-22 11:43:37 +01:00
Naomi Aro
5f89975c64
CC-3174 : showbuilder
...
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
Naomi Aro
9b5a0fc565
CC-3174 : showbuilder
...
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
Naomi Aro
378d3d3ef4
CC-3174 : showbuilder
...
group drag and drop for playlist.
2012-02-20 20:44:35 +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
44dccf15ce
CC-3335 : Timeline - Drag and drop usability improvements
...
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +01: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
238abd6f87
CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined
2012-02-13 12:24:55 -05: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
fbd6df1986
CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
2012-02-12 15:31:17 -05:00
Martin Konecny
8493180243
CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
...
-use clearstatcache function
2012-02-12 11:43:34 -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
Martin Konecny
babfa1830c
CC-3317: PHP Undefined variable error in SystemstatusController
...
-fixed
2012-02-10 13:12:18 -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
a4a41f301f
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-09 15:05:36 -05:00
Daniel
b603726a39
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
2012-02-09 15:04:52 -05: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
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
Naomi Aro
e07ad45b1a
incorrect path for the new qtip.
2012-02-09 18:07:32 +01:00
Daniel
73555714b8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-08 17:56:42 -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
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
Martin Konecny
0f9d3021cd
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 16:17:35 -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
James
ba3cc45d36
CC-3284: Don't make browser users clear their cache when Airtime is upgraded
...
- use airtime version string instead of filemtime function
2012-02-08 15:57:42 -05:00
Daniel
b1a281be4e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 14:59:11 -05:00
Daniel
5d31e4c2a0
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
2012-02-08 14:57:48 -05:00
Martin Konecny
09ef22520e
CC-3310: Editing metadata of a song shows Artist instead of Creator.
...
-fixed
2012-02-08 14:15:15 -05:00
Martin Konecny
103b4abdeb
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 11:42:44 -05:00
Martin Konecny
6c0f035b0b
CC-3307: airtime-full-install fails on Ubuntu 11.10
2012-02-08 11:42:21 -05:00