Commit Graph

1175 Commits

Author SHA1 Message Date
denise 7d8079f770 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
Martin Konecny f5051cff3a CC-4605: Some AJAX calls are cached
-fixed
2012-10-19 11:22:44 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached"
This reverts commit ffca5b42a8.
2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
denise e9815b617b - added comment 2012-10-18 15:21:38 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page
-fixed
2012-10-18 14:47:19 -04:00
Daniel James dc7b609115 CC-4593: Widen container in CSS so label is not truncated 2012-10-18 16:12:51 +01:00
Daniel James 7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
James 96da822bc7 CC-4574: Audio preview fails with Zend errors on file with question mark in the title
- fixed
2012-10-16 14:38:24 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
James 03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
denise 4b2b5ada6e CC-4548: Calendar -> Add/Remove contents -> Advanced search: Green check is pushed to different line under 1400 screen width
-fixed
2012-10-11 12:23:24 -04:00
denise 5c0bdfa2db CC-4544: Playlist/Smart Blocks: Add cue format helper
-done
2012-10-11 12:11:53 -04:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
Daniel James 395d25158f CC-4545: Fix tooltip for Auto Switch On feature 2012-10-10 16:26:32 +01:00
Daniel James fa8c561dab CC-4543 Adjusted CSS for wider colour code label 2012-10-10 11:44:38 +01:00
denise c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting
-fixed
2012-10-09 14:39:29 -04:00
denise 279737751b CC-4540: Smart Block: Error messages are too long
-fixed
2012-10-09 12:12:52 -04:00
Daniel James b4fee4321c CC-4537: Bit rate hint should be in kbps to match actual search 2012-10-09 16:46:51 +01:00
Daniel James c6dc5a818f CC-4172: Fix alignment of 'is in the range' boxes 2012-10-09 16:24:03 +01:00
Daniel James 456d9ba99a CC-4172: Shrink width of table to fit 1280 pixel wide display 2012-10-08 15:33:57 +01:00
Daniel James 44a3f85636 CC-4507: Tweak CSS to make more room for metadata in Master Panel 2012-10-08 12:49:54 +01:00
denise 0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes
-added placeholders to input tags for format examples
2012-10-04 12:16:57 -04:00
denise eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type
-fixed
2012-10-03 11:29:16 -04:00
denise 968c719fa1 CC-4172: Smart Playlist creator requires full HD monitor to avoid buttons being hidden
-done
2012-10-02 14:12:22 -04:00
denise 3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-validation was missing for Encoded By filter
2012-10-02 13:57:36 -04:00
Daniel James 7d00631150 Set min-width value for source info block in Master Panel (CC-4510) 2012-10-01 12:11:36 +01:00
Martin Konecny 9df90414fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:22:13 -04:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
denise 29347527cf CC-4471: Library -> Remove extra top margin in playlist builder
-done
2012-09-19 17:14:22 -04:00
denise e926b62915 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:00:15 -04:00
denise f909ab9da2 CC-4490: Calendar: Empty show icon should have a tooltip
-done
2012-09-19 16:59:45 -04:00
Martin Konecny 40c122fafa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:56:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
denise f2e495cbd8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:40:05 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid
-fixed
2012-09-19 16:39:56 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated
-fixed
2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input
-done
2012-09-19 15:35:45 -04:00
Martin Konecny f717efd7fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 13:23:14 -04:00
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
2012-09-19 12:41:54 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
2012-09-19 11:05:17 -04:00
Martin Konecny ddc0e8d2ba remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
2012-09-19 10:49:17 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
2012-09-18 21:29:02 -04:00