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

10728 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Martin Konecny
2ee6ff030e Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-07 17:22:49 -05:00
Martin Konecny
ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -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
Martin Konecny
034ea49d01 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-07 17:20:05 -05:00
Martin Konecny
bb8f5e107c CC-4661: Listener Statistics 
-ability to gather stats without
admin password
 2012-11-07 17:19:47 -05:00
James
39f765d658 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-07 16:27:48 -05:00
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
denise
bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page 
-fixed
 2012-11-07 15:17:47 -05:00
Martin Konecny
1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -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
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