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

9834 Commits

Author SHA1 Message Date
James 0921716775 Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 16:27:00 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
Martin Konecny 4b09b289ce SAAS-290: Hosted SaaS widgets + javascript code generation 
Slight improvements to description as well as element
positioning
 2012-11-07 15:44:22 -05:00
Martin Konecny 1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -05:00
Martin Konecny 27d40ef4df SAAS-290: Hosted SaaS widgets + javascript code generation 2012-11-06 18:10:53 -05:00
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
Martin Konecny 90f14584b5 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:51:49 -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
denise f623445b0d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:34:19 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-06 16:34:06 -05:00
James 504d9968f1 CC-4639: 
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
 2012-11-06 16:32:00 -05:00
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
Martin Konecny a6bab19e59 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-06 16:03:14 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -05:00
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33:34 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this button in the library toolbar if dynamic blocks are open
 2012-11-06 14:29:26 -05:00
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -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 a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0 
-fixed
 2012-11-06 11:14:40 -05:00
James 8e69e50eea Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 
Conflicts:
	airtime_mvc/application/models/ListenerStat.php
 2012-11-06 11:06:58 -05:00
denise 6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks 
-fixed
 2012-11-06 10:58:25 -05:00
James 2e79e8421c CC-4661: Listener Statistics 
- better legend for multiple series of data
- consistant number of ticks on x-axis
 2012-11-06 10:54:52 -05:00
denise 41cb6b2b0b Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-05 17:08:49 -05:00
denise 3b58ee1f48 CC-4651: Apache log errors part 1 
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
 2012-11-05 17:08:41 -05:00
Martin Konecny 4218a7f30d CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:48:56 -05:00
Martin Konecny 080c3ec944 CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:38:35 -05:00
denise e434af368f Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 13:58:22 -05:00
denise 90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played 
-fixed
 2012-11-05 13:58:11 -05:00
Martin Konecny 16a13afd4e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:05:38 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 12:03:25 -05:00
denise c59605040d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:00:54 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:00:37 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 11:53:20 -05:00
James a93b588a09 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-02 18:25:23 -04:00
James 74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics 
-add mount point names
 2012-11-02 18:04:32 -04:00
Martin Konecny 5bd0fe0300 clean up source file tailing whitespace 2012-11-02 17:51:02 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
denise 106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
James 8b70136dd6 CC-4661: Listener Statistics 
- db change commit
 2012-11-02 17:44:06 -04:00
James 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error 
-fixed
-tracks with undefined mime type were not handled properly
 2012-11-02 16:54:49 -04:00