Duncan Sommerville
|
14b35dcf18
|
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
|
2015-10-29 09:37:39 -04:00 |
Duncan Sommerville
|
9302027a2b
|
Fix issue with automatic ingest; shift episode ingest to PodcastEpisodesController
|
2015-10-22 12:12:41 -04:00 |
Duncan Sommerville
|
0b1df6baf3
|
* SAAS-1084 - initial work on publishing API backend
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
|
2015-10-20 19:03:34 -04:00 |
Duncan Sommerville
|
12f6536e74
|
Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
|
2015-10-19 16:18:19 -04:00 |
Duncan Sommerville
|
bddc121c2d
|
Initial work on automatic ingest for imported podcasts
|
2015-10-15 14:44:17 -04:00 |
Albert Santoni
|
8b33acacd3
|
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
|
2015-09-29 18:58:55 -04:00 |
Albert Santoni
|
8b6833180d
|
Refactored double Set-Cookie prevention code, and session reopening code
|
2015-09-25 12:03:10 -04:00 |
Albert Santoni
|
c03e9cbe9a
|
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
|
2015-09-25 10:41:51 -04:00 |
Duncan Sommerville
|
778b67982b
|
Remove duplicate imports and add new table imports to ScheduleController
|
2015-09-24 12:56:32 -04:00 |
Duncan Sommerville
|
ee1ceb9281
|
Update TaskManager to be a bit easier to extend
|
2015-09-22 20:21:19 -04:00 |
Albert Santoni
|
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 |
Albert Santoni
|
479153df17
|
Merge branch 'saas' into saas-dev
Conflicts:
airtime_mvc/public/css/billing.css
|
2015-09-21 18:01:56 -04:00 |
Albert Santoni
|
2a79424a64
|
Increase the CSRF token timeout
|
2015-09-21 18:00:04 -04:00 |
Duncan Sommerville
|
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 |
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
|
0d80f857d3
|
Fix broken import
|
2015-09-15 16:08:19 -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 |
Albert Santoni
|
b99ec51863
|
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
|
2015-08-25 15:15:03 -04:00 |
Duncan Sommerville
|
f138dc6b47
|
SAAS-948 - tab layout for right-hand pane
|
2015-07-31 18:28:16 -04:00 |
Duncan Sommerville
|
fcbc37977f
|
SAAS-948 - Frontend tweaks
|
2015-07-28 11:42:04 -04:00 |
drigato
|
fd09941223
|
Merge branch 'saas-dev' into saas-dev-usability-hints
|
2015-07-15 13:59:43 -04:00 |
Duncan Sommerville
|
7ce3082fa2
|
Fix upgrade being run from unit tests
|
2015-07-15 11:46:52 -04:00 |
drigato
|
55999a07ec
|
SAAS-940: Provide usability hints to user
|
2015-07-13 08:06:41 -04:00 |
Duncan Sommerville
|
999f03ea1e
|
Merge branch 'saas' into saas-dev
|
2015-07-06 16:54:39 -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
|
04fe265538
|
Task manager update to run individual tasks
|
2015-06-30 11:46:58 -04:00 |
Duncan Sommerville
|
4be34ea94b
|
Add version string to favicon to force refresh
|
2015-06-29 10:26: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
|
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
|
02e0537be9
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-18 13:29:59 -04:00 |
Duncan Sommerville
|
8d2e476ff1
|
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
|
2015-06-16 15:10:08 -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 |
Albert Santoni
|
b4c9a77e7c
|
CC-6055: Improved escaping
|
2015-06-12 13:48:54 -04:00 |
Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -04:00 |
Duncan Sommerville
|
626489bb3b
|
SAAS-853 - Celery backend for SoundCloud uploads
|
2015-06-10 15:04:49 -04:00 |
Albert Santoni
|
c18e728583
|
Merge branch 'saas-installer-albert' into saas-dev
|
2015-06-10 15:03:11 -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 |
Duncan Sommerville
|
49165e91d9
|
SAAS-854 - celery-based SoundCloud backend uploader
|
2015-06-09 14:02:29 -04:00 |
Duncan Sommerville
|
b0b6e037ac
|
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
|
2015-06-03 16:57:17 -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
|
a74a161936
|
SAAS-812: Remove live chat from radio page
|
2015-05-27 10:18:50 -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 |
drigato
|
479dbc5525
|
SAAS-786: Implement Landing Page Design
Implemented logo, station name and description
|
2015-05-15 09:01:20 -04:00 |
Duncan Sommerville
|
8b380086c3
|
Merge branch 'saas-dev' into saas-speedy
|
2015-05-04 13:09:51 -04:00 |
Duncan Sommerville
|
574fdf4b27
|
Merged 2.5.x into saas
|
2015-04-27 14:01:28 -04:00 |
Duncan Sommerville
|
4b307d6b47
|
Fix for vertical scrollbar issue
|
2015-04-27 13:52:55 -04:00 |
Albert Santoni
|
088ada1d2c
|
Reformatted Bootstrap, added Station Suspended notice
|
2015-04-10 17:14:56 -04:00 |