4ebcb1b1f9
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
d9cde230cd
CC-4090: Make code style PSR compliant
...
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
ee3447f903
CC-4090: Make code style PSR compliant
...
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
24a90700a1
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
2012-07-10 17:24:57 -04:00
39506740eb
CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
...
others on some situation.
- fixed
2012-07-10 17:09:21 -04:00
6c83633933
CC-4008: Inconsistent button labels for Play/Preview in Now Playing page
...
- changed everyting to "Preview"
2012-06-28 13:33:01 -04:00
e5d5f44813
CC-3905: Playlist Library -> the delete tracks button is enabled for DJ
...
users and PM's
- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
2012-06-06 17:31:51 -04:00
803c44611a
CC-3819 : Add View on Soundcloud context menu option on calendar page
2012-05-14 15:48:09 +02:00
f8900d4b05
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:13:08 +02:00
97ce006130
CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work
2012-05-14 12:36:57 +02:00
81d7e0c80f
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed filepath join
2012-05-03 09:59:31 -04:00
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
18391604b5
CC-3424: UI Design for new drop down menu
...
- html integration
2012-04-12 10:26:11 -04:00
35d2ded26b
CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page
2012-04-05 10:47:35 +02:00
ebf530a97c
CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears
2012-04-02 11:02:03 +02:00
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
7a8398bd32
CC-3174 : showbuilder
...
including context menu to delete items from timeline.
2012-03-15 16:11:29 +01:00
6830af574a
CC-3174 : showbuilder
...
fixing some merge stuff.
2012-03-13 12:52:41 +01:00
c0b0e8079b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-12 11:33:28 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
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
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
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
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
dd3b7afff2
Updated library so I can play a song.
2012-03-05 19:00:14 -05:00
a832a40c75
CC-3174 : showbuilder
...
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +01:00
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
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
5f89975c64
CC-3174 : showbuilder
...
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
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
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
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
4691799326
Merge branch 'devel' into CC-3174
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2012-02-09 19:41:31 +01: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
581f86a1de
CC-3174 : showbuilder
...
show editing menu added.
2012-02-08 12:53:46 +01:00
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +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
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
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +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
0199f572bd
CC-3174 : showbuilder
...
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +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
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
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
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
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
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01: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
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
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
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
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
5fa92f3d17
- temp commit on group action
2012-01-04 12:47:27 -05: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
329c735ea4
CC-3125: Small capitalization errors on SoundCloud text labels
...
Fixed
2011-11-28 16:20:34 -05:00
1a1db1892f
CC-2950: Tell users if they are running an out-of-date version or not
...
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
and store result in db
- created new view helper VersionNotify.php, which queries and calculates version
difference, then returns the necessary information in html to the view files
- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
when the version notification icon is clicked, a tooltip is displayed
2011-11-14 00:34:53 -05:00
fb8735588d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-22 11:34:43 -04:00
f160ded6bc
CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu
...
- fixed
- extra fix: handles the case when username or password is empty
2011-10-22 11:34:04 -04:00
d2fe46baf0
CC-2436: Save pulldown settings
...
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.
When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
2011-10-18 10:10:35 -04:00
5a83c5b81e
Merge branch '1.9.1' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
2011-10-14 01:38:52 +02:00
f1864e79d8
CC-2973: Api key is being used for downloads in the "Show Content" window + "Playlist Builder" page.
...
-fixed
2011-10-14 00:12:33 +02:00
cb3060623c
Merge branch '1.9.1' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 14:01:48 -04:00
dcda08e17a
CC-2919: Media Monitor: recorded show doesn't show on library after
...
recording is done
- fixed
- extra fix: Airtime wasn't updating file when updating metadata
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2011-10-03 14:17:56 -04:00
5e9aec93a8
CC-2919: Media Monitor: recorded show doesn't show on library after
...
recording is done
- fixed
- extra fix: Airtime wasn't updating file when updating metadata
2011-10-03 14:10:47 -04:00
7e3d25eeaa
CC-2795: Give option to set download flag of recorded shows
...
uploaded to Soundcloud by default
- done
2011-09-29 17:10:17 -04:00
dfe43c98bb
CC-2833: Use ClassLoaders for PHP Files
...
-autoload RabbitMq class
2011-09-26 15:19:23 -04:00
5cc7de95ee
CC-2833: Use ClassLoaders for PHP Files
...
-Done for class User
2011-09-23 17:00:55 -04:00
9bb901945e
CC-2833: Use ClassLoaders for PHP Files
...
-shows.php
2011-09-23 10:54:20 -04:00
965a649d0e
CC-2591: Change function name
...
- done
- extra fix: fix was needed due to class name change
2011-09-22 14:01:05 -04:00
c84690adaa
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2011-09-22 12:25:30 -04:00
2be0960ed5
CC-2833: Use ClassLoaders for PHP Files
...
-made MusicDir, Playlist and StoredFile autoload
2011-09-22 12:24:17 -04:00
43ba92a535
CC-2866: progress icon not showing
...
- fixed
2011-09-22 12:15:03 -04:00
73dc4b851d
CC-2591: Allow upload of any audio clip to Soundcloud
...
- done
- need more styling
- note there were changes in style.css
2011-09-22 11:47:24 -04:00
c460519a88
Merge branch '1.9.1' into devel
2011-08-31 10:15:00 -04:00
b5645d238a
CC-2746: Edit metadata loses data if required data is missing
...
- fixed
2011-08-30 16:50:46 -04:00
e580c5ae0d
CC-2438: Add a button to listen to the stream immediately
...
-initial commit
2011-08-23 12:45:03 -04:00
ba0458c442
CC-2558 : Delete all files from disk, only allow admins to delete.
2011-07-19 11:00:32 +02:00
c7279f74ca
CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc.
2011-07-18 19:48:20 +02:00
4588ebd105
CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc.
2011-07-18 15:28:17 +02:00
73da294089
CC-2505: Media monitor doesn't delete some tracks
...
from the Airtime server due character encoding
-fixed
2011-07-07 16:05:34 -04:00
3d52db5211
CC-2494: Uploading songs getting a 500 error (shows as yellow ! in the UI)
...
-fixed
-also made it so that files deleted via the UI are deleted on the FS as well.
2011-07-06 13:54:52 -04:00
7607bce6c8
CC-2403: Downloading a file via the web UI returns an absolute path, not relative
...
-fixed to take into account the base URL.
2011-06-24 16:04:57 -04:00
db7b996288
CC-2415:subsecod-offset-in-playlist
...
- Displays 1 decimal place on all length and offset in playlist
builder
- secondsToPlaylistTime() function returns time with 1 decimal
millisecond
2011-06-24 15:51:21 -04:00
e05645f523
CC-2415:Subsecond offset
...
- temp commit. not sure what needs to be done yet
2011-06-24 12:29:55 -04:00
fbf5f85509
CC-2423 Undefined property in StoredFile::$md
...
uses the new file metadata access now.
2011-06-24 10:40:31 +02:00
8f0b965ea0
CC-2403: Downloading a file via the web UI returns an absolute path, not relative
...
-fixed
2011-06-22 16:50:58 -04:00
adae3e21d6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-06-17 14:42:08 -04:00
b802ba9a42
cc-2381: slow library searching speed
...
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
ea21da6b61
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
recursively copying the audio_samples directory.
2011-06-17 17:54:36 +02:00
5b26f34033
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
seems mutagen needs everything cast as a string, or one field. Was throwing an exception with no message not sure.
2011-06-15 14:20:14 +02:00
71d853567e
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
selecting a mode to prevent some cases where a duplicate could be entered for only 1 file.
2011-06-10 16:43:30 +02:00
a4b92fe72d
CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
...
regression testing with refactored storedfile, having permission problems unlinking a file.
2011-06-09 11:50:03 +02:00
b84854c13c
CC-2271 1.8.2 code cleanup tasks
...
changing 1.8.1 upgrade script to using raw source first.
2011-05-19 09:59:13 -04:00
d4a4c4be2a
CC-1939 Ability to edit name & description of a playlist, display the description somewhere
...
now can edit title/description of a playlist without leaving the main playlist builder screen
2011-05-18 14:33:41 -04:00
a3d7c5e70b
CC-1799 : Live Studio Playout from media library (pytagsfs)
...
metadata almost working from airtime form -> python daemon. Just need to look into permissions for some stor folders.
2011-05-13 13:25:55 -04:00
48af794cfa
CC-2188: Download action for all media file
...
Fixed. The issue was due to change in getFileUrl() in
StoredFile.php.
2011-05-05 17:01:22 -04:00
95613f40f1
cc-2188: Download action for all media file.
...
Download action were added in two placese.
1. Playlist Builder. jjmenu now showing 'Download'.
2. Calendar-> Show Content. Click on the file, you will see
Downlaod menu.
Limitation:
File name is set to original file name.
On the ticket it said, file format should be like
"show_name-12012011-2130.mp3". However, in my opinion,
this is only possible, if a user downloads it from
calender->show content. We know what the show names and etc,
but, if the user downloads it from Playlist Builder, we cannot
retrive such information. To be consistent in both area, I just
set the file name to original file name. This can be easily
modified in the future.
2011-05-04 19:05:14 -04:00
44d599a00b
CC-2211:Changes to playlist not shown
...
Everything works fine except when adding new playlist.
When the new playlist gets created, it doesn't display
the page which contains the playlist.
2011-04-27 12:14:24 -07:00
fab68dfad1
CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
...
-Fixed
2011-04-18 12:43:04 -04:00
23105b9d67
CC-2184 : Hardcoded CSS path should be relative path instead
...
using baseURL zend provides in path.
2011-04-18 11:02:09 -04:00
b11cbd8159
CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.
2011-04-14 18:55:04 -04:00
Martin Konecny
James
Naomi Aro
denise
Daniel
james
Yuchen Wang
Yuchen Wang
James
Yuchen Wang
Martin Konecny
James
Naomi
James Moon
Paul Baranowski