Albert Santoni
|
1c8ccbf0cd
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2015-06-29 16:36:38 -04:00 |
|
Albert Santoni
|
cffc3b7e59
|
Add semi-colon to Shoutcast URLs to make them work with our player
|
2015-06-29 16:36:19 -04:00 |
Duncan Sommerville
|
04290e28dc
|
Fix error getting current schedule information if connected to master source
|
2015-06-29 14:25:00 -04:00 |
|
Duncan Sommerville
|
4be34ea94b
|
Add version string to favicon to force refresh
|
2015-06-29 10:26:52 -04:00 |
|
Duncan Sommerville
|
5cc8774e56
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/configs/constants.php
|
2015-06-29 10:02:58 -04:00 |
|
Duncan Sommerville
|
5fe70754bd
|
Replace all timestamp strings with constant
|
2015-06-26 14:42:52 -04:00 |
|
Duncan Sommerville
|
9d60a3d130
|
Move Help Translate Airtime link to help menu
|
2015-06-26 14:27:27 -04:00 |
|
Duncan Sommerville
|
881471c6b8
|
SAAS-793 - Prevent show image upload when editing single instance of a repeating show
|
2015-06-26 14:23:45 -04:00 |
|
Duncan Sommerville
|
7e0b6ac7ba
|
Add transifex link constant
|
2015-06-26 13:28:05 -04:00 |
|
Duncan Sommerville
|
3a51e66b07
|
Add transifex link to login page
|
2015-06-26 13:25:19 -04:00 |
|
Duncan Sommerville
|
6b9899d11c
|
SAAS-882 - Switch edit user page to use new-style csrf generation
|
2015-06-26 10:45:26 -04:00 |
|
Duncan Sommerville
|
c44bae8140
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2015-06-26 10:37:30 -04:00 |
|
Duncan Sommerville
|
6497bc28c5
|
Show collapsible sections (other than 'dangerous settings') by default on preferences page
|
2015-06-25 17:43:15 -04:00 |
|
Duncan Sommerville
|
87bdc01318
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-06-25 14:13:25 -04:00 |
|
Duncan Sommerville
|
6fb9c6a30c
|
SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences
|
2015-06-25 14:13:09 -04:00 |
|
Duncan Sommerville
|
d91b05a0ae
|
SoundCloud - Add release_year metadata field and set default sharing and license types
|
2015-06-25 10:53:35 -04:00 |
|
Duncan Sommerville
|
67155b136a
|
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
|
2015-06-24 18:38:04 -04:00 |
|
Duncan Sommerville
|
8fcaf7fc74
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/configs/constants.php
|
2015-06-24 16:35:06 -04:00 |
|
Duncan Sommerville
|
adff664e87
|
Fix sending null fields to SoundCloud
|
2015-06-24 16:13:04 -04:00 |
|
Duncan Sommerville
|
e44e0de534
|
Add fields to SoundCloud upload
|
2015-06-24 15:46:53 -04:00 |
|
Albert Santoni
|
d54eb37317
|
Merge branch 'saas' into saas-dev
|
2015-06-24 15:19:38 -04:00 |
|
Duncan Sommerville
|
f26559c0c6
|
Fix permissions for SoundCloud functionality
|
2015-06-24 14:48:38 -04:00 |
|
Duncan Sommerville
|
616cf143d5
|
SAAS-877 - Fix live-info-v2 behaviour
|
2015-06-24 14:28:04 -04:00 |
|
Duncan Sommerville
|
ef957fe0aa
|
SAAS-877 - Fix errors
|
2015-06-24 13:07:13 -04:00 |
|
Duncan Sommerville
|
fd8194e7d8
|
Fix error getting media
|
2015-06-24 12:40:51 -04:00 |
|
Duncan Sommerville
|
ffc3ef1bc9
|
SAAS-877 - Update live-info-v2 api
|
2015-06-24 12:31:32 -04:00 |
|
Duncan Sommerville
|
7645f67515
|
SAAS-877 - Update live-info-v2 api
|
2015-06-24 12:18:52 -04:00 |
|
Duncan Sommerville
|
065988f703
|
Return default value for disk quota if none set
|
2015-06-23 19:08:49 -04:00 |
|
Duncan Sommerville
|
4c797cf100
|
Update installer to work with saas branch
|
2015-06-23 19:02:55 -04:00 |
|
Duncan Sommerville
|
d48e594dcd
|
Fix upload to SoundCloud button remaining disabled after upload failure
|
2015-06-23 19:02:28 -04:00 |
|
Duncan Sommerville
|
70f6cbbc71
|
Fixes to airtime-celery setup
|
2015-06-23 15:10:02 -04:00 |
|
Albert Santoni
|
1bb6ee63dc
|
SAAS-867: Embedded player spins in endless loop if connection is refused
|
2015-06-19 15:30:51 -04:00 |
|
Albert Santoni
|
74b403897d
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2015-06-19 14:23:46 -04:00 |
|
Albert Santoni
|
19adb062cf
|
SAAS-879 and add FAQ to Help menu
* SAAS-879: When trying to save changes in the user setting pages
changes do not save and goes to a "an error hass occured page"
|
2015-06-19 14:22:58 -04:00 |
|
Duncan Sommerville
|
76a7aa9a24
|
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
|
2015-06-18 18:18:48 -04:00 |
|
Duncan Sommerville
|
de184d761e
|
Rename variable
|
2015-06-18 13:49:25 -04:00 |
|
Duncan Sommerville
|
6439bc9ad5
|
Add timestamp on SoundCloud upload success
|
2015-06-18 13:32:43 -04:00 |
|
Duncan Sommerville
|
02e0537be9
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-18 13:29:59 -04:00 |
|
Duncan Sommerville
|
298ee30e9d
|
Move misplaced tag
|
2015-06-18 10:03:12 -04:00 |
|
Duncan Sommerville
|
88bd3c9bc2
|
SAAS-872 - Load disk information statically
|
2015-06-18 10:03:05 -04:00 |
|
Duncan Sommerville
|
afb02301c1
|
SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115
|
2015-06-17 17:16:21 -04:00 |
|
Duncan Sommerville
|
89e3eaa986
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 17:00:15 -04:00 |
|
Duncan Sommerville
|
af2f757985
|
Move misplaced tag
|
2015-06-17 14:52:04 -04:00 |
|
Duncan Sommerville
|
b42d773b5d
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 13:45:33 -04:00 |
|
Duncan Sommerville
|
4b3b3b5b93
|
SAAS-872 - Load disk information statically
|
2015-06-17 13:44:14 -04:00 |
|
Duncan Sommerville
|
27bebb9168
|
Remove logging statement
|
2015-06-17 13:09:56 -04:00 |
|
Duncan Sommerville
|
3a1d34dffe
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 10:14:03 -04:00 |
|
Albert Santoni
|
627343a626
|
Fixed the status page
|
2015-06-16 18:18:34 -04:00 |
|
Duncan Sommerville
|
e033360a4e
|
Fix error when deleting SoundCloud tracks
|
2015-06-16 16:21:31 -04:00 |
|
Albert Santoni
|
0f58e315e6
|
Merge branch 'saas-cc-6055' into saas
|
2015-06-16 16:13:40 -04:00 |