858f03c9ad
-remove rebroadcast code
2012-11-29 15:58:29 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
ddb6289c87
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 16:54:39 -05:00
04f6ae5c1a
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-23 16:53:51 -05:00
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
87d0383533
CC-4703: Now Playing duration column ignores any cue point set
...
- fixed
2012-11-22 14:37:57 -05:00
2fa8f05c3c
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-22 11:40:55 -05:00
3a1945a818
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-22 11:40:44 -05:00
acf2ffc9d5
CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden
...
- fixed
2012-11-22 11:18:42 -05:00
8483439551
CC-4709:
...
Exception happens when DJ try to click a Webstream not belongs to himself
- fixed
2012-11-22 10:29:40 -05:00
dcc9a192d1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-22 10:15:35 -05:00
2a4e4c6405
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 14:17:46 -05:00
48253b8d14
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 10:19:21 -05:00
4242fecd34
CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule
...
- fixed
2012-11-20 18:03:13 -05:00
8d9fa1976e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-20 16:39:04 -05:00
3c1f80de68
CC-4658: Smart Block: Unable to drag songs into block directly
...
- fixed
2012-11-20 16:38:43 -05:00
fe44d23b74
CC-4715: Better management of tracks that are shorter than they claim to be.
2012-11-20 16:31:27 -05:00
9c612d17a3
CC-4694: Apache/Zend error only specific to some users
2012-11-19 18:41:31 -05:00
7efa7169ca
CC-4700: Return mime type of streams instead of null
...
-fixed
2012-11-15 16:41:46 -05:00
d1a22fe7ca
CC-4677: Improve Smart block repeat description
...
-fixed
2012-11-15 11:30:56 -05:00
d8165cbf44
- haproxy support subdomain name with '.'
2012-11-13 16:32:36 -05:00
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
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
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
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
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
1b0b124247
SAAS-290: Hosted SaaS widgets + javascript code generation
...
-working code
2012-11-07 12:49:17 -05:00
27d40ef4df
SAAS-290: Hosted SaaS widgets + javascript code generation
2012-11-06 18:10:53 -05:00
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
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
29c7e58643
CC-4679: Library: Deleting Webstream leaves the SAVE button
...
-fixed
2012-11-06 16:49:36 -05:00
38d28d3346
SAAS-289: Remove all isSaaS checks
2012-11-06 16:48:34 -05:00
f623445b0d
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-06 16:34:19 -05:00
bf4f5fd699
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-06 16:34:06 -05:00
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
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
9712e64a69
CC-4661: Listener Statistics
...
- bug fix and removing unnecessary code
2012-11-06 14:52:35 -05:00
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
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
e262d48eec
CC-4675: Preferences: Error messages are hidden
...
-fixed
2012-11-06 12:17:45 -05:00
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
2cbba60037
CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
...
-fixed
2012-11-06 11:54:24 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
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
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
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
Martin Konecny
denise
martin
James
Martin Konecny