Commit Graph

9911 Commits

Author SHA1 Message Date
Rudi Grinberg 2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
Rudi Grinberg f1effc37a9 removed dependency of mm from replaygain 2012-11-14 11:51:00 -05:00
Rudi Grinberg a46cff61e5 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-14 11:27:25 -05:00
Rudi Grinberg 93ff2ce9f6 removed extra import 2012-11-13 17:32:42 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -05:00
Rudi Grinberg 2ce37bb1af Merge remote-tracking branch 'sf/2.2.x' into mm_refactor_for_saas 2012-11-13 17:22:36 -05:00
Rudi Grinberg 6f42291f8a merge api client conflict 2012-11-13 17:21:48 -05:00
denise 33e4d6154d CC-4693: Preferences: Bottom save button is not aligned
-fixed
2012-11-12 14:43:44 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
-fixed
2012-11-12 14:28:50 -05:00
denise c0e54c64cd CC-4685: System -> User: Unique username error
-fixed
2012-11-12 12:29:07 -05:00
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save
-fixed
2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists
-fixed
2012-11-12 11:45:26 -05:00
Rudi Grinberg 350d5dd620 refactored logging setup when mm is setup 2012-11-10 09:24:26 -05:00
denise 8094a29c3f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-08 17:36:50 -05:00
denise ee64f7edf8 CC-4684: Widgets: Create a new 'Now Playing' widget that also displays current track information
-done
2012-11-08 17:36:35 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James 33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
2012-11-08 17:26:55 -05:00
Rudi Grinberg eaf0baa6b6 removed useless code 2012-11-07 23:22:25 -05:00
Rudi Grinberg c222ac10f7 typo 2012-11-07 23:21:48 -05:00
Rudi Grinberg 55f0462946 removed useless line of code 2012-11-07 23:21:08 -05:00
Rudi Grinberg ed00089a1a added user level method to get current user of thread 2012-11-07 22:53:39 -05:00
Rudi Grinberg 7e5ec6505b added tests for instance 2012-11-07 18:16:48 -05:00
Rudi Grinberg 13f59be21d typo 2012-11-07 18:16:33 -05:00
Rudi Grinberg 9e7b8a6b28 added tests 2012-11-07 17:45:08 -05:00
Rudi Grinberg 882a515caa refactored threads which know the user they belong to 2012-11-07 17:44:55 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel
Conflicts:
	python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
denise bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page
-fixed
2012-11-07 15:17:47 -05:00
Rudi Grinberg debc5b6081 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:19:35 -05:00
denise 073d243007 -airtime couldn't connect to liquidsoap 2012-11-07 12:18:10 -05:00
Rudi Grinberg cd6c305b81 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:05:37 -05:00
denise ccd6447696 - install failed due to wrong metadata key
- wrong controller action called
2012-11-07 12:05:20 -05:00
denise 4200059200 -airtime_version fix 2012-11-07 11:43:49 -05:00
Rudi Grinberg 110008e909 added saas shit 2012-11-07 11:29:39 -05:00
Rudi Grinberg af51ddca79 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 11:29:17 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -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
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
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