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
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -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
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -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
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -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
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -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
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
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
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -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
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -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
07f02260db
Fix undefined index: nextMediaName
2015-07-17 09:57:24 -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
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
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -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
0601bd675e
SAAS-939: Add option to preferences to display login button on radio page
2015-07-09 14:38:44 -04:00
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -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
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
cb0593370a
Quick fix
2015-07-04 00:38:53 -04:00
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
1c8ccbf0cd
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-06-29 16:36:38 -04:00
cffc3b7e59
Add semi-colon to Shoutcast URLs to make them work with our player
2015-06-29 16:36:19 -04:00
04290e28dc
Fix error getting current schedule information if connected to master source
2015-06-29 14:25:00 -04:00
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
5fe70754bd
Replace all timestamp strings with constant
2015-06-26 14:42:52 -04:00
d91b05a0ae
SoundCloud - Add release_year metadata field and set default sharing and license types
2015-06-25 10:53:35 -04:00
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
8fcaf7fc74
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
e44e0de534
Add fields to SoundCloud upload
2015-06-24 15:46:53 -04:00
616cf143d5
SAAS-877 - Fix live-info-v2 behaviour
2015-06-24 14:28:04 -04:00
ef957fe0aa
SAAS-877 - Fix errors
2015-06-24 13:07:13 -04:00
fd8194e7d8
Fix error getting media
2015-06-24 12:40:51 -04:00
ffc3ef1bc9
SAAS-877 - Update live-info-v2 api
2015-06-24 12:31:32 -04:00
7645f67515
SAAS-877 - Update live-info-v2 api
2015-06-24 12:18:52 -04:00
065988f703
Return default value for disk quota if none set
2015-06-23 19:08:49 -04:00
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
0cd9b1d0e5
Merge branch 'saas-dev' into soundcloud
2015-06-16 15:10:14 -04:00
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
5b6f4ca12a
SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading
2015-06-15 12:19:03 -04:00
706d7db2b2
Merge branch 'saas-dev' into soundcloud
2015-06-15 11:03:37 -04:00
15c7ef5885
Celery backend and support for dev-env worker parallelization
2015-06-12 12:31:55 -04:00
0f3b68eed7
Default the Public Airtime API to being on
2015-06-10 17:55:04 -04:00
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
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
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
0796f58878
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 11:14:02 -04:00
6126e8a51c
Merge branch 'saas' into saas-dev
2015-06-10 11:02:59 -04:00
ca8ca0abed
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 09:07:12 -04:00
fb1fc6fb00
CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers
2015-06-09 17:14:33 -04:00
f031d13867
Merge branch 'saas-dev' into soundcloud
2015-06-09 14:03:03 -04:00
49165e91d9
SAAS-854 - celery-based SoundCloud backend uploader
2015-06-09 14:02:29 -04:00
87920c1fc1
SAAS-855: Default station description in Preferences
2015-06-09 09:01:15 -04:00
23dd6d4021
CC-6054: live-info-v2 returns future shows without ordering by start time
2015-06-08 16:38:17 -04:00
ada6b97873
CC-6050: User management bugfix
2015-06-05 12:34:51 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
305cb894c3
SAAS-841: Default station logo to the Airtime logo
2015-06-03 11:53:32 -04:00
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
b5e72d673f
Next track in dashboard was wrong sometimes
...
Was not filtering by playout_status
2015-06-02 09:48:43 -04:00
182b12e0e3
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
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
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
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
c85457ec0b
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for undefined variable
2015-05-22 10:53:29 -04:00
099537a1b7
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Renamed function
Removed old function
2015-05-22 09:47:55 -04:00
8b02002f5e
Merge branch 'saas-dev' into saas-temp-testing
2015-05-22 08:56:43 -04:00
c9a6260cc0
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Removed commented code
2015-05-22 08:53:29 -04:00
5330859f00
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
small fix
2015-05-22 08:51:32 -04:00
b80c102e99
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fixes for webstreams
2015-05-22 08:09:59 -04:00
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
2b8e40a12c
Merge branch 'saas' into saas-speedy
2015-05-21 15:09:57 -04:00
537fd2f148
SAAS-794 Schedule/get-current-playlist can take too long to respond
...
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
2015-05-20 16:10:31 -04:00
b8dd7f0df3
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-05-19 16:21:16 -04:00
ae3fef383e
Removed station_domain from messages to airtime_analyzer, unused.
2015-05-19 16:20:51 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
4451c49c06
SAAS-772: Send metadata to Tunein
...
This is pretty much working except with master source metadata
2015-05-19 14:39:05 -04:00
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
bff04820f2
Add quiet flag to StoredFile delete to avoid unnecessary sentry errors when clearing library
2015-05-13 17:58:11 -04:00
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
689a431867
Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon()
2015-05-11 14:34:21 -04:00
3d99c423a9
Merge branch '2.5.x' into saas
2015-05-11 11:08:52 -04:00
efad7be91a
CC-5120: Can't add PLS webstreams
2015-05-11 11:08:43 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
3ca16db524
Comments
2015-04-17 12:09:05 -04:00
02dff34328
Fixed last day of month calendar view bug
2015-04-16 16:45:20 -04:00
acbaac0bc5
Fixed month view not displaying a full 42 days
2015-04-16 16:30:12 -04:00
d20c8e8df4
Merge branch 'saas' into saas-speedy
2015-04-16 15:59:08 -04:00
dc20b5c252
Bugfixes for my optimizations
...
* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
response correctly if you started on the month view.
2015-04-16 14:58:28 -04:00
b61df4d681
Merge branch '2.5.x' into saas
2015-04-16 12:11:49 -04:00
aa0d0f959a
Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances
2015-04-16 12:10:56 -04:00
8449194ca1
Merge branch 'saas' into saas-speedy
2015-04-15 16:44:43 -04:00
f0bcc1e42b
Merge branch '2.5.x' into saas
2015-04-15 16:44:26 -04:00
4267c4e86d
CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen
2015-04-15 16:44:04 -04:00
1194a0f959
Some big performance optimizations to Now Playing JavaScript.
...
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
fbcd5bc5bd
Merge branch 'saas' into saas-embed-player
2015-04-09 15:09:03 -04:00
3e255bfd37
Merge branch 'saas' into saas-speedy
2015-04-09 12:20:23 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
69b03cdefa
Three small bugfixes
...
* Remove files from the database even if they couldn't be removed from disk. (log a warning)
* Return a better error message if the user attempts to delete a scheduled file
* Attempt to squash headers already sent warning during buffer flushing
in FileIO.php
2015-04-01 16:16:46 -04:00
7fd58ac51b
Merge branch 'saas-s3proxy' into saas
2015-04-01 13:49:47 -04:00
353bfe86a5
Addded default for mobile stream setting
2015-04-01 13:05:08 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
58624ec100
Try to silence another permissions error problem
2015-03-25 17:34:38 -04:00
99d16444d2
Squash unlink warning in CcFiles.php
2015-03-25 10:51:51 -04:00
d1b28fd564
Fixed a bug in FTP upload hook, other minor improvements
...
* Ensure we have write permissions on any newly uploaded files by FTP
* Don't silence warnings in moveFileToStor()
* Reduced the FTP upload max retry count
* Log E_NOTICE and E_WARNING levels to Sentry
2015-03-24 14:56:03 -04:00
bc2acaea51
Don't fire conversion tracking for the sourcefabric_admin user
2015-03-24 11:18:03 -04:00
084c6dd662
PHP compatibility fix
2015-03-24 10:34:48 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -04:00
Duncan Sommerville
Albert Santoni
drigato
Duncan Sommerville