Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7907 commits 3 branches 0 tags 405 MiB
Commit graph

1768 commits

Author SHA1 Message Date
Martin Konecny
648b8ae296 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:47:26 -04:00
Martin Konecny
f0f9e8e215 CC-1665: Scheduled stream rebroadcasting and recording 
-minor fixes
 2012-07-27 14:47:15 -04:00
denise
2083d04107 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:32:39 -04:00
denise
d7cf50b2f4 CC-84: Smart Playlists 
- changed error handling and criteria saving to handle same criteria rows
 2012-07-27 14:32:31 -04:00
James
4e022c407d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 11:52:08 -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
Martin Konecny
ebed110429 CC-1665: Scheduled stream rebroadcasting and recording 
-code cleanup
 2012-07-26 17:51:47 -04:00
James
7cde4ba2ba CC-84: Smart Playlists 
- merging code
 2012-07-26 16:16:07 -04:00
James
8755500d30 CC-84: Smart Playlists 
- some minor fix
 2012-07-26 15:30:49 -04:00
James
8f2339f109 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/airtime/map/CcPlaylistcontentsTableMap.php
	airtime_mvc/build/schema.xml
	airtime_mvc/build/sql/schema.sql
 2012-07-26 14:54:47 -04:00
James
a51b04e422 CC-84: Smart Playlists 
- db schema change for type column on playlistcontents
 2012-07-26 14:49:42 -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
fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording 
-webstreams now start and stop at the correct time.
 2012-07-26 14:49:32 -04:00
Martin Konecny
c90495d2d3 CC-1665: Scheduled stream rebroadcasting and recording 
-getting closer to being able to schedule a webstream
 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
b283b5b55e CC-1665: Scheduled stream rebroadcasting and recording 
-remove unused function
 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
Martin Konecny
a16a1f5033 CC-1665: Scheduled stream rebroadcasting and recording 
-Webstreams now appearing in the library
 2012-07-26 14:49:31 -04:00
Martin Konecny
31176f525e CC-1665: Scheduled stream rebroadcasting and recording 
-started working on UI
 2012-07-26 14:41:40 -04:00
Martin Konecny
ed54e882a3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-26 14:41:22 -04:00
Martin Konecny
3f41835e12 re-add getCurrentShowAction 2012-07-26 14:36:21 -04:00
denise
a828c46d32 CC-84: Smart Playlists 
- changed name of 'block' to 'smart playlist' on UI only
 2012-07-26 13:16:29 -04:00
denise
3df0f2d26e CC-84: Smart Playlists 
- added 'add' option to smart playlist context menu
 2012-07-26 12:45:31 -04:00
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
denise
c79110644d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-24 12:14:02 -04:00
denise
754187a2b7 CC-84: Smart Playlists 
- remove subform and combined back into one form
 2012-07-24 12:13:51 -04:00
denise
c82ea30809 CC-84: Smart Playlists 
- removed criteria subform and reverted back to original criteria options design
 2012-07-24 12:12:47 -04:00
denise
64185dac95 CC-84: Smart Playlists 
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
 2012-07-23 12:42:00 -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
denise
952a584f10 CC-84: Smart Playlists 
- form cleanup
 2012-07-23 10:45:17 -04:00
denise
30b64f81fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-23 10:41:09 -04:00
denise
c99e1b892c CC-84: Smart Playlists 
-divided criteria into sub form to handle multiple sets
 2012-07-23 10:40:53 -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
9bdb4a40e0 CC-84: Smart Playlists 
-fixed playlist type spacing on UI
 2012-07-20 12:32:18 -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