Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,062 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

88 Commits

Author SHA1 Message Date
James ae5b6e58d7 CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value 
- fixed
 2012-08-09 11:03:57 -04:00
Martin Konecny 8876b312fb CC-4167: Create new playlist doesn't work 
-fixed
 2012-08-07 19:49:59 -04:00
James 0d2d8218bf CC-84: Smart Playlists 
- audio preview on playlist
- cleaning up some code
 2012-08-02 16:36:12 -04:00
James 6e71a6bb92 CC-84: Smart Playlists 
- dynamic block length display
 2012-08-02 11:17:10 -04:00
James 9d51222dae CC-84: Smart Playlists 
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
 2012-07-31 17:46:37 -04:00
Martin Konecny ab85ab59d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 21:48:25 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording 
-improve working with "webstreams"
 2012-07-30 21:48:04 -04:00
James 019d13b4c9 CC-84: Smart Playlists 
- backend implementation
- UI for blocks within playlist
 2012-07-30 17:55:22 -04:00
James 5becd70ab1 CC-84: Smart Playlists 
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
 2012-07-27 11:51:50 -04:00
James 7cde4ba2ba CC-84: Smart Playlists 
- merging code
 2012-07-26 16:16:07 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording 
-Fix scheduled streams mixed with scheduled files
 2012-07-26 14:49:32 -04:00
Martin Konecny ccdc06786d CC-1665: Scheduled stream rebroadcasting and recording 
-remove some hardcoded webstream values
-fix some broken problems from devel
 2012-07-26 14:49:32 -04:00
Martin Konecny 3735579378 -remove cc_access table and gunid usage 2012-07-26 14:49:32 -04:00
Martin Konecny be8262b67c CC-1665: Scheduled stream rebroadcasting and recording 
-fixed web stream length not showing up correctly
 2012-07-26 14:49:32 -04:00
Martin Konecny 8b2facaa96 CC-1665: Scheduled stream rebroadcasting and recording 
-playlists load contents now correctly identify tracks vs streams
 2012-07-26 14:49:32 -04:00
denise bef9ba1eea CC-84: Smart Playlists 
- added 'Smart Block' filter in datatable
- added block files to library datatable
 2012-07-25 17:08:22 -04:00
James 1f3cbd8aba CC-84: Smart Playlists 
- introducing smart-block
 2012-07-25 12:44:37 -04:00
denise 722e470f6f CC-84: Smart Playlists 
- changed playlist controller to also handle Blocks
- created new view for smart blocks
 2012-07-25 11:00:46 -04:00
James 32f431c584 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2012-07-23 11:03:29 -04:00
James ef64ce2b73 CC-4112: Smart Playlist: Cannot search Long string 
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
 2012-07-20 15:32:46 -04:00
denise a67b2fa300 CC-84: Smart Playlists 
- removed soundcloud_id criteria
- added last_played criteria
 2012-07-20 11:25:54 -04:00
denise 14712d4d78 CC-84: Smart Playlists 
- fixed undefined index warnings
 2012-07-19 19:09:51 -04:00
James 2e7cf68777 CC-4110: Smart Playlist: some search criteria don't work 
- added bunch of validation
- fixed a bug with range modifier not working correctly
 2012-07-19 16:57:24 -04:00
denise 9fcc851523 CC-84: Smart Playlists 
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
 2012-07-19 14:52:39 -04:00
James 82f087c84d CC-84: Smart Playlists 
- changed db query so it's lazy loading
 2012-07-19 14:45:15 -04:00
James 266d86d9e4 CC-84: Smart Playlists 
- fixed a bug
- change LIKE to ILIKE
 2012-07-18 16:12:06 -04:00
James 9516771099 Merge branch 'cc-84-smart-playlist' into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
 2012-07-18 12:23:57 -04:00
James 2a38527161 CC-84: Smart Playlists 
- propel usage chage
- cleaning up code
- some js changes
 2012-07-18 11:52:09 -04:00
James a4ba776b0f CC-84: Smart Playlists 
- save playlist type to db
- on edit type is loaded
 2012-07-17 11:07:16 -04:00
James fc09baacd7 CC-84: Smart Playlists 
- static playlist is done.
 2012-07-16 17:18:37 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
Martin Konecny 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
denise 2dae5f30f7 CC-84: Smart Playlists 
- code cleanup
- adds 'Add' button to last row, always
 2012-07-16 11:01:34 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
James bf46605ea1 CC-84: Smart Playlists 
- changing field name in backend
- diabled loading criteria on edit temporarly
 2012-07-13 14:32:05 -04:00
James 207582eb7e CC-84: Smart Playlists 
- temp commit
 2012-07-13 14:23:30 -04:00
James 3bce6b4999 CC-84: Smart Playlists 
- db inserting into cc_playlistcriteria
- error validations
 2012-07-12 17:58:44 -04:00
James f0134ba3fa CC-84: Smart Playlists 
- validation on server side
- getting list of files from db which satisfies criteria
 2012-07-12 15:27:51 -04:00
James 93b34bb079 CC-84: Smart Playlists 
- controller skeleton
- playlist model dummy functions
 2012-07-11 16:14:11 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
James 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
James f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James 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
Martin Konecny 6d98cca9c3 SAAS-270: Apache2 errors on SaaS 
-no reason to pass $pl since it is not even used. Fixed
 2012-07-10 16:41:30 -04:00
James 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
James 3c4d01aa93 CC-3675: Playlist -> the files from Disconnected Mediafolder can still 
be previewed (played)

- done
 2012-04-24 12:59:07 -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
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 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 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