ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
50996a081f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-22 15:27:18 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
cf1de5fb66
SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service
2015-09-22 15:26:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
13d1534042
Merge pull request #124 from danielhjames/saas
...
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
d86b00c53e
SAAS-1077: REST API for podcast episodes
...
Empty PUT action
2015-09-22 11:19:39 -04:00
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
5bd8a508b1
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
3db20bd3b5
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 07:08:55 -04:00
1445e85795
SAAS-1058: Podcast table schema
...
Changed podcast table column sizes
Added some podcast table column size validation
2015-09-20 12:06:51 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
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
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
d31e0f950d
Fix podcast api permission
2015-09-17 13:19:11 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
dc840bf25f
Fix bad file extension
2015-09-16 15:31:59 -04:00
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
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
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
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
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
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
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
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
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
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
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
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
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
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
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
63784d4e6b
Fix some behaviour with playlist/smartblock fade button
2015-09-08 16:39:33 -04:00
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
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
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
ab11974799
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 15:28:44 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -04:00
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -04:00
1fd7f0ea36
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 11:22:32 -04:00
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
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
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
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
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
a99bc26715
Set autofocus on login username field
2015-09-01 16:07:16 -04:00
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -04:00
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
f7a7d4c042
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 15:25:27 -04:00
f21e53b12e
CC-6121 - Fix up user settings page
2015-08-31 15:25:17 -04:00
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -04:00
c1e2daaac4
CC-6114 - Remove New button from nav bar
2015-08-31 13:48:22 -04:00
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
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
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
765211da39
Merge branch 'saas-showbuilder' into saas-showbuilder-colors
2015-08-28 21:11:26 -04:00
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
6446c9e314
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 14:28:18 -04:00
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
6811646aaa
CC-6106: Permission problems with bulk and single edit in the Dashboard
2015-08-28 13:40:38 -04:00
f36ff944c2
SAAS-1031: Can't add tracks to a new playlist
2015-08-28 13:22:08 -04:00
91cad81c4b
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 13:07:08 -04:00
b2edaa8668
Merge branch 'saas' into saas-showbuilder
2015-08-28 13:07:00 -04:00
17074e5f70
SAAS-1032: Shows with missing show art on disk can't be edited
2015-08-28 12:28:34 -04:00
c4cb856283
CC-6078: Help page updates
...
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
f597ee075e
CC-6078: Help page updates
...
Removed help center link
2015-08-28 11:55:22 -04:00
eb2f7263c8
CC-6078: Help page updates
2015-08-28 11:45:00 -04:00
e3b09e9aa9
Make widgets page accessible to all user types
2015-08-28 11:32:19 -04:00
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
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
099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
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
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
acc4ef0054
CC-6085, CC-6101 - uploader styling
2015-08-27 15:44:59 -04:00
ef892bb565
Fix some small bugs with Dashboard navigation links
2015-08-26 17:02:01 -04:00
7d8c6dc90d
Fix upload page styling
2015-08-26 16:11:49 -04:00
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
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
706caa8458
SAAS-1025: Restyle the billing page
...
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
7e1fe030fe
SAAS-1025: Restyle the billing page
...
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
9951abd897
SAAS-1025: Restyle the billing page
...
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
6ecb208962
SAAS-1021: Billing page restyle
2015-08-26 09:11:25 -04:00
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
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
b6cf517d10
CC-6093: Review and fix the usability hints text
2015-08-25 16:48:31 -04:00
498b3243e0
Fix navbar highlights when navigating via usability hints
2015-08-25 16:43:10 -04:00
b99ec51863
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
2015-08-25 15:15:03 -04:00
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
161746fbae
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:16:11 -04:00
d4527a0460
CC-6091: Settings->General doesn't highlight when you click Settings
2015-08-25 13:15:57 -04:00
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -04:00
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
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
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
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
604b81071c
CC-6084 - fix calendar drag and drop
2015-08-21 11:09:45 -04:00
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
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
6f0b7f6d32
SAAS-1022: Re-implement disk quota status on side nav bar
...
Layout tweak
2015-08-21 10:06:40 -04:00
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
f48c7186ca
SAAS-1022: Re-implement disk quota status on side nav bar
2015-08-21 09:08:36 -04:00
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
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
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
59a9862ba3
CC-6072: Wrapper has weird positioning during page load
2015-08-19 10:56:41 -04:00
8afc652ff1
Submenu and body background color tweaks
2015-08-18 18:40:09 -04:00
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
a84c33f0ed
Cleanup and fix media type selector highlight in calendar page
2015-08-18 17:29:23 -04:00
a04f5afcbd
More navbar and submenu layout fixes
2015-08-18 17:13:17 -04:00
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
d30e32c2d3
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-18 07:46:39 -04:00
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
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
74a1e0929d
Fixed styling on Listener Stats page
2015-08-17 16:08:58 -04:00
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
8dd580e623
Applied context menu restyling globally
2015-08-12 17:47:55 -04:00
0c83b62545
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 17:37:01 -04:00
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
32100e2d9b
SAAS-948 - frontend tweaks
2015-08-12 16:54:45 -04:00
61d1e6bb50
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 16:45:07 -04:00
409e9e2a78
Stream settings, Add Show form CSS revamp, etc.
2015-08-12 16:44:45 -04:00
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
21250e91c4
More calendar tweaks
2015-08-12 14:33:34 -04:00
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
f63ce23c9f
Flatten datatable headers and restyled Manage Users screen
2015-08-12 10:53:14 -04:00
e5f70e7ec3
Re-enable the task manager, it made no difference
2015-08-11 17:32:40 -04:00
60a02cfdee
Temporarily disable the task manager to test lock contention
2015-08-11 16:34:28 -04:00
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
c9f9bed2d6
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
2015-08-10 18:46:12 -04:00
849b8038ce
Mostly new graphics for the calendar page
2015-08-10 17:11:40 -04:00
a28df91c56
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 14:17:24 -04:00
2af5eb3314
Add Media page visual refresh, and use dropzone
2015-08-10 14:17:16 -04:00
641486e852
SAAS-948 - Showbuilder fixes
2015-08-10 13:44:57 -04:00
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -04:00
974f979bef
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 12:23:30 -04:00
fc7a700654
Consolidated some CSS
2015-08-10 12:23:22 -04:00
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
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
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
e6609896a5
SAAS-948 - showbuilder styling
2015-08-07 16:49:05 -04:00
a82b75743f
Fix error messages being swapped on the password reset page
2015-08-07 14:41:10 -04:00
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
b5e5fcfc98
More tweaks for password reset
2015-08-07 14:22:01 -04:00
bd83eefefe
Cleanup for password reset post-email screen
2015-08-07 14:09:01 -04:00
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
0c3d9a8af4
Merge branch 'saas-dev' into saas-showbuilder
2015-08-06 19:16:31 -04:00
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -04:00
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
4cbc49391b
Reintroduce checkboxes
2015-08-05 18:14:56 -04:00
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
9c5a634754
Fix default Icecast hostname
2015-08-05 15:30:14 -04:00
1093e7085a
Re-enable hiding the first run popup after first run
2015-08-05 15:00:28 -04:00
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
2aaba99b9a
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
2015-08-05 12:32:33 -04:00
23fe12651f
SAAS-838: Undefined variable previousMediaName
2015-08-05 09:48:31 -04:00
33d2fe0900
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
2015-08-04 19:56:12 -04:00
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
57c1d74286
SAAS-985 - Port sandwich menu to showbuilder branch
2015-08-04 16:37:45 -04:00
4200f56265
SAAS-999 - Change Advanced Search Options to dropdown
2015-08-04 15:38:48 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
d0d6efd508
Fix m4a uploads in Airtime
2015-07-31 15:02:53 -04:00
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
8a52178765
Fix for billing downgrade with no new invoice created
2015-07-31 13:42:47 -04:00
5530142174
Un-doing last 2 committs about invoices
2015-07-31 12:01:26 -04:00
aab4b634bf
Show form on billing page if no invoice was generated after downgrade
2015-07-31 11:56:00 -04:00
278ca264eb
Fix for bringing customer to view invoice that doesn't exist after downgrade
2015-07-31 11:48:20 -04:00
78327c4f68
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-07-31 11:44:29 -04:00
84c21de578
Fix error logic if no API key passed to provisioning/create API
2015-07-31 11:43:58 -04:00
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
48d745bf77
Hide Awesome August 2015 promo plans from billing page
2015-07-30 13:37:15 -04:00
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
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
d9e2ba0ed3
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Un-hardcode product ids
2015-07-30 09:39:50 -04:00
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
8f5f0eb5fe
SAAS-948 - CSS overhaul for new show builder page
2015-07-29 20:28:54 -04:00
661a87dfbc
SAAS-948 - Frontend tweaks and fixes
2015-07-29 13:35:01 -04:00
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -04:00
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
75aef986ea
SAAS-781 - Code review fixes
2015-07-28 11:47:53 -04:00
fcbc37977f
SAAS-948 - Frontend tweaks
2015-07-28 11:42:04 -04:00
5e58403c7f
Merge branch 'saas-dev' into saas-showbuilder
2015-07-27 15:38:30 -04:00
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -04:00
989b4994aa
SAAS-945: Language + Timezone Setup Popup
...
forgot to auto detect user's timezone
2015-07-27 14:38:42 -04:00
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00
ce0cc946ab
Disable password reset in saas-dev (moved to saas-email branch)
2015-07-23 13:00:34 -04:00
5c4803ddf2
SAAS-781 - password reset
2015-07-22 13:48:47 -04:00
abdc94ccc3
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-22 11:19:41 -04:00
a1a2bf9368
Test out existing email functionality
2015-07-22 11:19:37 -04:00
ce7765a8cb
Merge branch 'saas' into saas-dev
2015-07-21 11:03:31 -04:00
6f09ef4af1
Change usability hint wording
2015-07-21 07:27:26 -04:00
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
7f4fbf65e1
SAAS-960 Change hint for currently playing linked show
2015-07-17 12:48:57 -04:00
07f02260db
Fix undefined index: nextMediaName
2015-07-17 09:57:24 -04:00
ec74e17ebe
Merge branch 'saas' into saas-dev-july-16
2015-07-17 07:40:15 -04:00
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
0dd2958333
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:43:22 -04:00
041053b171
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:24:07 -04:00
04333aaa29
SoundCloud download initial commit
2015-07-16 11:27:27 -04:00
452c17650c
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:05:39 -04:00
40d8212c13
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-16 11:03:53 -04:00
c5e7d6734e
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:03:30 -04:00
dd5d6342a7
Merge branch 'saas-dev-usability-hints' into saas-dev
2015-07-16 11:00:04 -04:00
8609934861
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:54:55 -04:00
ba38618235
Merge branch 'saas' into saas-dev
2015-07-15 18:54:38 -04:00
71ca2b0668
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:53:39 -04:00
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
ffaa076767
Second fix for SAAS-922, file extension improvements for S3
2015-07-15 17:51:37 -04:00
064e1bd4e0
Fix SAAS-922 for files on S3 too
2015-07-15 17:33:33 -04:00
fd09941223
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-15 13:59:43 -04:00
8276b1762e
Updated outdated public airtime api setting message on preferences page
2015-07-15 13:47:54 -04:00
7ecabffbe8
Avoid double dot in extension for SAAS-922
2015-07-15 13:41:03 -04:00
ffb55de566
SAAS-922 take 2
2015-07-15 13:12:56 -04:00
27fe32a3b4
Use mime-type array when checking for acceptable extensions
2015-07-15 12:58:05 -04:00
7ce3082fa2
Fix upgrade being run from unit tests
2015-07-15 11:46:52 -04:00
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
e07d62b020
Small comments fix
2015-07-15 10:41:01 -04:00
7b237a2e65
SAAS-940: Provide usability hints to user
...
Changed some hint wording
2015-07-14 12:14:00 -04:00
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
2de831a37f
SAAS-940: Provide usability hints to user
...
Made hints more specific
2015-07-14 11:45:37 -04:00
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
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
66caf2574a
CC-6064: Allow shows to be started "now"
2015-07-14 10:35:21 -04:00
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
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
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
8e15dd5e99
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-13 15:34:06 -04:00
755ec79e7d
SAAS-876 - frontend tweaks
2015-07-13 15:17:47 -04:00
56585fb01c
Add default icecast pass to settable params in ProvisioningController
2015-07-13 13:28:27 -04:00
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
33bd1ec605
Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev
2015-07-13 11:19:42 -04:00
48547ee347
SAAS-940: Provide usability hints to user
...
Refactored some code
2015-07-13 11:19:04 -04:00
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
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
c99165a8dd
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
2015-07-10 13:17:20 -04:00
37ed35f5b2
Merge branch 'saas-dev' into saas-stream-settings
...
Conflicts:
airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
e4720b5992
Remove incorrect sql in 2.5.14 upgrade
2015-07-10 10:27:28 -04:00
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
0601bd675e
SAAS-939: Add option to preferences to display login button on radio page
2015-07-09 14:38:44 -04:00
1efa591d67
Fixed double HTML encoding on embedded schedule widget
2015-07-09 12:49:49 -04:00
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
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
4b8944f221
Improved explanation for live streaming form
2015-07-09 09:22:49 -04:00
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
3cebbaf29a
Add aac mime-types into audio mime map
2015-07-07 16:15:35 -04:00
e12494ef5f
Fix show source mount error
2015-07-07 15:55:35 -04:00
776596d5b6
SAAS-922 - replace large conditionals with single public mime-type map
2015-07-07 15:48:22 -04:00
e246771af0
SAAS-922 - additional mime-type coverage
2015-07-07 15:09:06 -04:00
92c9fd30b5
SAAS-922 - expose mime-based file extensions from /rest/media
2015-07-07 13:54:19 -04:00
0d27011e65
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-07-07 09:21:54 -04:00
b200a29f43
SAAS-928: Time strings on Radio Page are not localized
2015-07-07 09:21:44 -04:00
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
999f03ea1e
Merge branch 'saas' into saas-dev
2015-07-06 16:54:39 -04:00
a5a91c25e0
SAAS-929: Shows don't show up on schedule widget on Firefox
2015-07-06 12:53:15 -04:00
ec0fbd2d61
Fix for schedule widget weekdays going out of order
2015-07-06 10:47:04 -04:00
f86c50a834
SAAS-916: Localize schedule widget dates
...
Fix to use existing locale strings
2015-07-06 10:30:16 -04:00
71b2a4e946
Removing duplicate locale strings
2015-07-06 10:29:02 -04:00
6914e16165
SAAS-916: Localize schedule widget dates
...
Forgot to commit msg strings for this
2015-07-06 10:21:27 -04:00
e69eb9c2b1
SAAS-916: Localize schedule widget dates
2015-07-06 09:33:04 -04:00
db7e4086ba
Re-add favicon headlink
2015-07-04 01:16:58 -04:00
cb0593370a
Quick fix
2015-07-04 00:38:53 -04:00
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
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
Albert Santoni
Duncan Sommerville
Albert Santoni
drigato
Daniel James
Duncan Sommerville
Denise Rigato