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

2305 commits

Author SHA1 Message Date
Martin Konecny
8876b312fb CC-4167: Create new playlist doesn't work 
-fixed
 2012-08-07 19:49:59 -04:00
Martin Konecny
1dddaa0ba2 CC-1665: Scheduled stream rebroadcasting and recording 
-refresh library to show new stream after save
 2012-08-07 19:49:26 -04:00
Martin Konecny
47ae223a1c CC-1665: Scheduled stream rebroadcasting and recording 
-fix SQL error
 2012-08-07 19:23:42 -04:00
denise
9b805f0a01 CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria 
-fixed
 2012-08-07 17:40:47 -04:00
denise
4ee232944d CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given 
-fixed
 2012-08-07 16:27:18 -04:00
denise
9c678c0429 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 16:18:00 -04:00
denise
97943a6af8 CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria 
-fixed
 2012-08-07 16:17:24 -04:00
James
0fe501508e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:54:42 -04:00
James
171825e19a CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist 
- added processing box
 2012-08-07 15:54:16 -04:00
denise
f6dffc95c8 CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer 
-fixed
 2012-08-07 15:22:32 -04:00
denise
152a97917d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 15:20:32 -04:00
denise
823ab1dd41 CC-4162: Smart Playlist Builder: extra space in between limit and error message 
-fixed
 2012-08-07 15:20:12 -04:00
James
2f8d0b77fa CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items 
- set the items limit to 500
 2012-08-07 14:53:07 -04:00
denise
d05661afff Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-07 11:08:34 -04:00
denise
2c0f7bf03b CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist 
-fixed
 2012-08-07 11:08:00 -04:00
Martin Konecny
e20289e5cf Merge branch '2.1.x' into devel 2012-08-06 17:17:05 -04:00
Martin Konecny
975abbaf10 Remove unecessary information being sent from API 2012-08-06 17:16:43 -04:00
Martin Konecny
48a1bf3f02 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
 2012-08-06 17:10:46 -04:00
Martin Konecny
40023d9086 CC-4152: Widget does not display current show in some modes 
-fixed
 2012-08-06 17:07:18 -04:00
Martin Konecny
688051b59e CC-1665: Scheduled stream rebroadcasting and recording 
-Remove sX_name from being inserted into DB
 2012-08-03 18:45:43 -04:00
Martin Konecny
f901e13a84 CC-1665: Scheduled stream rebroadcasting and recording 
-Make playlist builder show creator name instead of creator id
 2012-08-03 18:06:47 -04:00
Martin Konecny
b23b9a0cbd CC-1665: Scheduled stream rebroadcasting and recording 
-allow to filter by webstream only
 2012-08-03 16:33:58 -04:00
Martin Konecny
183937b8e9 CC-1665: Scheduled stream rebroadcasting and recording 
-when editing string should hav 00h 00m format.
 2012-08-03 16:18:45 -04:00
Martin Konecny
0ea66fc33f CC-1665: Scheduled stream rebroadcasting and recording 
-ability to edit playlists
 2012-08-03 15:59:34 -04:00
denise
d18acfdc75 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:17:52 -04:00
denise
2a7c5eef64 CC-84: Smart Playlists 
- added no-wrap class to qtip
 2012-08-02 17:17:44 -04:00
denise
8e67ecff0a CC-84: Smart Playlists 
- added a no-wrap class to qtip
 2012-08-02 17:17:13 -04:00
James
82970c6e73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 17:04:49 -04:00
James
af939469d3 CC-84: Smart Playlists 
- fixed bug on expanding block
- fixed text bug
 2012-08-02 17:03:54 -04:00
denise
361e681a59 CC-84: Smart Playlists 
- remove 'add to playlist' option on showbuilder screen
 2012-08-02 16:50:35 -04:00
denise
ef994aa449 CC-84: Smart Playlists 
- block options scroll for small screens
 2012-08-02 16:40:32 -04:00
James
028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
 2012-08-02 16:37:12 -04:00
James
0d2d8218bf CC-84: Smart Playlists 
- audio preview on playlist
- cleaning up some code
 2012-08-02 16:36:12 -04:00
Martin Konecny
a146fdcd37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 16:27:00 -04:00
Martin Konecny
9cc152c0ae CC-1665: Scheduled stream rebroadcasting and recording 
-validate form fields of new webstream
 2012-08-02 15:45:15 -04:00
denise
4fca33c5fc CC-84: Smart Playlists 
- removed block from right side if it gets deleted from context menu
 2012-08-02 12:59:00 -04:00
denise
997b5c31c3 CC-84: Smart Playlists 
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
 2012-08-02 11:52:11 -04:00
James
6e71a6bb92 CC-84: Smart Playlists 
- dynamic block length display
 2012-08-02 11:17:10 -04:00
denise
9479aeb3dd CC-84: Smart Playlists 
- fixed db column mapping for radio station name and track title
 2012-08-01 17:10:56 -04:00
denise
ddd6016b28 CC-84: Smart Playlists 
- qtip cleanup
 2012-08-01 16:36:12 -04:00
denise
bf0dcc9035 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 16:26:14 -04:00
denise
483ffdf6af CC-84: Smart Playlists 
- increased size of criteria column
- it was too smallf for some fields
 2012-08-01 16:25:59 -04:00
Martin Konecny
2ef4fd314c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:37:58 -04:00
Martin Konecny
b9bb87f69d CC-1665: Scheduled stream rebroadcasting and recording 
-clicking save now show's webstream save was successful
 2012-08-01 15:37:50 -04:00
denise
bcab41cb86 - 'New User' button text was wrapping onto two lines 2012-08-01 15:30:35 -04:00
denise
40ebeb7fb4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 15:00:54 -04:00
denise
13bb036bad CC-84: Smart Playlists 
-on criteria qtip limit was displaying more than once
-fixed
 2012-08-01 15:00:41 -04:00
Martin Konecny
e6a3877c1e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-01 14:52:29 -04:00
Martin Konecny
63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording 
on-air light works with streams now
 2012-08-01 14:51:56 -04:00
denise
7d788c51b2 CC-84: Smart Playlists 
- added scrolling on qtip
 2012-08-01 14:43:52 -04:00