Martin Konecny
0f2d5bc844
files should not be independent events
2012-11-12 17:45:20 -05:00
Martin Konecny
a0a9fc71f1
disable unlimited attempts for pushing stats data
2012-11-12 17:44:26 -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
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -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
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
