Albert Santoni
|
75914b791c
|
Merge branch 'saas-dev' into saas
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
|
2015-08-10 09:00:54 -04:00 |
Duncan Sommerville
|
bf6244c835
|
SAAS-948
|
2015-08-07 19:20:29 -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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
a1a2bf9368
|
Test out existing email functionality
|
2015-07-22 11:19:37 -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
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -04:00 |
|
Albert Santoni
|
2693c9f02c
|
Small bugfix for CC-6064
|
2015-07-14 11:25:11 -04:00 |
|
Albert Santoni
|
66caf2574a
|
CC-6064: Allow shows to be started "now"
|
2015-07-14 10:35:21 -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 |
|
drigato
|
0601bd675e
|
SAAS-939: Add option to preferences to display login button on radio page
|
2015-07-09 14:38:44 -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
|
6b9d9e8063
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-08 12:47:24 -04:00 |
|
drigato
|
b200a29f43
|
SAAS-928: Time strings on Radio Page are not localized
|
2015-07-07 09:21:44 -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
|
ec0fbd2d61
|
Fix for schedule widget weekdays going out of order
|
2015-07-06 10:47:04 -04:00 |
|
Duncan Sommerville
|
457230ba07
|
SAAS-876 - Initial commit
|
2015-07-03 13:32:41 -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
|
f87fe11a24
|
SAAS-908 - Break source URL strings into host/port/mount fields
|
2015-06-30 12:14:33 -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 |
|
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
|
9d60a3d130
|
Move Help Translate Airtime link to help menu
|
2015-06-26 14:27:27 -04:00 |
|
Duncan Sommerville
|
3a51e66b07
|
Add transifex link to login page
|
2015-06-26 13:25:19 -04:00 |
|
Duncan Sommerville
|
c44bae8140
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2015-06-26 10:37:30 -04:00 |
|
Duncan Sommerville
|
6497bc28c5
|
Show collapsible sections (other than 'dangerous settings') by default on preferences page
|
2015-06-25 17:43:15 -04:00 |
|
Duncan Sommerville
|
87bdc01318
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-06-25 14:13:25 -04:00 |
|
Duncan Sommerville
|
6fb9c6a30c
|
SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences
|
2015-06-25 14:13:09 -04:00 |
|
Duncan Sommerville
|
70f6cbbc71
|
Fixes to airtime-celery setup
|
2015-06-23 15:10:02 -04:00 |
|
Albert Santoni
|
1bb6ee63dc
|
SAAS-867: Embedded player spins in endless loop if connection is refused
|
2015-06-19 15:30:51 -04:00 |
|
Duncan Sommerville
|
02e0537be9
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-18 13:29:59 -04:00 |
|
Duncan Sommerville
|
298ee30e9d
|
Move misplaced tag
|
2015-06-18 10:03:12 -04:00 |
|
Duncan Sommerville
|
88bd3c9bc2
|
SAAS-872 - Load disk information statically
|
2015-06-18 10:03:05 -04:00 |
|
Duncan Sommerville
|
89e3eaa986
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 17:00:15 -04:00 |
|
Duncan Sommerville
|
af2f757985
|
Move misplaced tag
|
2015-06-17 14:52:04 -04:00 |
|
Duncan Sommerville
|
b42d773b5d
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 13:45:33 -04:00 |
|
Duncan Sommerville
|
4b3b3b5b93
|
SAAS-872 - Load disk information statically
|
2015-06-17 13:44:14 -04:00 |
|
Duncan Sommerville
|
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
|
0f58e315e6
|
Merge branch 'saas-cc-6055' into saas
|
2015-06-16 16:13:40 -04:00 |
|
Duncan Sommerville
|
0cd9b1d0e5
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-16 15:10:14 -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 |
|
drigato
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -04:00 |
|
drigato
|
4c6ba869e3
|
Fix Radio Page schedule widget iframe size
|
2015-06-15 16:07:42 -04:00 |
|
drigato
|
0c4888fbd6
|
Radio Page fixes
Added scrolling back to radio page
|
2015-06-15 15:03:34 -04:00 |
|
drigato
|
ad5121f2ca
|
Radio Page improvements
|
2015-06-15 14:42:37 -04:00 |
|
Duncan Sommerville
|
706d7db2b2
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-15 11:03:37 -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 |
|
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 |
|
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
|
1efc47beb9
|
Tweaked layout of the embed widgets page
|
2015-06-11 14:30:52 -04:00 |
|
drigato
|
2dbed71681
|
SAAS-860: Schedule widget embed src is wrong
|
2015-06-11 12:37:51 -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 |
|
Duncan Sommerville
|
8163608666
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-10 16:25:30 -04:00 |
|
Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -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 |
|
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
|
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 |
|
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 |