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

1921 commits

Author SHA1 Message Date
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
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
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
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
denise
0f681d7c25 CC-84: Smart Playlists 
-fixed undefined offset apache warnings
 2012-08-01 14:07:38 -04:00
denise
8f063367cc CC-84: Smart Playlists 
- qtip cleanup for dynamic playlists
 2012-08-01 13:49:16 -04:00
denise
c9afac239a CC-84: Smart Playlists 
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
 2012-08-01 12:04:48 -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
James
1b0cd6b01b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 11:01:34 -04:00
James
b312b2bd45 CC-84: Smart Playlists 
- fixed db query part for static smart playlist generate
 2012-07-31 11:01:19 -04:00
Martin Konecny
b83be1a922 CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 11:00:01 -04:00
Martin Konecny
527b43e8ba CC-1665: Scheduled stream rebroadcasting and recording 
-fix incorrectly named column
 2012-07-31 10:13:41 -04:00
denise
cbbdd5a1fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-31 10:05:50 -04:00
denise
1b1b7e11d0 CC-84: Smart Playlists 
-fixed spacing of modifier '+' button
 2012-07-31 10:05:38 -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
27017c7903 CC-84: Smart Playlists 
- fixed getCriteria() to non static function
 2012-07-30 18:21:27 -04:00
James
b9739b022d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-30 17:55:39 -04:00
James
019d13b4c9 CC-84: Smart Playlists 
- backend implementation
- UI for blocks within playlist
 2012-07-30 17:55:22 -04:00
denise
142aa214b3 CC-84: Smart Playlists 
-dos2unix
 2012-07-30 17:31:54 -04:00
denise
d169f4aa31 CC-84: Smart Playlists 
- improved validation to not allow multiple criteria fields
 2012-07-30 17:03:01 -04:00
denise
f91be9468f CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 16:42:37 -04:00