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
eba84ee878
CC-3174 : showbuilder
...
disabling editing of past/current shows.
2012-02-14 14:44:46 +01:00
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
4f5b5d8562
CC-3174 : Show Content Builder
...
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
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
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
5059d13156
-handle case gracefully when pypo hasn't registered with Airtime server yet.
2012-02-12 01:34:53 -05:00
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
babfa1830c
CC-3317: PHP Undefined variable error in SystemstatusController
...
-fixed
2012-02-10 13:12:18 -05:00
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
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
a4a41f301f
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-09 15:05:36 -05:00
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
4691799326
Merge branch 'devel' into CC-3174
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2012-02-09 19:41:31 +01:00
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
e07ad45b1a
incorrect path for the new qtip.
2012-02-09 18:07:32 +01:00
73555714b8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-08 17:56:42 -05:00
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
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
0f9d3021cd
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 16:17:35 -05:00
6254467e02
CC-3305: 404 Error after meta data edit on Airtime Pro
...
-Fixed
2012-02-08 16:17:18 -05:00
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
b1a281be4e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 14:59:11 -05:00
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
09ef22520e
CC-3310: Editing metadata of a song shows Artist instead of Creator.
...
-fixed
2012-02-08 14:15:15 -05:00
d257ddf482
CC-3285 : Nowplaying
...
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +01:00
252777c3f9
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 15:14:33 +01:00
c23491b257
CC-3285 : show over booked error message
...
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
a2f38b94a2
CC-3174 : showbuilder
...
changing show context menus
2012-02-08 13:12:08 +01:00
581f86a1de
CC-3174 : showbuilder
...
show editing menu added.
2012-02-08 12:53:46 +01:00
216ce80ceb
CC-3174 : showbuilder
...
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
3728ffaddc
CC-3174 : showbuilder
...
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1
need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
668e214371
CC-3174 : showbuilder
...
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
529f3fa52f
CC-3174 : showbuilder
...
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
aa7afce245
CC-3174 : showbuilder
...
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
251f3a3e5b
CC-3174 : showbuilder
...
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
f651024a6e
CC-3174 : showbuilder
...
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
5dcb033c84
CC-3297: Depend on zendframework and php-pear as external packages
...
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05:00
51e181b445
CC-3297: Depend on zendframework and php-pear as external packages
...
-removed pear files
2012-02-06 15:16:57 -05:00
c229097470
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 15:10:03 -05:00
58b4576ae1
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
613006e69c
CC-3174 : showbuilder
...
merge
2012-02-06 12:57:08 +01:00
e487b4a444
CC-3174 : showbuilder merges
...
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +01:00
776d1b65e8
CC-3174 : showbuilder
...
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
8212624c4a
CC-3174 : showbuilder
...
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
fbec92cb0d
CC-3174 : showbuilder/library
...
soundcloud icon stuff is back.
2012-02-05 19:48:23 +01:00
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
da5e1ac302
CC-3174 : showbuilder/library
...
adding new context menu, link to view on soundcloud doesn't seem to work.
2012-02-05 13:56:07 +01:00
e8f2506474
CC-3174 : showbuilder
...
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
bdc9707052
CC-2970 : playlist drop indicator
...
looking into customizing the placeholder, connected library to playlist sortable.
2012-02-04 02:07:32 +01:00
d6bf95500c
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05:00
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
1deebedf11
CC-3174 : showbuilder
...
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +01:00
0afa904ffe
CC-3174 : showbuilder
...
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
7317b1d5af
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
2012-02-02 15:59:35 -05:00
09ccac3384
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
61fb8a4fb9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
0fee577c67
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:13:04 -05:00
11e0f3ead8
CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled"
2012-02-02 14:11:03 -05:00
60ac01dd41
CC-3174 : show builder
...
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
e001cd24c1
CC-3174 : show builder
...
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
0199f572bd
CC-3174 : showbuilder
...
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
942cfaac25
CC-3174 : show builder
...
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
3aab811a3e
CC-3174 : showbuilder
...
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
f5b2a23eb1
CC-3174 : showbuilder
...
group add/delete is working
2012-02-01 18:47:08 +01:00
df73726961
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:10:31 -05:00
026bdebacc
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:09:59 -05:00
3643c9caaf
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 11:44:20 -05:00
4ffe79a286
CC-3290: A file should be removed from playlists if it is removed
...
through the interface
- fixed
2012-02-01 10:59:04 -05:00
5d02581d38
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
d495eac326
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
8e40c95e9a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 10:57:38 -05:00
b2ed751e9e
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-31 21:24:23 -05:00
7ee17ba07e
CC-3291: Airtime is missing Australia and Arctic timezones
...
-fixed
2012-01-31 21:24:01 -05:00
3d502b748f
CC-3174 : showbuilder
...
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
de7bbbb479
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
026f49ab31
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
fbda0e733b
CC-3174 : showbuilder
...
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
b644a94363
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-30 16:29:50 -05:00
80970efa9c
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:29:35 -05:00
c5f3e40397
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:28:27 -05:00
e05e2ea49c
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
9f2d0fc8d5
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
2012-01-27 15:30:44 -05:00
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
5026da56cb
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
192c30bacc
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-25 14:12:42 -05:00
2027db3609
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05:00
1080bf692f
CC-3277 : Overbooking a show to include 24+ hours of audio
...
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01:00
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
863de54fc8
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 10:29:19 -05:00
93dfb253c1
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-18 10:28:41 -05:00
cc20db5d30
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 16:22:22 +01:00
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
07bd5dacae
Improved tooltip for Stream Settings: Icecast Vorbis Metadata
2012-01-17 16:03:41 -05:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
3a8ba36e0d
SAAS-155: Add possibility to show additional information on
...
login page (for demo site)
- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
ff428d2c4f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-17 11:35:48 -05:00
dae7e73a84
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- initial commit
2012-01-17 11:35:31 -05:00
3588cca654
CC-3258 : Deleting a rebroadcasting show deletes also the recorded show
2012-01-17 14:11:12 +01:00
a69be24831
CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
...
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
df33a457b1
Merge branch 'devel' into CC-3174
2012-01-16 09:58:02 +01:00
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01:00
c82394b7a0
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:57:02 -05:00
ccef97190a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-13 16:56:29 -05:00
bcbbf42f62
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:56:02 -05:00
d753b0bb02
CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?"
...
Done
2012-01-13 16:46:37 -05:00
9629e2bbae
Merge branch 'group_action_playlist_builder' into devel
2012-01-13 14:21:29 -05:00
258521ffbf
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
2012-01-13 14:17:39 -05:00
41b072b412
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-12 17:55:25 -05:00
08a09e4096
CC-2977: Never delete files from the database
...
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
09d50e7e25
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-12 16:38:21 -05:00
04b592b831
CC-3245: upgrade 1.8->2.0 cause error in show recorder
...
- fixed
2012-01-12 16:36:14 -05:00
044f511455
SAAS-141: Tweaks for trial balloon
...
Done
2012-01-12 15:47:08 -05:00
6b7523513e
Merge branch 'group_action_playlist_builder' into devel
2012-01-12 14:28:12 -05:00
186aa9e898
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
Fixed bugs introduced by backend changes from before
2012-01-12 14:27:43 -05:00
4a372715a3
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-12 12:19:05 -05:00
67ddda4a2d
-Remove phing path from conf.php
2012-01-12 12:16:10 -05:00
79141fa070
CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends
...
-Fixed
2012-01-12 12:14:38 -05:00
d1de836a92
-make rabbitmq_host configurable via $_SERVER var (.htaccess etc.)
2012-01-11 16:28:03 -05:00
4f546a1bc3
CC-3238: When ICEcast is not on local host, Jplayer is not playing anything
...
-fixed with workaround to show the user what ip they're listening on.
2012-01-11 16:27:14 -05:00
d5d4d50a9e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
2012-01-11 12:31:54 -05:00
f6f1b143d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-11 12:18:28 -05:00
04b48d47cc
CC-2977: Never delete files from the database
...
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
f3ce8e77d1
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 10:42:35 -05:00
cf045652ec
CC-1986: Configurable columns for media search
...
- Fixed some hardcoded array access
- Fix js error in ColReorder
2012-01-11 10:41:58 -05:00
ef141625a3
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 14:46:31 -05:00
d1d01e55ce
CC-1986: Configurable columns for media search
...
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
2012-01-10 14:45:43 -05:00
7f6d3cd942
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 09:54:55 -05:00
7d9aa3ca5d
CC-2299: Better column options in playlist/file list on playlist builder
...
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
2012-01-10 09:52:32 -05:00
c3430e5411
-various optimizations
2012-01-09 17:47:58 -05:00
7a27be878b
CC-1986: Configurable columns for media search
...
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
2012-01-08 22:31:18 -05:00
a1ccb9c42a
CC-1986: Configurable columns for media search
...
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
2012-01-08 10:33:11 -05:00
8833f4462e
CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
...
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
2012-01-07 23:37:37 -05:00
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
1044881666
CC-3114: Show Content Dialog doesn't display total time
...
Somehow this file didn't get committed...
2012-01-05 10:30:37 -05:00
14b7fd03bb
-remove show-recorder from status page if saas enabled.
2012-01-04 18:57:28 -05:00
722306928b
CC-3114: Show Content Dialog doesn't display total time
...
Done
2012-01-04 17:15:15 -05:00
1c9b134748
CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time
...
Done
2012-01-04 17:10:14 -05:00
0df23305a0
CC-2237: Default fade time should be non-zero number of seconds
...
Done
2012-01-04 17:09:16 -05:00
476484a269
CC-2985: Pop-up metadata box in Playlist Builder does not show Language field
...
Done
2012-01-04 17:08:38 -05:00
a63d975fce
CC-2355: Repeating show should default to 'No End'
...
Done
2012-01-04 17:06:58 -05:00
e9634f94a1
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-04 14:31:50 -05:00
7247f75563
SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts
...
-Done
2012-01-04 14:18:40 -05:00
5fa92f3d17
- temp commit on group action
2012-01-04 12:47:27 -05:00
905775552d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-27 14:34:27 -08:00
53d504f26e
CC-3110 : Password reset
2011-12-27 14:33:22 -08:00
9216da7f03
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-24 11:03:02 -05:00
c9c6a08a1c
CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
...
changed and click save
- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
f4449865cc
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-22 17:21:43 -05:00
a55b47efff
-Allow etc and stor directories to be configurable
2011-12-22 17:21:18 -05:00
9665c970af
CC-3218: Stream-settings: Spaces and other illegal characters should not be
...
allowed in the fields: server, username, password, URL, and mount point
- adding an another mask for domain name. Front and backend
2011-12-22 15:35:46 -05:00
52b0e3c5f9
CC-3110 : Password reset
...
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
30b192a809
CC-3218: tream-settings: Spaces and other illegal characters should not
...
be allowed in the fields: server, username, password, URL, and mount point
- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
2011-12-21 17:30:42 -05:00
8b37c5d4da
CC-3215: When you click on Playlist Builder, for a brief instant you see
...
the library table headings with different columns
- fixed
2011-12-20 11:32:46 -05:00
7086444247
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- fixed comment
2011-12-19 15:45:44 -05:00
018fa1d79c
CC-3213: Customer is unable to save Fade Out/Cue out for playlists
...
- fixed cue out/in issue
2011-12-19 14:55:23 -05:00
cdcdd9227d
-add vhost support
2011-12-19 00:11:45 -05:00
8d369e662d
-make airtime.conf selectable in conf.php
2011-12-18 23:44:19 -05:00
f6670b001f
CC-3202: Airtime/Sourcefabric/GNU GPL v.3 links in Help->About should be opened in a new tab
...
Done
2011-12-14 22:29:02 -05:00
150ea0baaf
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2011-12-14 22:21:58 -05:00
b42d217684
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Show the menu item when the show is rebroadcasting.
2011-12-14 22:21:02 -05:00
7c81fa29eb
CC-3192: Problem with web uploads for Airtime 2.0.0 beta2
...
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
2011-12-14 15:58:26 -05:00
7542d86b94
CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show
...
Fixed by checking if the show is a repeating show.
2011-12-14 10:12:17 -05:00
9bbe1d14fa
-remove persistent connections from DB connections
2011-12-13 17:16:45 -05:00
e81c14c1db
CC-3185 : Live show can be dragged into a future date after the rebroadcasting
2011-12-13 13:04:03 +01:00
3cd11c696f
CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global"
2011-12-13 12:10:25 +01:00
9275b21f48
CC-3177 : editing a show in the calendar brakes show edit form
2011-12-13 11:10:04 +01:00
c887fec86b
CC-3179 : shows populated date must be timestamp.
2011-12-12 21:11:05 +01:00
85b2bf6e55
CC-3181 : re-uploaded to soundcloud creates the file name in a different format
2011-12-12 16:04:16 +01:00
72952024b7
CC-3177 : editing a show in the calendar brakes show edit form
...
will only update shows if the duration is 24:00 or less.
2011-12-12 12:11:31 +01:00
1b8e1455d6
SAAS-101: "Buy Now" link needs to pop up a new window when you click on it
...
Done
2011-12-09 13:51:20 -05:00
106b54b6f4
CC-3168: Stream Settings: "Vorbis Metadata" confusing string
...
href='#' is not needed, removing it
2011-12-09 13:50:55 -05:00
c3b6203628
CC-3168: Stream Settings: "Vorbis Metadata" confusing string
...
Done
2011-12-09 13:42:03 -05:00
e583511b21
SAAS-57: Add LiveChat to Airtime Pro
...
Didn't consider the case of client_id being an empty string,
thus making the javascript syntax invalid
2011-12-09 12:37:31 -05:00
343cd8274d
SAAS-57: Add LiveChat to Airtime Pro
...
Forgot to remove the code from ApiController...
2011-12-09 11:25:50 -05:00
764d6c3347
SAAS-57: Add LiveChat to Airtime Pro
...
Create a javascript variable to hold the client_id
2011-12-09 11:12:42 -05:00
2d04d7eb83
SAAS-57: Add LiveChat to Airtime Pro
...
Fixing the issue of livechat showing up in the stream player pop-up
2011-12-08 18:04:32 -05:00
83f02c3408
SAAS-57: Add LiveChat to Airtime Pro
...
Adding client_id getter/setter to preference
2011-12-08 17:23:46 -05:00
c49cd436fa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-08 16:46:13 -05:00
201667936c
SAAS-57: Add LiveChat to Airtime Pro
...
Adding code to non-saas side
2011-12-08 16:45:11 -05:00
36d9b15435
CC-3150 : Editor box still open with show details for a deleted show
2011-12-08 17:49:00 +01:00
fd10393b01
SAAS-94: Phone home metrics: Gather info about streaming setup
...
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
2011-12-07 10:31:16 -05:00
af3b75bab4
SAAS-95: Trial Box: Change "Keep Going On" to "Buy Now"
...
Done
2011-12-05 19:50:42 -05:00
9523174a0f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-05 16:27:27 -05:00
6591523452
SAAS-93: Switch link for Trial box
...
Done.
2011-12-05 16:27:17 -05:00
73c0408315
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-05 12:56:16 -05:00
0440eb7539
CC-3160: Once Hardware dropdown is changed, stream information does not refresh
...
-fixed
2011-12-05 12:34:11 -05:00
20f0f5e523
CC-2926: Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome
...
-Fixed.
2011-12-05 12:04:02 -05:00
2bf4c93e5c
CC-3160: Once Hardware dropdown is changed, stream information does not refresh
...
-Fixed one error...a few more to go.
2011-12-04 21:47:11 -05:00
5a4b4ba421
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-02 16:23:03 -05:00
efbaebbbf5
CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.
...
-fixed
2011-12-02 16:22:54 -05:00
82f3a25f69
-set log path earlier
2011-12-02 15:06:21 -05:00
ee5b675562
CC-3147: Change text in help > Getting Started: "Only admins can add shows."
...
Fixed
2011-12-02 13:57:40 -05:00
9991cbd16b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-12-02 13:55:39 -05:00
30f36177b7
CC-3141: Capitalization of SHOUTcast in stream settings page
...
Fixed
2011-12-02 13:54:37 -05:00
043f0c29a1
CC-3074: Give users the choice of which hardware sound API they wish to
...
use (instead of hardcoded to ALSA)
- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
966dd49610
CC-3094 : Rebroadcast editing problems
2011-12-02 16:24:11 +01:00
198340ac67
CC-3094 : Rebroadcast editing problems
2011-12-02 13:31:54 +01:00
878fa3461d
CC-3094 : Rebroadcast editing problems
2011-12-02 12:06:09 +01:00
b7a9e89095
CC-3143 : Allow content to be scheduled in an overlapping show.
...
removing check for scheduling an overlapping show, doesn't make sense with new resize rules.
2011-12-01 11:37:55 +01:00
f15429c8d6
CC-3144 : Search box shows Track, Show Contents box shows Genre
...
replaces track number with genre.
2011-12-01 11:16:29 +01:00
0d4e1d21e2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-30 16:12:53 -05:00
0193eec89e
CC-3139: Undefined index errors in Live stream player after fresh install
...
Got SQL syntax mixed up with PHP...
2011-11-30 16:10:40 -05:00
48d9d2d93b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 20:16:01 -05:00
9c65bfeba7
CC-3131: Latency of stream authentication warning in Stream Settings page
...
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
4d6c3fdbf4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 16:25:43 -05:00
53aecd1c00
CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
...
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.
Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
bc7553a5fc
CC-3099: Does Airtime upgrade work when the database username + password is changed from default?
...
-fixed for non-install issues as well.
2011-11-29 16:07:38 -05:00
85b8209db9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 13:09:51 -05:00
49df56a0f6
CC-3135: Typo in Stream Settings -> Global Settings, says Ouput
...
instead of Output
- fixed
2011-11-29 13:09:23 -05:00
dbc65983e2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 17:22:23 +01:00
5b7788957e
CC-3137 : Cleaning Up Old Playlist Stuff
...
unused view.
2011-11-29 17:22:17 +01:00
fc24380526
CC-3132: Live stream window needs a space in the title
...
Fixed
2011-11-29 11:17:29 -05:00
57d45a4f84
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 11:13:52 -05:00
c430e0bd6a
CC-3125: Small capitalization errors on SoundCloud text labels
...
Fix for the preference page
2011-11-29 11:13:39 -05:00
4c4c401c9c
CC-3137 : Cleaning Up Old Playlist Stuff
2011-11-29 17:11:19 +01:00
22e48d042a
CC-3137 : Cleaning Up Old Playlist Stuff
2011-11-29 16:35:52 +01:00
01576b33c8
CC-3137 : Cleaning Up Old Playlist Stuff
...
when a user clicks new the intermediate playlist metadata screen in gone now, just can edit title/desciption inline on the main editor.
2011-11-29 16:20:09 +01:00
c17be6d938
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-29 15:30:30 +01:00
8646432cce
CC-3038 : Playlists offsets not dynamically updating
...
refreshes view when a cue/fade is set like all other playlist actions
calling function setSPLContent
2011-11-29 15:30:05 +01:00
329c735ea4
CC-3125: Small capitalization errors on SoundCloud text labels
...
Fixed
2011-11-28 16:20:34 -05:00
f1e1b747ad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 13:32:05 +01:00
5828b2037d
CC-3102 : Show Editing, how it uses day of the week
2011-11-26 13:31:42 +01:00
b16fa16042
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-26 00:06:29 -05:00
317bed8643
CC-3094: Rebroadcast editing problems
...
-Fixed
2011-11-26 00:06:17 -05:00
197997fee7
CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
...
Mask the password instead of hiding it
2011-11-25 21:52:31 -05:00
41eeefe427
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-25 21:34:05 -05:00
f03b875e06
CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top
...
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.
Fixed by checking modified_instance column; only return it if modified_instance != TRUE
2011-11-25 21:33:42 -05:00
ff998ea6f2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-25 17:36:23 -05:00
b1193318ed
CC-3105: Settings dates (the popup select date calendar) shows Today by local machine timezone and not Airtime timezone.
...
-fixed
2011-11-25 17:36:11 -05:00
267d48f640
SAAS-82: Add "airtime-system --status" command
...
- add a function that returns just global data of stream setting
2011-11-25 17:33:59 -05:00
c9644d4a73
CC-3077: Preference/stream-setting page has no Vorbis metadata option
...
- cleaning up some code
2011-11-25 15:38:29 -05:00
c21cbeb73b
CC-3102 : Show Editing, how it uses day of the week
2011-11-25 16:07:03 +01:00
5222fe71a5
CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net
...
Updated per Paul's comment
2011-11-24 17:10:56 -05:00
370d6e1fba
CC-3104: Timezone issues in the widget
...
Added is_numeric check
2011-11-24 17:08:52 -05:00
485a0e8cc6
CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
...
I just realized this:
1. Enable "Enable Soundcloud Upload" in preference and fill in the username+password, click save
2. Go back to preference, change unrelated setting like "Station Name", click save
3. Now since soundcloud password field is empty (expected, as we don't want others to see how many digits
are there), the save failed
This commit is to fix this. Created another custom validator for the password field, which does the same
thing as ConditionalNotEmpty validator but allow password field to be empty when the username/email field
wasn't changed.
2011-11-24 15:45:39 -05:00
ee3a6ecd84
CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net
...
Fixed
2011-11-24 14:10:04 -05:00
b84c51212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-24 14:05:38 -05:00
Martin Konecny
Naomi Aro
Daniel
James
james
Yuchen Wang
Paul Baranowski
James