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
|
661a87dfbc
|
SAAS-948 - Frontend tweaks and fixes
|
2015-07-29 13:35:01 -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
|
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
|
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 |
|
Duncan Sommerville
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -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
|
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
|
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
|
9fdc08f88a
|
SAAS-876 - reset to default settings when using Airtime Pro streaming
|
2015-07-13 12:28:58 -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
|
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 |
|
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 |
|
Duncan Sommerville
|
776596d5b6
|
SAAS-922 - replace large conditionals with single public mime-type map
|
2015-07-07 15:48:22 -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 |
|
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 |
|
Duncan Sommerville
|
457230ba07
|
SAAS-876 - Initial commit
|
2015-07-03 13:32:41 -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
|
5cc8774e56
|
Merge branch 'saas-dev' into soundcloud
Conflicts:
airtime_mvc/application/configs/constants.php
|
2015-06-29 10:02: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
|
5fe70754bd
|
Replace all timestamp strings with constant
|
2015-06-26 14:42:52 -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
|
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 |
|
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
|
7645f67515
|
SAAS-877 - Update live-info-v2 api
|
2015-06-24 12:18:52 -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
|
02e0537be9
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-18 13:29:59 -04:00 |
|
Duncan Sommerville
|
88bd3c9bc2
|
SAAS-872 - Load disk information statically
|
2015-06-18 10:03:05 -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
|
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 |
|
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
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -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
|
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
|
b4c9a77e7c
|
CC-6055: Improved escaping
|
2015-06-12 13:48:54 -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
|
357e17f3b4
|
Fix for station logo not displaying correctly
|
2015-06-10 15:57:09 -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 |
|
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 |
|
Duncan Sommerville
|
f031d13867
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-09 14:03:03 -04:00 |
|
Albert Santoni
|
02d49864fa
|
Squash some error notices in UserController
|
2015-06-08 15:17:48 -04:00 |
|
drigato
|
060280d5a5
|
Merge branch 'saas-dev' into saas-landing-page
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/IndexController.php
|
2015-06-08 14:55:24 -04:00 |
|
Albert Santoni
|
ada6b97873
|
CC-6050: User management bugfix
|
2015-06-05 12:34:51 -04:00 |
|
Duncan Sommerville
|
14f37909d1
|
More robust error handling in show-logo action
|
2015-06-05 11:55:06 -04:00 |
|
Albert Santoni
|
dd4cbe5b63
|
CC-6051 - Route / generates invalid navigation bar links
|
2015-06-05 11:52:51 -04:00 |
|
Duncan Sommerville
|
f6e23ab075
|
Add more error handling to show-logo api
|
2015-06-04 18:45:00 -04:00 |
|
drigato
|
8386145cb9
|
SAAS-836: Create a new schedule widget skin
|
2015-06-04 16:09:19 -04:00 |
|
drigato
|
6528a9b0a3
|
SAAS-843: Create Embeddable Schedule Widget View
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
|
2015-06-04 12:00:23 -04:00 |
|
Duncan Sommerville
|
b0b6e037ac
|
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
|
2015-06-03 16:57:17 -04:00 |
|
drigato
|
d6ec9e99b5
|
Remove unused embed controller action
|
2015-06-03 10:12:19 -04:00 |
|
drigato
|
3de1d90241
|
Unhardcode premium style player
Had this is for testing purposes
|
2015-06-03 10:02:27 -04:00 |
|
drigato
|
1add10c657
|
SAAS-833: Radio page UI improvements/fixes
Fixed schedule widget scrolling
Inserted default station description
|
2015-06-03 08:29:03 -04:00 |
|
Albert Santoni
|
01ea6f27ae
|
Merge branch 'saas-dev' into saas-installer-albert
Conflicts:
python_apps/api_clients/api_clients/api_client.py
|
2015-06-02 15:40:57 -04:00 |
|
Albert Santoni
|
a8d2290d00
|
SAAS-834: Login with WHMCS account doesn't work on suspended stations
|
2015-05-29 16:43:27 -04:00 |
|
Albert Santoni
|
7a6184cf23
|
Merge branch 'saas' into saas-dev
|
2015-05-28 15:29:28 -04:00 |
|
Albert Santoni
|
187ef926ff
|
Allow public APIs to be accessed with the API key regardless of the public API setting.
|
2015-05-28 15:28:51 -04:00 |
|
drigato
|
8f8b0b7f4d
|
Merge branch 'saas-dev' into saas-landing-page
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/views/scripts/embed/player.phtml
|
2015-05-28 13:25:18 -04:00 |
|
drigato
|
018bb3a648
|
SAAS-823: Tunein preference check box issue
|
2015-05-28 11:54:23 -04:00 |
|
Duncan Sommerville
|
51a3f19f43
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-05-27 14:02:00 -04:00 |
|
Duncan Sommerville
|
1fa45bfc48
|
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
|
2015-05-27 14:01:49 -04:00 |
|
drigato
|
27868fbfe5
|
SAAS-813: Wire up schedule widget on Radio Page
|
2015-05-27 13:50:25 -04:00 |
|
drigato
|
532bd1ea85
|
SAAS-772: Send metadata to Tunein
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
|
2015-05-25 15:37:45 -04:00 |
|
Albert Santoni
|
11c6818e61
|
Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
|
2015-05-22 16:05:29 -04:00 |