Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,765 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

474 Commits

Author SHA1 Message Date
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
denise 29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button 
-fixed
 2012-11-06 16:49:36 -05:00
Martin Konecny 38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
denise e262d48eec CC-4675: Preferences: Error messages are hidden 
-fixed
 2012-11-06 12:17:45 -05:00
denise de89686d48 CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added comments
 2012-11-06 12:03:49 -05:00
denise 2cbba60037 CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria 
-fixed
 2012-11-06 11:54:24 -05:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
James ef68680868 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:23:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
denise b8039e315a CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length 
-done
 2012-10-30 13:02:55 -04:00
denise 71291b14f0 CC-4646: Library: Make advanced search options hidden by default 
-done
 2012-10-30 11:59:52 -04:00
denise 8ac0f41987 CC-4590: New smart block says 'Empty playlist' 
-fixed
 2012-10-29 11:57:20 -04:00
James b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings 
-fixed
 2012-10-22 16:37:06 -04:00
James 562c509939 CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up 
- fixed
 2012-10-16 14:51:14 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed 
- fixed
 2012-10-16 14:09:34 -04:00
Daniel James 095c2c7cc6 CC-4559: More useful tooltip for Find Shows button in Now Playing page 2012-10-15 12:41:39 +01: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
Daniel James 1613353be8 Fix inconsistent label which does not match tooltip 2012-10-12 17:15:57 +01:00
Daniel James f77ec31a8d CC-4552: Small formatting improvement 2012-10-11 17:44:08 +01:00
denise 03e4bb15c7 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-11 12:12:06 -04:00
denise 5c0bdfa2db CC-4544: Playlist/Smart Blocks: Add cue format helper 
-done
 2012-10-11 12:11:53 -04:00
Daniel James 843a456b3b CC-4552: Fixed various errors in Support Feedback page 2012-10-11 17:03:09 +01:00
Daniel James d4fa24a9af CC-4543: Fixed colour code labels in playlist preview pop-up 2012-10-10 11:17:09 +01:00
Daniel James 2f447d24a5 Fixed typo in password restore message 2012-10-09 14:21:58 +01: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 29347527cf CC-4471: Library -> Remove extra top margin in playlist builder 
-done
 2012-09-19 17:14:22 -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
james 51bcf04803 CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options 
- fixed
 2012-09-19 13:11:08 -04:00
james 8652681eda CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length 
- fixed
 2012-09-19 12:51:03 -04:00
denise 182bdd0cf6 -added border to smart block expansion 2012-09-17 15:57:41 -04:00
denise 43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-implemented css changes
-formatted playlist_builder.css
 2012-09-17 15:41:22 -04:00
James 396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00
denise a75a12a198 -smart block criteria UI change for small screen resolution 2012-09-14 18:02:40 -04:00
denise 84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible 
-fixed
 2012-09-14 17:35:14 -04:00
denise 8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
denise 4201176b3a -small UI change 2012-09-14 15:59:34 -04:00
denise da107f5120 -small UI fix 2012-09-14 15:55:55 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
Martin Konecny 6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Martin Konecny 239a228175 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-small fix
 2012-09-14 14:36:31 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-initial commit
 2012-09-12 15:43:50 -04:00
denise 8ec9ccedf3 CC-4358: Calendar: Show Content: Undefined Index 
-fixed
 2012-09-05 16:07:40 -04:00
Martin Konecny 122bfc6e97 CC-4070: Built-in help text is wrongly worded about adding files 
-fixed
 2012-09-04 16:25:05 -04:00