Duncan Sommerville
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -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
Albert Santoni
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -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
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
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
Duncan Sommerville
c020e3449d
SAAS-1044 - fix links in usability hints
2015-09-02 12:55:36 -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
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
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
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -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
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
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
Duncan Sommerville
32100e2d9b
SAAS-948 - frontend tweaks
2015-08-12 16:54:45 -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
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -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
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
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
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
7f4fbf65e1
SAAS-960 Change hint for currently playing linked show
2015-07-17 12:48:57 -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
drigato
e07d62b020
Small comments fix
2015-07-15 10:41:01 -04:00
drigato
7b237a2e65
SAAS-940: Provide usability hints to user
...
Changed some hint wording
2015-07-14 12:14:00 -04:00
drigato
2de831a37f
SAAS-940: Provide usability hints to user
...
Made hints more specific
2015-07-14 11:45:37 -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
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
drigato
48547ee347
SAAS-940: Provide usability hints to user
...
Refactored some code
2015-07-13 11:19:04 -04:00
drigato
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
Albert Santoni
1efa591d67
Fixed double HTML encoding on embedded schedule widget
2015-07-09 12:49:49 -04:00
Duncan Sommerville
3cebbaf29a
Add aac mime-types into audio mime map
2015-07-07 16:15: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
a5a91c25e0
SAAS-929: Shows don't show up on schedule widget on Firefox
2015-07-06 12:53:15 -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
e69eb9c2b1
SAAS-916: Localize schedule widget dates
2015-07-06 09:33:04 -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
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