James
40bd33df11
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-26 10:49:38 -04:00
James
9bd823ee2c
CC-84: Smart Playlists
...
- fixed the issue where block length wasn't updated on spl section
2012-07-26 10:49:23 -04:00
Martin Konecny
077cc735d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-25 18:42:59 -04:00
Martin Konecny
275efb254a
fix improperly renamed functions
2012-07-25 18:42:46 -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
Martin Konecny
255866d240
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Show.php
2012-07-22 19:18:53 -04:00
Martin Konecny
aaa0c01e01
CC-4120: memory optimizations for calendar page.
...
-can now fetch over a year of data at a time
2012-07-22 19:14: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
d801139a12
CC-84: Smart Playlists
...
- utime and mtime in library were displaying in UTC
2012-07-19 19:11:42 -04:00
denise
14712d4d78
CC-84: Smart Playlists
...
- fixed undefined index warnings
2012-07-19 19:09:51 -04:00
denise
624986e973
- removed unnecessary logging line
2012-07-19 18:11:31 -04:00
denise
8e60aec601
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-19 18:07:55 -04:00
denise
647de9ed39
CC-84: Smart Playlists
...
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -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
Martin Konecny
1bd07eeaca
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/models/ServiceRegister.php
2012-07-17 15:00:53 -04:00
Vladimir
1e76845e9c
more sophisticated remote_addr determining
2012-07-17 13:34:48 -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
Rudi Grinberg
20e32b98ba
Merge branch 'devel' into mediamonitor2
...
Conflicts:
python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -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
Martin Konecny
312f35ae48
CC-430: Audio normalization (Replaygain Support)
...
-change default database value to null
2012-07-16 12:10:42 -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
583695f98c
CC-430: Audio normalization (Replaygain Support)
...
-values are now written through to database
2012-07-15 22:22:42 -04:00
Martin Konecny
b4f1cc13c0
CC-430: Audio normalization (Replaygain Support)
...
make code simpler (don't download database to file)
2012-07-15 22:19:16 -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
601263b7a0
CC-84: Smart Playlists
...
- adding propel files for playlistcriteria table
2012-07-13 16:16:07 -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
Martin Konecny
f0f033b4fb
CC-430: Audio normalization (Replaygain Support)
2012-07-12 17:58:29 -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
Martin Konecny
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -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
Martin Konecny
3d243468a7
CC-4090: Make code style PSR compliant
...
Subjects.php
2012-07-10 10:36:53 -04:00
Martin Konecny
dc2b4fed0a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-07-10 10:19:35 -04:00