drigato
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
Albert Santoni
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
Albert Santoni
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
drigato
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
drigato
9a2e9d1b3b
SAAS-1058: Podcast table schema
...
Renamed podcast_contents to podcast_episodes
Added new columns to podcast_episodes table
2015-09-18 09:51:44 -04:00
drigato
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
Albert Santoni
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
Albert Santoni
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
Albert Santoni
ea0121f5c1
Cleanup and capitalisation for the Table widget
2015-09-17 15:09:50 -04:00
Albert Santoni
8a7a97f48e
Updated the podcast table widget columns
2015-09-17 15:06:51 -04:00
Albert Santoni
0826c64719
Refactor table widget to use prototype inheritance better
2015-09-17 14:52:32 -04:00
drigato
d31e0f950d
Fix podcast api permission
2015-09-17 13:19:11 -04:00
Albert Santoni
9f03115ee5
Custom button event handlers for new table widget
2015-09-17 13:07:22 -04:00
Albert Santoni
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
Duncan Sommerville
39b2bd6a86
Actually move library search bar out of header; add angular.js to libs
2015-09-16 17:58:16 -04:00
Duncan Sommerville
a78a0d0cc8
* Fix track number bug in analyzer
...
* Move library search bar out of header
2015-09-16 17:50:21 -04:00
Duncan Sommerville
dc840bf25f
Fix bad file extension
2015-09-16 15:31:59 -04:00
Duncan Sommerville
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
Duncan Sommerville
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
drigato
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
drigato
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
drigato
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
Duncan Sommerville
7006b55818
js tweaks
2015-09-16 11:26:11 -04:00
Duncan Sommerville
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
Albert Santoni
e55e99365b
SAAS-1068: Crossfade button broken when editing new smart block
...
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -04:00
Duncan Sommerville
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
Duncan Sommerville
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
Duncan Sommerville
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
Albert Santoni
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
Duncan Sommerville
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
Albert Santoni
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
drigato
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
Duncan Sommerville
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
drigato
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
Duncan Sommerville
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
.
2015-09-14 18:29:43 -04:00
Duncan Sommerville
8c65ba8f66
SAAS-1061 - implement podcast list view skeleton; small bugfixes
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
drigato
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Localizer
fe5db4761e
updated translation resources
2015-09-14 10:01:23 +00:00
Albert Santoni
4851b01540
Force more tracks to be shown in the library view
2015-09-11 12:54:28 -04:00
Duncan Sommerville
2d2ed25fcc
CC-6137 - datatables is the devil
2015-09-10 16:47:36 -04:00
Albert Santoni
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
Albert Santoni
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
Albert Santoni
c77749a096
SAAS: Show logo is deleted on disk when a show instance is deleted
...
* Default to returning the station logo in response if we can't find the
show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
Duncan Sommerville
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
Duncan Sommerville
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
Duncan Sommerville
1649d9db77
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-09 17:25:45 -04:00
Duncan Sommerville
fb1ee2e284
Fix some issues with the users page
2015-09-09 17:25:40 -04:00
Albert Santoni
1f319f84a4
Two small radio page tweaks
...
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
drigato
bd4fc62e04
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
drigato
2569ce4d0a
CC-6136: Playlist fade values don't get or set properly
...
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
Duncan Sommerville
03e23daba0
Apply highlight to active submenu item
2015-09-08 17:42:52 -04:00
Duncan Sommerville
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
Duncan Sommerville
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
Duncan Sommerville
63784d4e6b
Fix some behaviour with playlist/smartblock fade button
2015-09-08 16:39:33 -04:00
Duncan Sommerville
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
Duncan Sommerville
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
Duncan Sommerville
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
Duncan Sommerville
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
drigato
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
Localizer
b80c18c288
updated translation resources
2015-09-07 10:34:19 +00:00
Localizer
57e3059c16
updated translation resources
2015-09-05 08:34:23 +00:00
Albert Santoni
84a1f9071b
Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev
2015-09-04 18:36:26 -04:00
Albert Santoni
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
Duncan Sommerville
65ffe43589
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-04 16:11:48 -04:00
Duncan Sommerville
3dc8a5f98d
CC-6135 - fix playlist bugs
2015-09-04 16:11:41 -04:00
Duncan Sommerville
ba26adc904
CC-6130 - fix empty placeholders appearing when search returns no results
2015-09-04 15:37:04 -04:00
Albert Santoni
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
Albert Santoni
8499fd989c
Regenerate the translation files
2015-09-04 11:17:18 -04:00
Albert Santoni
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
Localizer
d4287e9abd
updated translation resources
2015-09-04 14:47:15 +00:00
Localizer
d257daa510
updated translation resources
2015-09-04 08:16:31 +00:00
Duncan Sommerville
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
Duncan Sommerville
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
Duncan Sommerville
56a8293be6
Fix plupload typo
2015-09-03 15:04:46 -04:00
Duncan Sommerville
363305fa8d
Fix blank tracks view when no local session is set
2015-09-03 14:56:57 -04:00
Duncan Sommerville
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
Duncan Sommerville
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
Duncan Sommerville
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
Duncan Sommerville
888762739e
SAAS-1050 - fix track remove buttons in playlist/smart block editors
2015-09-03 12:09:55 -04:00
Albert Santoni
9071c8d4b6
Update the translations
2015-09-03 10:26:33 -04:00
Duncan Sommerville
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
Duncan Sommerville
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
Albert Santoni
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
Albert Santoni
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
Albert Santoni
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
Duncan Sommerville
ab11974799
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 15:28:44 -04:00
Duncan Sommerville
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
Albert Santoni
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
Albert Santoni
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
Duncan Sommerville
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
Duncan Sommerville
80d78e9fc5
SAAS-1043 - fix flexbox settings for editors to work in firefox
2015-09-02 13:08:16 -04:00
Duncan Sommerville
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -04:00
Duncan Sommerville
69293703f2
SAAS-1041 - add confirmation window when deleting a user
2015-09-02 12:53:24 -04:00
Duncan Sommerville
0722225211
Front end tweaks and fixes
2015-09-02 12:45:37 -04:00
Duncan Sommerville
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -04:00
Duncan Sommerville
c45f1ddd1c
SAAS-1039 - add processing overlay to listener stats screen
2015-09-02 11:52:43 -04:00
Duncan Sommerville
3e29ecad79
CC-6128 - open placeholder 'Learn more' links in new tab
2015-09-02 11:41:51 -04:00
Duncan Sommerville
1fd7f0ea36
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 11:22:32 -04:00
Duncan Sommerville
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
Albert Santoni
a17001a90a
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/application/views/scripts/billing/upgrade.phtml
airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
Albert Santoni
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
Albert Santoni
6959c459cd
Scheduler transaction improvement and preferences transaction removal
...
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
to ensure two requests don't trigger duplicate repeated show instances
in the calendar.
* Removed the transaction from setValue() in Preference and opt for
a row-level lock instead.
2015-09-02 10:40:38 -04:00
Duncan Sommerville
37df86723d
CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user
2015-09-01 16:10:33 -04:00
Duncan Sommerville
a99bc26715
Set autofocus on login username field
2015-09-01 16:07:16 -04:00
Duncan Sommerville
92f722452a
Adjust user settings form widths to be consistent
2015-09-01 16:05:59 -04:00
Duncan Sommerville
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -04:00
Duncan Sommerville
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
drigato
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
Albert Santoni
c7d926f8e8
Merge branch 'saas-dev' into saas-showbuilder
2015-08-31 17:11:07 -04:00
Albert Santoni
bfa01e45aa
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-08-31 17:10:51 -04:00
Duncan Sommerville
f7a7d4c042
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 15:25:27 -04:00
Duncan Sommerville
f21e53b12e
CC-6121 - Fix up user settings page
2015-08-31 15:25:17 -04:00
Albert Santoni
b0e9b41b0c
Nudge the Airtime logo over a bit to center it better
2015-08-31 15:07:13 -04:00
Albert Santoni
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -04:00
Duncan Sommerville
109a336504
CC-6124 - Fix Add to Current Playlist button
2015-08-31 14:36:44 -04:00
Duncan Sommerville
7c9f0a09ae
Fix button styling bugs
2015-08-31 14:21:35 -04:00
Duncan Sommerville
f64d7096d1
Fix button styling bugs
2015-08-31 14:21:09 -04:00
Duncan Sommerville
cd7d07e5f5
CC-6119 - Fix New button styling
2015-08-31 14:01:31 -04:00
Duncan Sommerville
c1e2daaac4
CC-6114 - Remove New button from nav bar
2015-08-31 13:48:22 -04:00
drigato
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
Duncan Sommerville
d2f46882c1
CC-6113 - Remove select dropdown from library pane
2015-08-31 13:35:46 -04:00
Duncan Sommerville
c6a6a97c55
CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text
2015-08-31 13:33:23 -04:00
Duncan Sommerville
e06f88cd49
CC-6116 - Library new buttons keep colour when disabled
2015-08-31 13:30:00 -04:00
Duncan Sommerville
e633bc8899
CC-6112 - Remove button labels at small screen resolutions
2015-08-31 13:25:29 -04:00
Duncan Sommerville
5e024023eb
CC-6110 - Change header to be more responsive
2015-08-31 13:10:16 -04:00
Localizer
34a7019c5b
updated translation resources
2015-08-31 17:07:52 +00:00
Duncan Sommerville
d7d27d3c36
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 12:35:27 -04:00
Duncan Sommerville
2611766498
CC-6109 - Fix display of long usernames in header panel
2015-08-31 12:35:20 -04:00
drigato
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
drigato
e349c3013c
CC-6107: Webstreams datatable should refresh when new webstream is created
2015-08-31 10:03:26 -04:00
drigato
582bc292aa
CC-6108: Manage User table layout is messed up
2015-08-31 09:26:22 -04:00
Albert Santoni
765211da39
Merge branch 'saas-showbuilder' into saas-showbuilder-colors
2015-08-28 21:11:26 -04:00
Albert Santoni
f8d1ee09b2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 20:09:11 -04:00
Albert Santoni
21eb3c502e
Fixed New Show button sliding when you clicked on the calendar
2015-08-28 20:08:52 -04:00
Albert Santoni
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
drigato
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
Albert Santoni
13f62cc118
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 16:21:53 -04:00
Albert Santoni
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
Duncan Sommerville
8a3f36dea3
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-28 16:09:26 -04:00
Duncan Sommerville
005eec5aa5
CC-6095 - better styling for learn about x links
2015-08-28 16:09:18 -04:00
Albert Santoni
71f149f95f
Unbreak the playlist form during reordering
2015-08-28 15:57:57 -04:00
Duncan Sommerville
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
Albert Santoni
6446c9e314
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 14:28:18 -04:00
Albert Santoni
e743c3589e
More smart block and playlist editor improvements
...
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
drigato
6811646aaa
CC-6106: Permission problems with bulk and single edit in the Dashboard
2015-08-28 13:40:38 -04:00
Albert Santoni
f36ff944c2
SAAS-1031: Can't add tracks to a new playlist
2015-08-28 13:22:08 -04:00
Albert Santoni
91cad81c4b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 13:07:08 -04:00
Albert Santoni
b2edaa8668
Merge branch 'saas' into saas-showbuilder
2015-08-28 13:07:00 -04:00
Albert Santoni
17074e5f70
SAAS-1032: Shows with missing show art on disk can't be edited
2015-08-28 12:28:34 -04:00
drigato
c4cb856283
CC-6078: Help page updates
...
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
drigato
f597ee075e
CC-6078: Help page updates
...
Removed help center link
2015-08-28 11:55:22 -04:00
drigato
eb2f7263c8
CC-6078: Help page updates
2015-08-28 11:45:00 -04:00
drigato
e3b09e9aa9
Make widgets page accessible to all user types
2015-08-28 11:32:19 -04:00
drigato
4307e326f1
CC-6104: Playout History layouts need help
2015-08-28 11:31:08 -04:00
Duncan Sommerville
88a9594aca
CC-6090 - restyle editor processing divs
2015-08-28 10:50:10 -04:00
Duncan Sommerville
bc4822d8e4
bugfix
2015-08-28 10:36:18 -04:00
Duncan Sommerville
ec9b98c48c
CC-6090 - restyle datatables processing divs
2015-08-28 10:34:49 -04:00
Duncan Sommerville
4cf40d312a
SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata
2015-08-28 09:44:45 -04:00
Albert Santoni
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
Albert Santoni
a08d5b71cf
Calendar colour adjustments
...
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined palette
2015-08-27 20:02:32 -04:00
Albert Santoni
099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
Albert Santoni
b6f33f6083
Completed smart block, playlist, and webstream editor form overhauls
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
playlist contents back rather than the entire HTML fragment for the
editor.
* Keep more of the playlist/smartblock editor view persistent across
saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
Duncan Sommerville
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
Duncan Sommerville
acc4ef0054
CC-6085, CC-6101 - uploader styling
2015-08-27 15:44:59 -04:00
Duncan Sommerville
0ebe7a85e1
CC-6066 - Add/Remove content screen update
2015-08-26 17:56:17 -04:00
Duncan Sommerville
ef892bb565
Fix some small bugs with Dashboard navigation links
2015-08-26 17:02:01 -04:00
Duncan Sommerville
7d8c6dc90d
Fix upload page styling
2015-08-26 16:11:49 -04:00
drigato
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
Albert Santoni
98ac8fd851
Major layout work on the smartblock and playlist editors
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
drigato
706caa8458
SAAS-1025: Restyle the billing page
...
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
drigato
7e1fe030fe
SAAS-1025: Restyle the billing page
...
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
drigato
9951abd897
SAAS-1025: Restyle the billing page
...
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
drigato
6ecb208962
SAAS-1021: Billing page restyle
2015-08-26 09:11:25 -04:00
Duncan Sommerville
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
Duncan Sommerville
84baef1996
CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen
2015-08-25 17:09:05 -04:00
Albert Santoni
b6cf517d10
CC-6093: Review and fix the usability hints text
2015-08-25 16:48:31 -04:00
Albert Santoni
498b3243e0
Fix navbar highlights when navigating via usability hints
2015-08-25 16:43:10 -04:00
Albert Santoni
b99ec51863
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
2015-08-25 15:15:03 -04:00
Albert Santoni
0752e78b2c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:27:48 -04:00
Albert Santoni
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
drigato
2ec715d814
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:19:40 -04:00
drigato
c921aabfd4
Small css fix on recent uploads table
2015-08-25 13:19:18 -04:00
Albert Santoni
161746fbae
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:16:11 -04:00
Albert Santoni
d4527a0460
CC-6091: Settings->General doesn't highlight when you click Settings
2015-08-25 13:15:57 -04:00
drigato
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
drigato
bb2757127d
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css tweak
2015-08-25 12:56:02 -04:00
drigato
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -04:00
drigato
2da431895f
SAAS-1022: Re-implement disk quota status on side nav bar
...
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
2015-08-25 12:43:08 -04:00
Duncan Sommerville
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
Duncan Sommerville
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
Albert Santoni
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
Albert Santoni
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
Duncan Sommerville
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
Duncan Sommerville
b15160d0fb
Fix more selection bugs
2015-08-21 14:39:30 -04:00
Duncan Sommerville
6cfc2db0ca
CC-6086 - fix logout button redirecting to a 404 from certain pages when no baseurl is set
2015-08-21 14:29:00 -04:00
Duncan Sommerville
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
Albert Santoni
f7733757f6
Fixed select menu styling and eliminated ColVis fade time
2015-08-21 13:14:20 -04:00
Duncan Sommerville
604b81071c
CC-6084 - fix calendar drag and drop
2015-08-21 11:09:45 -04:00
Duncan Sommerville
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
Duncan Sommerville
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
drigato
6f0b7f6d32
SAAS-1022: Re-implement disk quota status on side nav bar
...
Layout tweak
2015-08-21 10:06:40 -04:00
drigato
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
drigato
f48c7186ca
SAAS-1022: Re-implement disk quota status on side nav bar
2015-08-21 09:08:36 -04:00
drigato
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
Albert Santoni
b718171729
Fixed aspect ratio of logo
2015-08-19 18:26:05 -04:00
Duncan Sommerville
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
Duncan Sommerville
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
Albert Santoni
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
Albert Santoni
a71752f5c4
Lightened up sidebar icons and fixed context menu arrow alignment
2015-08-19 16:21:10 -04:00
Albert Santoni
93d2d8ad67
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
Albert Santoni
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
Duncan Sommerville
8dab79da1c
Restyle top panel to account for larger nav panel width
2015-08-19 14:29:54 -04:00
Duncan Sommerville
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
Duncan Sommerville
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
drigato
f9cc8b41df
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-19 12:58:49 -04:00
drigato
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
Albert Santoni
a3e9a7355c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-19 11:47:20 -04:00
Albert Santoni
0471d4bbdb
Tweaked text shadow on usability hints
2015-08-19 11:47:13 -04:00
Duncan Sommerville
ff930549db
Fix broken sortable placeholders
2015-08-19 11:32:41 -04:00
drigato
59a9862ba3
CC-6072: Wrapper has weird positioning during page load
2015-08-19 10:56:41 -04:00
Duncan Sommerville
11652da40b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 18:45:58 -04:00
Duncan Sommerville
63f9403b11
Fix more selection bugs, implement new selection on schedule table
2015-08-18 18:45:55 -04:00
Albert Santoni
95cfe463d5
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 18:40:52 -04:00
Albert Santoni
8afc652ff1
Submenu and body background color tweaks
2015-08-18 18:40:09 -04:00
Duncan Sommerville
e7367c3374
Fix more selection bugs
2015-08-18 18:01:12 -04:00
Albert Santoni
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
Albert Santoni
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
Duncan Sommerville
5f4935481a
Fix selection bug
2015-08-18 17:51:41 -04:00
Duncan Sommerville
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
Albert Santoni
a84c33f0ed
Cleanup and fix media type selector highlight in calendar page
2015-08-18 17:29:23 -04:00
Albert Santoni
b3371c2a2f
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:13:35 -04:00
Albert Santoni
a04f5afcbd
More navbar and submenu layout fixes
2015-08-18 17:13:17 -04:00
Duncan Sommerville
a9d30fec15
Fix error when trying to preview playlists/smart blocks
2015-08-18 16:22:14 -04:00
Duncan Sommerville
1f8e8f85b9
Fix bug where success banner for saving playlist can appear for other open playlists
2015-08-18 15:58:09 -04:00
Albert Santoni
20a810fc52
Fixed one more navbar highlight inconsistency
2015-08-18 15:50:10 -04:00
Albert Santoni
49a6b6ab71
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 15:48:37 -04:00
Albert Santoni
5a4bf6bb80
Fixed main navigation sidebar highlight inconsistencies
2015-08-18 15:48:33 -04:00
Duncan Sommerville
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
Duncan Sommerville
884e51291c
CC-6083 - ctrl clicking a selected item deselects
2015-08-18 15:30:24 -04:00
Duncan Sommerville
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
Albert Santoni
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
Albert Santoni
5ab0850d9a
Partially revert datatables strings
2015-08-18 15:00:25 -04:00
Albert Santoni
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
Albert Santoni
b645f1c2ed
Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus
2015-08-18 13:11:17 -04:00
Duncan Sommerville
cee2fe5a63
CC-6082 - add y-scrollbar to file metadata editor at small resolutions
2015-08-18 12:58:34 -04:00
Duncan Sommerville
263c2709bf
CC-6067 - implement hybrid selection
2015-08-18 12:20:06 -04:00
Duncan Sommerville
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
Albert Santoni
a3a3d0a635
Merge branch 'saas-showbuilder' into saas-showbuilder-contextmenus
2015-08-18 09:53:47 -04:00
drigato
d30e32c2d3
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-18 07:46:39 -04:00
Duncan Sommerville
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
Albert Santoni
07752dd9a5
Break the context menus
2015-08-17 18:13:37 -04:00
Duncan Sommerville
096c96b1b6
CC-6075 - fix error
2015-08-17 17:39:16 -04:00
drigato
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
drigato
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
Albert Santoni
74a1e0929d
Fixed styling on Listener Stats page
2015-08-17 16:08:58 -04:00
drigato
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
Albert Santoni
68523d9e02
Specialize the datatables string for playout history, users, and recent uploads tables
2015-08-14 20:20:30 -04:00
Albert Santoni
31982a7238
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-14 20:00:17 -04:00
Albert Santoni
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
Duncan Sommerville
cb2d0bd444
SAAS-948 - js fixes for dashboard nav, change logo image in master panel
2015-08-14 16:42:39 -04:00
Duncan Sommerville
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
Duncan Sommerville
536bbfb678
SAAS-948 - css tweaks to top panel
2015-08-14 15:11:46 -04:00
Duncan Sommerville
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
Duncan Sommerville
12c4e4a374
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
Duncan Sommerville
809b743785
SAAS-948 - Add livechat event listeners
2015-08-14 10:24:49 -04:00
drigato
3e66363cdd
SAAS-1017: Move top nav bar to side
...
Reload datatable if user clicks the browser's back button
2015-08-14 08:43:47 -04:00
drigato
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
Albert Santoni
6c7a6aaad3
Expand user management height
2015-08-13 10:11:25 -04:00
Albert Santoni
8dd580e623
Applied context menu restyling globally
2015-08-12 17:47:55 -04:00
Albert Santoni
0c83b62545
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 17:37:01 -04:00
Albert Santoni
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
Duncan Sommerville
32100e2d9b
SAAS-948 - frontend tweaks
2015-08-12 16:54:45 -04:00
Albert Santoni
61d1e6bb50
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 16:45:07 -04:00
Albert Santoni
409e9e2a78
Stream settings, Add Show form CSS revamp, etc.
2015-08-12 16:44:45 -04:00
Duncan Sommerville
32e1e70418
SAAS-948 - update tab functionality
2015-08-12 15:50:32 -04:00
Duncan Sommerville
c931b81b35
SAAS-948 - library datatable header tweaks
2015-08-12 15:10:56 -04:00
Duncan Sommerville
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
Albert Santoni
21250e91c4
More calendar tweaks
2015-08-12 14:33:34 -04:00
Albert Santoni
0cfc55116d
Colour tweaks
2015-08-12 13:50:42 -04:00
Albert Santoni
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
Albert Santoni
f63ce23c9f
Flatten datatable headers and restyled Manage Users screen
2015-08-12 10:53:14 -04:00
Albert Santoni
e5f70e7ec3
Re-enable the task manager, it made no difference
2015-08-11 17:32:40 -04:00
Albert Santoni
60a02cfdee
Temporarily disable the task manager to test lock contention
2015-08-11 16:34:28 -04:00
Albert Santoni
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
Duncan Sommerville
c9f9bed2d6
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
2015-08-10 18:46:12 -04:00
Albert Santoni
849b8038ce
Mostly new graphics for the calendar page
2015-08-10 17:11:40 -04:00
Albert Santoni
a28df91c56
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 14:17:24 -04:00
Albert Santoni
2af5eb3314
Add Media page visual refresh, and use dropzone
2015-08-10 14:17:16 -04:00
Duncan Sommerville
641486e852
SAAS-948 - Showbuilder fixes
2015-08-10 13:44:57 -04:00
Duncan Sommerville
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -04:00
Albert Santoni
3bb1dccd65
Ditched hiding overflow, more styling changes
2015-08-10 12:32:39 -04:00
Albert Santoni
974f979bef
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 12:23:30 -04:00
Albert Santoni
fc7a700654
Consolidated some CSS
2015-08-10 12:23:22 -04:00
Albert Santoni
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
Albert Santoni
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
Duncan Sommerville
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
Albert Santoni
cdc9f88c1c
Big style update for the new show builder screen
...
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
Duncan Sommerville
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
Duncan Sommerville
e6609896a5
SAAS-948 - showbuilder styling
2015-08-07 16:49:05 -04:00
Albert Santoni
a82b75743f
Fix error messages being swapped on the password reset page
2015-08-07 14:41:10 -04:00
Albert Santoni
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
Albert Santoni
b5e5fcfc98
More tweaks for password reset
2015-08-07 14:22:01 -04:00
Albert Santoni
bd83eefefe
Cleanup for password reset post-email screen
2015-08-07 14:09:01 -04:00
Albert Santoni
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Duncan Sommerville
0c3d9a8af4
Merge branch 'saas-dev' into saas-showbuilder
2015-08-06 19:16:31 -04:00
Duncan Sommerville
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
drigato
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
Duncan Sommerville
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -04:00
drigato
ea86675d07
SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message
...
Hid the element in the dashboard so it can never be turned off.
2015-08-06 11:14:43 -04:00
Duncan Sommerville
83902ebbbe
Fix small showbuilder bugs
2015-08-06 10:40:50 -04:00
Duncan Sommerville
4cbc49391b
Reintroduce checkboxes
2015-08-05 18:14:56 -04:00
Duncan Sommerville
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
Albert Santoni
9c5a634754
Fix default Icecast hostname
2015-08-05 15:30:14 -04:00
Albert Santoni
1093e7085a
Re-enable hiding the first run popup after first run
2015-08-05 15:00:28 -04:00
Albert Santoni
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
Albert Santoni
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
Albert Santoni
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
Albert Santoni
2aaba99b9a
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
2015-08-05 12:32:33 -04:00
drigato
23fe12651f
SAAS-838: Undefined variable previousMediaName
2015-08-05 09:48:31 -04:00
Duncan Sommerville
33d2fe0900
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
2015-08-04 19:56:12 -04:00
Albert Santoni
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
Duncan Sommerville
57c1d74286
SAAS-985 - Port sandwich menu to showbuilder branch
2015-08-04 16:37:45 -04:00
Duncan Sommerville
4200f56265
SAAS-999 - Change Advanced Search Options to dropdown
2015-08-04 15:38:48 -04:00
Duncan Sommerville
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
Albert Santoni
d0d6efd508
Fix m4a uploads in Airtime
2015-07-31 15:02:53 -04:00
Denise Rigato
f19b6b4bf2
Merge pull request #123 from sourcefabric/saas-aug-promo
...
Airtime Billing page - Add support for August promotion plans
2015-07-31 13:55:20 -04:00
drigato
8a52178765
Fix for billing downgrade with no new invoice created
2015-07-31 13:42:47 -04:00
drigato
5530142174
Un-doing last 2 committs about invoices
2015-07-31 12:01:26 -04:00
drigato
aab4b634bf
Show form on billing page if no invoice was generated after downgrade
2015-07-31 11:56:00 -04:00
drigato
278ca264eb
Fix for bringing customer to view invoice that doesn't exist after downgrade
2015-07-31 11:48:20 -04:00
Albert Santoni
78327c4f68
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-07-31 11:44:29 -04:00
Albert Santoni
84c21de578
Fix error logic if no API key passed to provisioning/create API
2015-07-31 11:43:58 -04:00
drigato
7de507c99a
Forgot to commit promo banner
2015-07-31 10:49:24 -04:00
drigato
ff61fab62a
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Fix to not allow current promo plans to downgrade to another promo plan
Added promo banner to billing page
2015-07-31 10:46:02 -04:00
drigato
48d745bf77
Hide Awesome August 2015 promo plans from billing page
2015-07-30 13:37:15 -04:00
drigato
b2fbb27801
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Made WHMCS Airtime group id a constant
Check for CSRF token on promo eligibilty ajax check
2015-07-30 13:27:32 -04:00
drigato
bccba2f9d5
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Front-end changes to price grid, and plan title
2015-07-30 12:53:37 -04:00
drigato
d9e2ba0ed3
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Un-hardcode product ids
2015-07-30 09:39:50 -04:00
drigato
4ed87de183
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Backend side pretty much done
2015-07-29 22:24:17 -04:00
Duncan Sommerville
8f5f0eb5fe
SAAS-948 - CSS overhaul for new show builder page
2015-07-29 20:28:54 -04:00
Duncan Sommerville
661a87dfbc
SAAS-948 - Frontend tweaks and fixes
2015-07-29 13:35:01 -04:00
drigato
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -04:00
drigato
4d9fb27554
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
created promo-eligibility-check endpoint
2015-07-29 08:10:05 -04:00
Duncan Sommerville
75aef986ea
SAAS-781 - Code review fixes
2015-07-28 11:47:53 -04:00
Duncan Sommerville
fcbc37977f
SAAS-948 - Frontend tweaks
2015-07-28 11:42:04 -04:00
Duncan Sommerville
5e58403c7f
Merge branch 'saas-dev' into saas-showbuilder
2015-07-27 15:38:30 -04:00
Duncan Sommerville
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -04:00
drigato
989b4994aa
SAAS-945: Language + Timezone Setup Popup
...
forgot to auto detect user's timezone
2015-07-27 14:38:42 -04:00
drigato
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00
Duncan Sommerville
ce0cc946ab
Disable password reset in saas-dev (moved to saas-email branch)
2015-07-23 13:00:34 -04:00
Duncan Sommerville
5c4803ddf2
SAAS-781 - password reset
2015-07-22 13:48:47 -04:00
Duncan Sommerville
abdc94ccc3
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-22 11:19:41 -04:00
Duncan Sommerville
a1a2bf9368
Test out existing email functionality
2015-07-22 11:19:37 -04:00
drigato
ce7765a8cb
Merge branch 'saas' into saas-dev
2015-07-21 11:03:31 -04:00
drigato
6f09ef4af1
Change usability hint wording
2015-07-21 07:27:26 -04:00
drigato
3e60713590
SAAS-962: "Now" option should not be available for linked shows
...
Also added fix for SAAS-957
2015-07-20 15:20:50 -04:00
Duncan Sommerville
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
Duncan Sommerville
0324c59100
Don't reload datatable when selecting same media type
2015-07-18 17:28:17 -04:00
drigato
a6854ea507
SAAS-957: Error on "update show"
2015-07-17 16:28:33 -04:00
drigato
7f4fbf65e1
SAAS-960 Change hint for currently playing linked show
2015-07-17 12:48:57 -04:00
drigato
07f02260db
Fix undefined index: nextMediaName
2015-07-17 09:57:24 -04:00
drigato
ec74e17ebe
Merge branch 'saas' into saas-dev-july-16
2015-07-17 07:40:15 -04:00
Duncan Sommerville
1816be156f
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
2015-07-16 16:26:52 -04:00
Duncan Sommerville
0dd2958333
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:43:22 -04:00
Duncan Sommerville
041053b171
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:24:07 -04:00
Duncan Sommerville
04333aaa29
SoundCloud download initial commit
2015-07-16 11:27:27 -04:00
Duncan Sommerville
452c17650c
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:05:39 -04:00
Duncan Sommerville
40d8212c13
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-16 11:03:53 -04:00
Duncan Sommerville
c5e7d6734e
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:03:30 -04:00
drigato
dd5d6342a7
Merge branch 'saas-dev-usability-hints' into saas-dev
2015-07-16 11:00:04 -04:00
Duncan Sommerville
8609934861
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:54:55 -04:00
Duncan Sommerville
ba38618235
Merge branch 'saas' into saas-dev
2015-07-15 18:54:38 -04:00
Duncan Sommerville
71ca2b0668
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:53:39 -04:00
Duncan Sommerville
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
Albert Santoni
ffaa076767
Second fix for SAAS-922, file extension improvements for S3
2015-07-15 17:51:37 -04:00
Albert Santoni
064e1bd4e0
Fix SAAS-922 for files on S3 too
2015-07-15 17:33:33 -04:00
drigato
fd09941223
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-15 13:59:43 -04:00
drigato
8276b1762e
Updated outdated public airtime api setting message on preferences page
2015-07-15 13:47:54 -04:00
Albert Santoni
7ecabffbe8
Avoid double dot in extension for SAAS-922
2015-07-15 13:41:03 -04:00
Albert Santoni
ffb55de566
SAAS-922 take 2
2015-07-15 13:12:56 -04:00
Duncan Sommerville
27fe32a3b4
Use mime-type array when checking for acceptable extensions
2015-07-15 12:58:05 -04:00
Duncan Sommerville
7ce3082fa2
Fix upgrade being run from unit tests
2015-07-15 11:46:52 -04:00
drigato
6a01205034
SAAS-940: Provide usability hints to user
...
Fixed bug where sometimes the hint would not show up
2015-07-15 11:35:59 -04:00
drigato
e07d62b020
Small comments fix
2015-07-15 10:41:01 -04:00
drigato
b37b574cea
Real fix for calendar context menu width problem
2015-07-15 10:30:59 -04:00
drigato
dddc6e6591
Fix for context menu on calendar being too small sometimes
2015-07-15 07:19:48 -04:00
drigato
fdef9d9f78
Fixed calendar context menu width
2015-07-14 13:45:37 -04:00
drigato
7b237a2e65
SAAS-940: Provide usability hints to user
...
Changed some hint wording
2015-07-14 12:14:00 -04:00
drigato
8309289356
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 11:52:10 -04:00
drigato
e5c574229f
SAAS-940: Provide usability hints to user
...
fix hint message transitions
2015-07-14 11:51:50 -04:00
drigato
2de831a37f
SAAS-940: Provide usability hints to user
...
Made hints more specific
2015-07-14 11:45:37 -04:00
Albert Santoni
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
Albert Santoni
30b8ada622
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:56:18 -04:00
Albert Santoni
45b09a0d24
Merge branch 'saas-dev' into saas-dev-usability-hints
...
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
drigato
e24307180c
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:40:10 -04:00
drigato
794a4a21d8
SAAS-940: Provide usability hints to user
...
Update hints after library table has changed
2015-07-14 10:39:58 -04:00
Albert Santoni
5a2ef8d3db
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:35:47 -04:00
Albert Santoni
66caf2574a
CC-6064: Allow shows to be started "now"
2015-07-14 10:35:21 -04:00
drigato
71e8909365
SAAS-940: Provide usability hints to user
...
Fixed bug where hints were not showing up sometimes
2015-07-14 10:08:56 -04:00
drigato
25ef70767b
SAAS-940: Provide usability hints to user
...
Customized hints depending on what page the user is on and what action
they just completed.
2015-07-13 17:02:31 -04:00
Duncan Sommerville
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
Albert Santoni
8e15dd5e99
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-13 15:34:06 -04:00
Duncan Sommerville
755ec79e7d
SAAS-876 - frontend tweaks
2015-07-13 15:17:47 -04:00
Duncan Sommerville
56585fb01c
Add default icecast pass to settable params in ProvisioningController
2015-07-13 13:28:27 -04:00
Duncan Sommerville
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
Duncan Sommerville
d9117721b9
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-13 13:23:39 -04:00
Duncan Sommerville
6d883d2fa4
Fix Add Show button bug and update styling
2015-07-13 13:23:24 -04:00
Duncan Sommerville
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
drigato
33bd1ec605
Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev
2015-07-13 11:19:42 -04:00
drigato
48547ee347
SAAS-940: Provide usability hints to user
...
Refactored some code
2015-07-13 11:19:04 -04:00
drigato
721cd5a31b
SAAS-924: Cannot edit repeating show if first instance has ended
...
Added safeguard in case we don't find a future show instance
2015-07-13 09:04:49 -04:00
drigato
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
Duncan Sommerville
c99165a8dd
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
2015-07-10 13:17:20 -04:00
Duncan Sommerville
37ed35f5b2
Merge branch 'saas-dev' into saas-stream-settings
...
Conflicts:
airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
Duncan Sommerville
e4720b5992
Remove incorrect sql in 2.5.14 upgrade
2015-07-10 10:27:28 -04:00
drigato
c44035c27d
SAAS-938: Long track metadata messes up player bar on the radio page
2015-07-10 09:08:19 -04:00
drigato
670395bb2e
SAAS-939: Add option to preferences to display login button on radio page
...
Change option to ON by default
2015-07-09 15:16:54 -04:00
drigato
0601bd675e
SAAS-939: Add option to preferences to display login button on radio page
2015-07-09 14:38:44 -04:00
drigato
9ec75f7179
Merge branch 'saas' into saas-dev
2015-07-09 14:11:27 -04:00
Albert Santoni
1efa591d67
Fixed double HTML encoding on embedded schedule widget
2015-07-09 12:49:49 -04:00
drigato
1b3a9f6e6a
SAAS-924: Cannot edit repeating show if first instance has ended
...
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
2015-07-09 12:18:21 -04:00
drigato
7c927dcb31
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-07-09 10:35:05 -04:00
drigato
5ec3684ea6
CSS fix onradio page schedule widget
...
Widen width or show time and name columns on mobile phones
2015-07-09 10:34:48 -04:00
Albert Santoni
d2ca10294f
Two Add Show form bugfixes
...
* Fixed the Show Source mount name not showing up in Add Show form
* Use Airtime Authenticaiton by default
2015-07-09 10:18:21 -04:00
Albert Santoni
4b8944f221
Improved explanation for live streaming form
2015-07-09 09:22:49 -04:00
Duncan Sommerville
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
Duncan Sommerville
ad39174f57
Fix fieldset flow for Firefox
2015-07-08 14:19:50 -04:00
Duncan Sommerville
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
Duncan Sommerville
3cebbaf29a
Add aac mime-types into audio mime map
2015-07-07 16:15:35 -04:00
Duncan Sommerville
e12494ef5f
Fix show source mount error
2015-07-07 15:55:35 -04:00
Duncan Sommerville
776596d5b6
SAAS-922 - replace large conditionals with single public mime-type map
2015-07-07 15:48:22 -04:00
Duncan Sommerville
e246771af0
SAAS-922 - additional mime-type coverage
2015-07-07 15:09:06 -04:00
Duncan Sommerville
92c9fd30b5
SAAS-922 - expose mime-based file extensions from /rest/media
2015-07-07 13:54:19 -04:00
drigato
0d27011e65
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-07-07 09:21:54 -04:00
drigato
b200a29f43
SAAS-928: Time strings on Radio Page are not localized
2015-07-07 09:21:44 -04:00
Duncan Sommerville
5cb396e512
SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null)
2015-07-06 18:03:44 -04:00
Duncan Sommerville
999f03ea1e
Merge branch 'saas' into saas-dev
2015-07-06 16:54:39 -04:00
drigato
db0b733b84
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-07-06 12:53:41 -04:00
drigato
a5a91c25e0
SAAS-929: Shows don't show up on schedule widget on Firefox
2015-07-06 12:53:15 -04:00
Duncan Sommerville
65ab13c23b
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-06 11:52:16 -04:00
Duncan Sommerville
31ce52b857
CC-6062 - Fix stretching last column after adding show in calendar view
2015-07-06 11:52:04 -04:00
drigato
ec0fbd2d61
Fix for schedule widget weekdays going out of order
2015-07-06 10:47:04 -04:00
drigato
f86c50a834
SAAS-916: Localize schedule widget dates
...
Fix to use existing locale strings
2015-07-06 10:30:16 -04:00
drigato
71b2a4e946
Removing duplicate locale strings
2015-07-06 10:29:02 -04:00
drigato
6914e16165
SAAS-916: Localize schedule widget dates
...
Forgot to commit msg strings for this
2015-07-06 10:21:27 -04:00
drigato
e69eb9c2b1
SAAS-916: Localize schedule widget dates
2015-07-06 09:33:04 -04:00
Duncan Sommerville
db7e4086ba
Re-add favicon headlink
2015-07-04 01:16:58 -04:00
Duncan Sommerville
cb0593370a
Quick fix
2015-07-04 00:38:53 -04:00
Duncan Sommerville
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
Duncan Sommerville
e3101e90b2
Resize player windows to correct dimensions on open
2015-07-02 16:07:49 -04:00
Albert Santoni
00dfd64677
Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular
...
Saas dev schedule widget angular
2015-07-01 15:05:59 -04:00
Duncan Sommerville
eda9b54cd1
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:51 -04:00
Duncan Sommerville
3c33cfd8b2
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:25 -04:00
Duncan Sommerville
765a61d09f
Don't show status page on Airtime pro fix
2015-06-30 16:21:33 -04:00
Duncan Sommerville
771aeaacb6
Don't show status pages on Airtime Pro
2015-06-30 15:19:05 -04:00
Duncan Sommerville
7f9b54b006
SAAS-908 - Styles for new field layout
2015-06-30 12:15:15 -04:00
Duncan Sommerville
f87fe11a24
SAAS-908 - Break source URL strings into host/port/mount fields
2015-06-30 12:14:33 -04:00
Duncan Sommerville
04fe265538
Task manager update to run individual tasks
2015-06-30 11:46:58 -04:00
drigato
5f925f2f1f
Merge branch 'saas-dev' into saas-dev-schedule-widget-angular
2015-06-30 09:46:36 -04:00
drigato
6db75550cc
SAAS-870: Schedule widget displays shows in wrong timezone
...
Timezone conversion done in frontend
2015-06-30 09:38:53 -04:00
Duncan Sommerville
7dd69da614
Merge branch 'saas-dev' into saas
2015-06-29 17:07:46 -04:00
Duncan Sommerville
a8f214803b
Fix javascript error on some browsers
2015-06-29 17:07:17 -04:00
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
133f1b72ca
Remove min-height on datatables for now
2015-06-29 11:32:28 -04:00
Duncan Sommerville
19fb67c8d6
Fix broken delete button
2015-06-29 11:28:27 -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
ca9c805ce4
SAAS-906 - Change wording on Add to Show button
2015-06-26 15:25:58 -04:00
drigato
0a4651f752
SAAS-870: Schedule widget displays shows in wrong timezone
...
Have angularjs hooked in
2015-06-26 15:25:44 -04:00
Duncan Sommerville
c79e4fb9ea
CC-4922
2015-06-26 15:12:52 -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
79f51f77cb
Merge branch '2.5.x-installer' into saas-dev
2015-06-25 18:21:40 -04:00
Duncan Sommerville
c59f401eb1
Fix shift selection in library and builder views
2015-06-25 18:21:22 -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
Duncan Sommerville
a3f1cf1d56
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:47:34 -04:00
Duncan Sommerville
e36c8a16d4
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:46:29 -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
62b4de5162
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/application/views/scripts/systemstatus/index.phtml
2015-06-18 10:24:44 -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
080c2c43b5
Add soundcloud callback file for saas routing
2015-06-17 17:39:37 -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
6e520f3bc0
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
2015-06-17 14:52:41 -04:00
Duncan Sommerville
af2f757985
Move misplaced tag
2015-06-17 14:52:04 -04:00
Duncan Sommerville
92ad5bde6d
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
2015-06-17 14:49:12 -04:00
Duncan Sommerville
149447b861
Merge branch 'saas-dev' into soundcloud
2015-06-17 14:13:18 -04:00
Duncan Sommerville
8f59d18f34
Merge branch '2.5.x-installer' into saas-dev
2015-06-17 14:11:30 -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
Albert Santoni
8d114c7d6e
Merge branch '2.5.x' into 2.5.x-installer
2015-06-16 16:34:22 -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
Albert Santoni
0b6fb9882a
Fix provisioning
2015-06-16 16:04:20 -04:00
drigato
a338616aca
Add max-width to logo on radio page
2015-06-16 15:38:21 -04:00
Duncan Sommerville
0cd9b1d0e5
Merge branch 'saas-dev' into soundcloud
2015-06-16 15:10:14 -04:00
Duncan Sommerville
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
Albert Santoni
61272cd42c
Handle 404s with the correct error page, and don't log them
2015-06-16 14:58:27 -04:00
Albert Santoni
90bd0a1ab4
Attempt at fixing Sentry error logging
2015-06-16 14:35:29 -04:00
drigato
709b9bbeec
CC-6059: Default station logo broken in Audio Preview popup
2015-06-16 13:37:05 -04:00
drigato
68a02e3c95
Radio page background scrolling issue on small screens
2015-06-16 12:53:07 -04:00
drigato
4bebe1e0fb
Radio page fixes
2015-06-16 12:50:40 -04:00
Albert Santoni
91d391c80c
Merge branch '2.5.x-installer' into saas-dev
...
Conflicts:
airtime_mvc/public/.htaccess
2015-06-16 11:32:45 -04:00
Albert Santoni
674d748149
CC-6058: htaccess should be combined into apache site config
2015-06-16 11:32:09 -04:00
Albert Santoni
609f073a25
Merge branch '2.5.x-installer' into saas-dev-plus
...
Conflicts:
airtime_mvc/public/css/styles.css
airtime_mvc/public/index.php
2015-06-16 11:20:43 -04:00
Albert Santoni
57d63ebb19
Backport some CSS fixes
2015-06-16 11:17:41 -04:00
Albert Santoni
8c9981a155
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
Albert Santoni
aa286efee4
Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android
2015-06-15 17:54:28 -04:00
drigato
7d84e92b1b
Undo last commit
2015-06-15 16:40:47 -04:00
drigato
cd6e326e13
Radio page fix for background image on android
2015-06-15 16:36:29 -04:00
drigato
4c6ba869e3
Fix Radio Page schedule widget iframe size
2015-06-15 16:07:42 -04:00
Duncan Sommerville
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
drigato
0c4888fbd6
Radio Page fixes
...
Added scrolling back to radio page
2015-06-15 15:03:34 -04:00
drigato
507268a563
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-06-15 14:42:56 -04:00
drigato
ad5121f2ca
Radio Page improvements
2015-06-15 14:42:37 -04:00
Albert Santoni
5b6f4ca12a
SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading
2015-06-15 12:19:03 -04:00
Duncan Sommerville
706d7db2b2
Merge branch 'saas-dev' into soundcloud
2015-06-15 11:03:37 -04:00
Albert Santoni
f4ff00355d
Added Radio Page link
2015-06-12 17:21:46 -04:00
Albert Santoni
0b5b2329ed
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-12 16:06:04 -04:00
drigato
1cdeddc3b3
Changed radio page background image
2015-06-12 14:50:22 -04:00
Albert Santoni
b4c9a77e7c
CC-6055: Improved escaping
2015-06-12 13:48:54 -04:00
Albert Santoni
abc81a92b4
XSS prevention for Radio Page
2015-06-12 13:11:28 -04:00
drigato
ba2aeae7b4
Radio page changes
...
Moved login button to top right corner.
Changed background image.
2015-06-12 13:07:47 -04:00
Duncan Sommerville
15c7ef5885
Celery backend and support for dev-env worker parallelization
2015-06-12 12:31:55 -04:00
Albert Santoni
53b67d0826
Disabled most of status page for Airtime Pro and fixed HTML syntax errors
2015-06-12 10:36:27 -04:00
Albert Santoni
980e2ad767
Unbreak the design from my last commit
2015-06-11 15:09:44 -04:00
Albert Santoni
505d6fbc57
Fixed some issues with embedded schedule widget style
2015-06-11 15:04:59 -04:00
Albert Santoni
1efc47beb9
Tweaked layout of the embed widgets page
2015-06-11 14:30:52 -04:00
Albert Santoni
9c3979f3ba
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-11 14:22:03 -04:00
Albert Santoni
6007daf601
Adapted the default schedule widget skin to be more like the player skin
2015-06-11 14:21:56 -04:00
drigato
2dbed71681
SAAS-860: Schedule widget embed src is wrong
2015-06-11 12:37:51 -04:00
drigato
832f70d663
SAAS-859: Schedule widget -> Shows can display on the wrong day
2015-06-11 10:10:03 -04:00
drigato
255bbf74b7
CC-6057: Empty show schedule should show message in Schedule Widget
2015-06-11 09:16:59 -04:00
Albert Santoni
7c6f15984d
Small consistency changes for the embeddable widgets
2015-06-10 18:02:25 -04:00
Albert Santoni
7dafb0e280
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-10 17:55:15 -04:00
Albert Santoni
0f3b68eed7
Default the Public Airtime API to being on
2015-06-10 17:55:04 -04:00
Duncan Sommerville
c1b5b53a16
Fix merge errors; use Celery status messages + handle fail case better
2015-06-10 17:11:42 -04:00
Duncan Sommerville
8163608666
Merge branch 'saas-dev' into soundcloud
2015-06-10 16:25:30 -04:00
drigato
3ecad162e3
Serve radio page font style over https
2015-06-10 16:12:53 -04:00
Duncan Sommerville
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
Albert Santoni
890f30590c
Reduced size of placeholder background PNG for Radio Page
2015-06-10 16:03:12 -04:00
drigato
d1ac78be68
Fix for station logo....again...
2015-06-10 16:01:16 -04:00
drigato
357e17f3b4
Fix for station logo not displaying correctly
2015-06-10 15:57:09 -04:00
drigato
fe5b20c29e
Fix for default station logo not displaying
2015-06-10 15:51:31 -04:00
drigato
f9dd70ad27
Fix for incorrectly displaying the installer screen
2015-06-10 15:38:27 -04:00
Duncan Sommerville
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
Albert Santoni
24db599afe
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-10 15:03:21 -04:00
Albert Santoni
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
drigato
ffcd15190f
Default station logo was not displaying
2015-06-10 14:46:27 -04:00
drigato
816e620399
CSS fix on premium player
2015-06-10 13:04:51 -04:00
drigato
ad40ea5c71
Disable removing UI elements from radio page when the login button is clicked
2015-06-10 12:56:31 -04:00
drigato
8e8f8aa55b
Radio Page Code Review Changes
...
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -04:00
Albert Santoni
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
drigato
0796f58878
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 11:14:02 -04:00
drigato
042e441708
Radio Page Code Review Changes
...
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
2015-06-10 11:13:03 -04:00
Albert Santoni
6126e8a51c
Merge branch 'saas' into saas-dev
2015-06-10 11:02:59 -04:00
drigato
ca8ca0abed
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 09:07:12 -04:00
Albert Santoni
fb1fc6fb00
CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers
2015-06-09 17:14:33 -04:00
Duncan Sommerville
f031d13867
Merge branch 'saas-dev' into soundcloud
2015-06-09 14:03:03 -04:00
Duncan Sommerville
49165e91d9
SAAS-854 - celery-based SoundCloud backend uploader
2015-06-09 14:02:29 -04:00
drigato
d181a931b8
Fix schedule widget layout by removing table structure
2015-06-09 10:30:47 -04:00
drigato
87920c1fc1
SAAS-855: Default station description in Preferences
2015-06-09 09:01:15 -04:00
Albert Santoni
23dd6d4021
CC-6054: live-info-v2 returns future shows without ordering by start time
2015-06-08 16:38:17 -04:00