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
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
a67b2fa300
CC-84: Smart Playlists
...
- removed soundcloud_id criteria
- added last_played criteria
2012-07-20 11:25:54 -04:00
14712d4d78
CC-84: Smart Playlists
...
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
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
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
82f087c84d
CC-84: Smart Playlists
...
- changed db query so it's lazy loading
2012-07-19 14:45:15 -04:00
266d86d9e4
CC-84: Smart Playlists
...
- fixed a bug
- change LIKE to ILIKE
2012-07-18 16:12:06 -04:00
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
2a38527161
CC-84: Smart Playlists
...
- propel usage chage
- cleaning up code
- some js changes
2012-07-18 11:52:09 -04:00
a4ba776b0f
CC-84: Smart Playlists
...
- save playlist type to db
- on edit type is loaded
2012-07-17 11:07:16 -04:00
fc09baacd7
CC-84: Smart Playlists
...
- static playlist is done.
2012-07-16 17:18:37 -04:00
1bb97c8603
CC-84: Smart Playlists
...
- ui clean-up
2012-07-16 14:44:50 -04:00
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
2dae5f30f7
CC-84: Smart Playlists
...
- code cleanup
- adds 'Add' button to last row, always
2012-07-16 11:01:34 -04:00
794cf2c845
CC-4090: Make code style PSR compliant
...
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
bf46605ea1
CC-84: Smart Playlists
...
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
207582eb7e
CC-84: Smart Playlists
...
- temp commit
2012-07-13 14:23:30 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
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
93b34bb079
CC-84: Smart Playlists
...
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -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
f174a2bcf3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 17:09:46 -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
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
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
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
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
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
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
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
b2d0565ec4
CC-3174 : showbuilder
...
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +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
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
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
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
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
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
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
James
denise
Martin Konecny
paul.baranowski
Naomi Aro
Daniel