e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
74a1e0929d
Fixed styling on Listener Stats page
2015-08-17 16:08:58 -04:00
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
8dd580e623
Applied context menu restyling globally
2015-08-12 17:47:55 -04:00
0c83b62545
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 17:37:01 -04:00
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
32100e2d9b
SAAS-948 - frontend tweaks
2015-08-12 16:54:45 -04:00
61d1e6bb50
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-12 16:45:07 -04:00
409e9e2a78
Stream settings, Add Show form CSS revamp, etc.
2015-08-12 16:44:45 -04:00
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
21250e91c4
More calendar tweaks
2015-08-12 14:33:34 -04:00
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
f63ce23c9f
Flatten datatable headers and restyled Manage Users screen
2015-08-12 10:53:14 -04:00
e5f70e7ec3
Re-enable the task manager, it made no difference
2015-08-11 17:32:40 -04:00
60a02cfdee
Temporarily disable the task manager to test lock contention
2015-08-11 16:34:28 -04:00
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
c9f9bed2d6
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
2015-08-10 18:46:12 -04:00
849b8038ce
Mostly new graphics for the calendar page
2015-08-10 17:11:40 -04:00
a28df91c56
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 14:17:24 -04:00
2af5eb3314
Add Media page visual refresh, and use dropzone
2015-08-10 14:17:16 -04:00
641486e852
SAAS-948 - Showbuilder fixes
2015-08-10 13:44:57 -04:00
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -04:00
974f979bef
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 12:23:30 -04:00
fc7a700654
Consolidated some CSS
2015-08-10 12:23:22 -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
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
cdc9f88c1c
Big style update for the new show builder screen
...
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
e6609896a5
SAAS-948 - showbuilder styling
2015-08-07 16:49:05 -04:00
a82b75743f
Fix error messages being swapped on the password reset page
2015-08-07 14:41:10 -04:00
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
b5e5fcfc98
More tweaks for password reset
2015-08-07 14:22:01 -04:00
bd83eefefe
Cleanup for password reset post-email screen
2015-08-07 14:09:01 -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
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -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
4cbc49391b
Reintroduce checkboxes
2015-08-05 18:14:56 -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
1093e7085a
Re-enable hiding the first run popup after first run
2015-08-05 15:00:28 -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
33d2fe0900
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
2015-08-04 19:56:12 -04:00
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
57c1d74286
SAAS-985 - Port sandwich menu to showbuilder branch
2015-08-04 16:37:45 -04:00
4200f56265
SAAS-999 - Change Advanced Search Options to dropdown
2015-08-04 15:38:48 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
d0d6efd508
Fix m4a uploads in Airtime
2015-07-31 15:02:53 -04:00
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
8a52178765
Fix for billing downgrade with no new invoice created
2015-07-31 13:42:47 -04:00
5530142174
Un-doing last 2 committs about invoices
2015-07-31 12:01:26 -04:00
aab4b634bf
Show form on billing page if no invoice was generated after downgrade
2015-07-31 11:56:00 -04:00
278ca264eb
Fix for bringing customer to view invoice that doesn't exist after downgrade
2015-07-31 11:48:20 -04:00
78327c4f68
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-07-31 11:44:29 -04:00
84c21de578
Fix error logic if no API key passed to provisioning/create API
2015-07-31 11:43:58 -04:00
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
48d745bf77
Hide Awesome August 2015 promo plans from billing page
2015-07-30 13:37:15 -04:00
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
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
d9e2ba0ed3
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Un-hardcode product ids
2015-07-30 09:39:50 -04:00
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
8f5f0eb5fe
SAAS-948 - CSS overhaul for new show builder page
2015-07-29 20:28:54 -04:00
661a87dfbc
SAAS-948 - Frontend tweaks and fixes
2015-07-29 13:35:01 -04:00
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -04:00
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
75aef986ea
SAAS-781 - Code review fixes
2015-07-28 11:47:53 -04:00
fcbc37977f
SAAS-948 - Frontend tweaks
2015-07-28 11:42:04 -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
989b4994aa
SAAS-945: Language + Timezone Setup Popup
...
forgot to auto detect user's timezone
2015-07-27 14:38:42 -04:00
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00
ce0cc946ab
Disable password reset in saas-dev (moved to saas-email branch)
2015-07-23 13:00:34 -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
ce7765a8cb
Merge branch 'saas' into saas-dev
2015-07-21 11:03:31 -04:00
6f09ef4af1
Change usability hint wording
2015-07-21 07:27:26 -04:00
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
7f4fbf65e1
SAAS-960 Change hint for currently playing linked show
2015-07-17 12:48:57 -04:00
07f02260db
Fix undefined index: nextMediaName
2015-07-17 09:57:24 -04:00
ec74e17ebe
Merge branch 'saas' into saas-dev-july-16
2015-07-17 07:40:15 -04:00
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
0dd2958333
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:43:22 -04:00
041053b171
SAAS-922 - urlencode content headers to ensure compatibility
2015-07-16 14:24:07 -04:00
04333aaa29
SoundCloud download initial commit
2015-07-16 11:27:27 -04:00
452c17650c
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:05:39 -04:00
40d8212c13
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-16 11:03:53 -04:00
c5e7d6734e
SAAS-951 - fix SoundCloud capitalization
2015-07-16 11:03:30 -04:00
dd5d6342a7
Merge branch 'saas-dev-usability-hints' into saas-dev
2015-07-16 11:00:04 -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
fd09941223
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-15 13:59:43 -04:00
8276b1762e
Updated outdated public airtime api setting message on preferences page
2015-07-15 13:47:54 -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
7ce3082fa2
Fix upgrade being run from unit tests
2015-07-15 11:46:52 -04:00
6a01205034
SAAS-940: Provide usability hints to user
...
Fixed bug where sometimes the hint would not show up
2015-07-15 11:35:59 -04:00
e07d62b020
Small comments fix
2015-07-15 10:41:01 -04:00
7b237a2e65
SAAS-940: Provide usability hints to user
...
Changed some hint wording
2015-07-14 12:14:00 -04:00
8309289356
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 11:52:10 -04:00
2de831a37f
SAAS-940: Provide usability hints to user
...
Made hints more specific
2015-07-14 11:45:37 -04:00
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
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
66caf2574a
CC-6064: Allow shows to be started "now"
2015-07-14 10:35:21 -04:00
71e8909365
SAAS-940: Provide usability hints to user
...
Fixed bug where hints were not showing up sometimes
2015-07-14 10:08:56 -04:00
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
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
8e15dd5e99
Merge branch 'saas-dev' into saas-dev-usability-hints
2015-07-13 15:34:06 -04:00
755ec79e7d
SAAS-876 - frontend tweaks
2015-07-13 15:17:47 -04:00
56585fb01c
Add default icecast pass to settable params in ProvisioningController
2015-07-13 13:28:27 -04:00
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
33bd1ec605
Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev
2015-07-13 11:19:42 -04:00
48547ee347
SAAS-940: Provide usability hints to user
...
Refactored some code
2015-07-13 11:19:04 -04:00
721cd5a31b
SAAS-924: Cannot edit repeating show if first instance has ended
...
Added safeguard in case we don't find a future show instance
2015-07-13 09:04:49 -04:00
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -04:00
c99165a8dd
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
2015-07-10 13:17:20 -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
e4720b5992
Remove incorrect sql in 2.5.14 upgrade
2015-07-10 10:27:28 -04:00
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
0601bd675e
SAAS-939: Add option to preferences to display login button on radio page
2015-07-09 14:38:44 -04:00
1efa591d67
Fixed double HTML encoding on embedded schedule widget
2015-07-09 12:49:49 -04:00
1b3a9f6e6a
SAAS-924: Cannot edit repeating show if first instance has ended
...
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
2015-07-09 12:18:21 -04:00
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
4b8944f221
Improved explanation for live streaming form
2015-07-09 09:22:49 -04:00
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
3cebbaf29a
Add aac mime-types into audio mime map
2015-07-07 16:15:35 -04:00
e12494ef5f
Fix show source mount error
2015-07-07 15:55:35 -04:00
776596d5b6
SAAS-922 - replace large conditionals with single public mime-type map
2015-07-07 15:48:22 -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
0d27011e65
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-07-07 09:21:54 -04:00
b200a29f43
SAAS-928: Time strings on Radio Page are not localized
2015-07-07 09:21:44 -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
999f03ea1e
Merge branch 'saas' into saas-dev
2015-07-06 16:54:39 -04:00
a5a91c25e0
SAAS-929: Shows don't show up on schedule widget on Firefox
2015-07-06 12:53:15 -04:00
ec0fbd2d61
Fix for schedule widget weekdays going out of order
2015-07-06 10:47:04 -04:00
f86c50a834
SAAS-916: Localize schedule widget dates
...
Fix to use existing locale strings
2015-07-06 10:30:16 -04:00
71b2a4e946
Removing duplicate locale strings
2015-07-06 10:29:02 -04:00
6914e16165
SAAS-916: Localize schedule widget dates
...
Forgot to commit msg strings for this
2015-07-06 10:21:27 -04:00
e69eb9c2b1
SAAS-916: Localize schedule widget dates
2015-07-06 09:33:04 -04:00
db7e4086ba
Re-add favicon headlink
2015-07-04 01:16:58 -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
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
f87fe11a24
SAAS-908 - Break source URL strings into host/port/mount fields
2015-06-30 12:14:33 -04:00
04fe265538
Task manager update to run individual tasks
2015-06-30 11:46:58 -04:00
5f925f2f1f
Merge branch 'saas-dev' into saas-dev-schedule-widget-angular
2015-06-30 09:46:36 -04:00
6db75550cc
SAAS-870: Schedule widget displays shows in wrong timezone
...
Timezone conversion done in frontend
2015-06-30 09:38:53 -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
4be34ea94b
Add version string to favicon to force refresh
2015-06-29 10:26:52 -04:00
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
0a4651f752
SAAS-870: Schedule widget displays shows in wrong timezone
...
Have angularjs hooked in
2015-06-26 15:25:44 -04:00
5fe70754bd
Replace all timestamp strings with constant
2015-06-26 14:42:52 -04:00
9d60a3d130
Move Help Translate Airtime link to help menu
2015-06-26 14:27:27 -04:00
881471c6b8
SAAS-793 - Prevent show image upload when editing single instance of a repeating show
2015-06-26 14:23:45 -04:00
7e0b6ac7ba
Add transifex link constant
2015-06-26 13:28:05 -04:00
3a51e66b07
Add transifex link to login page
2015-06-26 13:25:19 -04:00
6b9899d11c
SAAS-882 - Switch edit user page to use new-style csrf generation
2015-06-26 10:45:26 -04:00
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
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
87bdc01318
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-06-25 14:13:25 -04:00
6fb9c6a30c
SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences
2015-06-25 14:13:09 -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
adff664e87
Fix sending null fields to SoundCloud
2015-06-24 16:13:04 -04:00
e44e0de534
Add fields to SoundCloud upload
2015-06-24 15:46:53 -04:00
d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
f26559c0c6
Fix permissions for SoundCloud functionality
2015-06-24 14:48:38 -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
4c797cf100
Update installer to work with saas branch
2015-06-23 19:02:55 -04:00
d48e594dcd
Fix upload to SoundCloud button remaining disabled after upload failure
2015-06-23 19:02:28 -04:00
70f6cbbc71
Fixes to airtime-celery setup
2015-06-23 15:10:02 -04:00
1bb6ee63dc
SAAS-867: Embedded player spins in endless loop if connection is refused
2015-06-19 15:30:51 -04:00
74b403897d
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-06-19 14:23:46 -04:00
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
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
de184d761e
Rename variable
2015-06-18 13:49:25 -04:00
6439bc9ad5
Add timestamp on SoundCloud upload success
2015-06-18 13:32:43 -04:00
02e0537be9
Merge branch 'saas-dev' into soundcloud
2015-06-18 13:29:59 -04:00
298ee30e9d
Move misplaced tag
2015-06-18 10:03:12 -04:00
88bd3c9bc2
SAAS-872 - Load disk information statically
2015-06-18 10:03:05 -04:00
afb02301c1
SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115
2015-06-17 17:16:21 -04:00
89e3eaa986
Merge branch 'saas-dev' into soundcloud
2015-06-17 17:00:15 -04:00
af2f757985
Move misplaced tag
2015-06-17 14:52:04 -04:00
b42d773b5d
Merge branch 'saas-dev' into soundcloud
2015-06-17 13:45:33 -04:00
4b3b3b5b93
SAAS-872 - Load disk information statically
2015-06-17 13:44:14 -04:00
27bebb9168
Remove logging statement
2015-06-17 13:09:56 -04:00
3a1d34dffe
Merge branch 'saas-dev' into soundcloud
2015-06-17 10:14:03 -04:00
627343a626
Fixed the status page
2015-06-16 18:18:34 -04:00
e033360a4e
Fix error when deleting SoundCloud tracks
2015-06-16 16:21:31 -04:00
0f58e315e6
Merge branch 'saas-cc-6055' into saas
2015-06-16 16:13:40 -04:00
0b6fb9882a
Fix provisioning
2015-06-16 16:04:20 -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
61272cd42c
Handle 404s with the correct error page, and don't log them
2015-06-16 14:58:27 -04:00
90bd0a1ab4
Attempt at fixing Sentry error logging
2015-06-16 14:35:29 -04:00
709b9bbeec
CC-6059: Default station logo broken in Audio Preview popup
2015-06-16 13:37:05 -04:00
4bebe1e0fb
Radio page fixes
2015-06-16 12:50:40 -04:00
4c6ba869e3
Fix Radio Page schedule widget iframe size
2015-06-15 16:07:42 -04:00
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
0c4888fbd6
Radio Page fixes
...
Added scrolling back to radio page
2015-06-15 15:03:34 -04:00
507268a563
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-06-15 14:42:56 -04:00
ad5121f2ca
Radio Page improvements
2015-06-15 14:42: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
f4ff00355d
Added Radio Page link
2015-06-12 17:21:46 -04:00
0b5b2329ed
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-12 16:06:04 -04:00
b4c9a77e7c
CC-6055: Improved escaping
2015-06-12 13:48:54 -04:00
abc81a92b4
XSS prevention for Radio Page
2015-06-12 13:11:28 -04:00
ba2aeae7b4
Radio page changes
...
Moved login button to top right corner.
Changed background image.
2015-06-12 13:07:47 -04:00
15c7ef5885
Celery backend and support for dev-env worker parallelization
2015-06-12 12:31:55 -04:00
53b67d0826
Disabled most of status page for Airtime Pro and fixed HTML syntax errors
2015-06-12 10:36:27 -04:00
980e2ad767
Unbreak the design from my last commit
2015-06-11 15:09:44 -04:00
1efc47beb9
Tweaked layout of the embed widgets page
2015-06-11 14:30:52 -04:00
2dbed71681
SAAS-860: Schedule widget embed src is wrong
2015-06-11 12:37:51 -04:00
832f70d663
SAAS-859: Schedule widget -> Shows can display on the wrong day
2015-06-11 10:10:03 -04:00
255bbf74b7
CC-6057: Empty show schedule should show message in Schedule Widget
2015-06-11 09:16:59 -04:00
7c6f15984d
Small consistency changes for the embeddable widgets
2015-06-10 18:02:25 -04:00
7dafb0e280
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-10 17:55:15 -04:00
0f3b68eed7
Default the Public Airtime API to being on
2015-06-10 17:55:04 -04:00
c1b5b53a16
Fix merge errors; use Celery status messages + handle fail case better
2015-06-10 17:11:42 -04:00
8163608666
Merge branch 'saas-dev' into soundcloud
2015-06-10 16:25:30 -04:00
3ecad162e3
Serve radio page font style over https
2015-06-10 16:12:53 -04:00
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
d1ac78be68
Fix for station logo....again...
2015-06-10 16:01:16 -04:00
357e17f3b4
Fix for station logo not displaying correctly
2015-06-10 15:57:09 -04:00
fe5b20c29e
Fix for default station logo not displaying
2015-06-10 15:51:31 -04:00
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
24db599afe
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-06-10 15:03:21 -04:00
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
ffcd15190f
Default station logo was not displaying
2015-06-10 14:46:27 -04:00
ad40ea5c71
Disable removing UI elements from radio page when the login button is clicked
2015-06-10 12:56:31 -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
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
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
d181a931b8
Fix schedule widget layout by removing table structure
2015-06-09 10:30:47 -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
02d49864fa
Squash some error notices in UserController
2015-06-08 15:17:48 -04:00
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
1974774e0c
SAAS-851: Embed schedule widget loses format with long show names
2015-06-05 14:35:27 -04:00
ada6b97873
CC-6050: User management bugfix
2015-06-05 12:34:51 -04:00
14f37909d1
More robust error handling in show-logo action
2015-06-05 11:55:06 -04:00
dd4cbe5b63
CC-6051 - Route / generates invalid navigation bar links
2015-06-05 11:52:51 -04:00
f6e23ab075
Add more error handling to show-logo api
2015-06-04 18:45:00 -04:00
8386145cb9
SAAS-836: Create a new schedule widget skin
2015-06-04 16:09:19 -04:00
cae5f85b0a
Fix typo
2015-06-04 12:17:48 -04:00
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
63b726e6b2
SAAS-848 - Modify SoundCloud code to use external redirect
2015-06-04 11:38:46 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
3593a13064
SAAS-842: Schedule widget show time formatting problem
2015-06-03 12:24:19 -04:00
305cb894c3
SAAS-841: Default station logo to the Airtime logo
2015-06-03 11:53:32 -04:00
d6ec9e99b5
Remove unused embed controller action
2015-06-03 10:12:19 -04:00
3de1d90241
Unhardcode premium style player
...
Had this is for testing purposes
2015-06-03 10:02:27 -04:00
3bf6619696
SAAS-833: Radio page UI improvements/fixes
...
Undo some previous css changes
2015-06-03 09:38:07 -04:00
9a42c4bf36
SAAS-833: Radio page UI improvements/fixes
...
Added width and height to schedule widget iframe tag
2015-06-03 09:18:38 -04:00
1add10c657
SAAS-833: Radio page UI improvements/fixes
...
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -04:00
2cf6cb549e
SAAS-833: Radio page UI improvements/fixes
...
Moved player bar buttons to float right
2015-06-02 16:27:37 -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
a8d2290d00
SAAS-834: Login with WHMCS account doesn't work on suspended stations
2015-05-29 16:43:27 -04:00
30b81c398f
SAAS-814: Decide what to do with new Login Page
...
We decided to link to the existing login page for now
2015-05-29 14:25:00 -04:00
24bfdbaa7f
SAAS-811: Insert extra radio page buttons onto player bar
...
Insert extra buttons onto player bar once the iframe has loaded
2015-05-29 13:40:07 -04:00
77e518eec0
SAAS-821: Wire up new player bar with muses
...
Got metadata displaying
2015-05-29 09:40:50 -04:00
911c168765
SAAS-821: Wire up new player bar with muses
...
Play and stop is working
2015-05-29 09:14:23 -04:00
7a6184cf23
Merge branch 'saas' into saas-dev
2015-05-28 15:29:28 -04:00
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
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
450300ddd8
Small TuneIn validation fix
...
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
018bb3a648
SAAS-823: Tunein preference check box issue
2015-05-28 11:54:23 -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
b50aa15587
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-27 15:16:13 -04:00
51a3f19f43
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-27 14:02:00 -04:00
1fa45bfc48
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
2015-05-27 14:01:49 -04:00
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -04:00
a569387c5a
Removed extra white space
2015-05-27 10:19:15 -04:00
a74a161936
SAAS-812: Remove live chat from radio page
2015-05-27 10:18:50 -04:00
2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -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
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -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
c67549d9c6
Merge branch 'saas-temp-testing' into saas-dev
2015-05-22 10:54:04 -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
94b949adaa
SAAS-772: Send metadata to Tunein
...
Removed unused code
2015-05-22 10:35:36 -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
3052e1f23b
Changed Preferences and Stream Settings pages to use new-style csrf token generation
2015-05-21 10:17:05 -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
506b9cb248
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-20 07:06:22 -04:00
e5a8f14a9a
Commented out request to tunein when station is offline
2015-05-20 07:05:26 -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
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
5b6a88f7fd
Fix bad merge that added soundcloud settings back into preferences page
2015-05-19 15:51:04 -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
2da4e264e5
SAAS-772: Send metadata to Tunein
...
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
c3457ae03f
tunein testing
2015-05-19 15:19:09 -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
1c88d6dccd
Merge branch 'saas' into saas-dev
2015-05-19 12:18:54 -04:00
20649f73bd
Added missing translation for disk quota error message
2015-05-19 12:18:01 -04:00
e91b520b42
SAAS-786: Implement Landing Page Design
...
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
479dbc5525
SAAS-786: Implement Landing Page Design
...
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
70735e7bae
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-14 10:51:53 -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
9d822b6e8b
Only use API authentication (not session) when validating termination requests
2015-05-13 17:58:02 -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
10ca987a51
SAAS-762: Implement schedule widget design
2015-05-12 11:56:35 -04:00
24ebc8c8e4
Merge branch 'saas' into saas-landing-page
2015-05-11 15:54:02 -04:00
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
aee5615cd3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-05-11 14:34:40 -04:00
689a431867
Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon()
2015-05-11 14:34:21 -04:00
21886a509d
Merge branch '2.5.x' into saas
2015-05-11 12:18:09 -04:00
56e5e959ec
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-05-11 12:16:55 -04:00
28997344fc
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 12:16:32 -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
4941ae1a6d
Separated weekly schedule widget css into separate file
2015-05-07 14:27:59 -04:00
9ad0628efa
SAAS-732: Clean up weekly program widget
2015-05-05 15:07:12 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -04:00
fc36ff5797
Updated user manual constant to new manual url
2015-04-30 14:51:35 -04:00
272bb11fcf
Fixed player displaying nothing (instead of Offline) when no show is scheduled
2015-04-30 14:36:33 -04:00
e78bd82c8c
SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour
2015-04-30 14:14:56 -04:00
59b90360a1
SAAS-755 - Updated User Manual link
2015-04-30 11:52:23 -04:00
0418cdbc04
Nerf a player console.log call
2015-04-29 17:26:51 -04:00
85cc373328
Embedded player: Display the show name during master/show source
2015-04-29 16:03:36 -04:00
e73a6df796
Fix for invalid date format issue in Firefox
2015-04-29 15:23:29 -04:00
1215eb1895
Prevent NaN from causing problems with player timeout
2015-04-29 12:58:32 -04:00
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
c0bd28f6d5
Prevent negative timeouts in player
2015-04-29 11:59:17 -04:00
9019377d0e
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-29 11:48:15 -04:00
b3a19ae49e
Bugfix for embedded player sending too many requests on load, quieter logging for boto
2015-04-29 11:46:44 -04:00
4e37788d92
Fix for SAAS-747
2015-04-28 11:42:18 -04:00
94fc2131ff
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
2015-04-27 16:19:15 -04:00
574fdf4b27
Merged 2.5.x into saas
2015-04-27 14:01:28 -04:00
4b307d6b47
Fix for vertical scrollbar issue
2015-04-27 13:52:55 -04:00
9b7acb24c6
SAAS-728: Make schedule widgets embeddable
2015-04-22 12:46:41 -04:00
7d1b112db9
Stopped redirecting to /login if no valid session
2015-04-21 11:26:48 -04:00
de8edf982a
SAAS-723: Add compatibility chart to player page
2015-04-20 10:52:49 -04:00
9cee7bcc86
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-20 10:05:55 -04:00
926d1704bf
SAAS-723: Add compatibility chart to player page
2015-04-20 09:59:17 -04:00
074ad31228
Squash warnings in ProvisioningController
2015-04-17 12:40:52 -04:00
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
bd7c0be514
Whoops, invert the suspension logic
2015-04-17 12:18:49 -04:00
3ca16db524
Comments
2015-04-17 12:09:05 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -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
56716e9af6
Fixed preferences not saving in some cases
2015-04-16 15:11:46 -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
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
838f7e84bf
Merge branch 'saas-player-testing' into saas
2015-04-15 13:22:32 -04:00
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
d5a29398c6
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-15 10:50:57 -04:00
1c2a307d34
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:50:16 -04:00
3b33f55652
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:48:31 -04:00
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
24b6751eeb
Remove unused code from player
2015-04-13 09:18:36 -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
b11e98ea24
Reduced the Now Playing screen AJAX on load from 9 to 2.
2015-04-10 19:52:06 -04:00
988fcae989
Remove console.log
2015-04-10 18:17:22 -04:00
63c3236e7a
Player metadata fix
2015-04-10 17:38:39 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
b8e8a1a983
Player HTML5 error handling fix
2015-04-10 16:44:51 -04:00
1d79f13716
Player HTML5 error handling fix
2015-04-10 16:06:19 -04:00
c80d437601
Fixed player HTML5 error handling
2015-04-10 15:25:49 -04:00
095ca86b34
Open session for writing when we need it (fixes login/logout)
2015-04-10 15:03:25 -04:00
4d7d48d6fb
Player - fix height
2015-04-10 10:55:39 -04:00
9e62c71690
Fix player's manual mode
2015-04-10 10:52:40 -04:00
fbcd5bc5bd
Merge branch 'saas' into saas-embed-player
2015-04-09 15:09:03 -04:00
f238faa937
SAAS-712: UI Improvements
2015-04-09 14:22:50 -04:00
1734cc35c8
Refactored session_write_close() optimization and dashboard preloading
...
hack
2015-04-09 13:03:06 -04:00
84231f811a
SAAS-720: Player can't be accessed unless a user has a valid session
2015-04-09 12:25:27 -04:00
3e255bfd37
Merge branch 'saas' into saas-speedy
2015-04-09 12:20:23 -04:00
4429117f6a
SAAS-712: UI Improvements
2015-04-09 09:43:15 -04:00
78b2631980
Remove stream url js escaping and do it on server side instead
2015-04-08 15:19:22 -04:00
94a7643ebc
Escape stream urls in the player js
2015-04-08 15:00:02 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
481d21ff70
SAAS-662: Make player auto-connect if there is a problem with the stream
...
HTML5 error handling
2015-04-07 11:34:21 -04:00
faee0fba98
SAAS-673: Warn if public api is not enabled under Preferences
2015-04-02 16:54:57 -04:00
e8c8fde8bd
Fix airtime.pro link on player
2015-04-02 15:27:01 -04:00
369a59c564
Changed mobile option text on streams page
2015-04-02 15:13:34 -04:00
fdd8cdfaea
Fixed Airtime badge spacing
2015-04-02 14:35:13 -04:00
3e2cd54be7
Fixed double sending of headers problem with S3 cache
2015-04-01 17:29:21 -04:00
9b85fc59a6
Another attempt at squashing header() warning
2015-04-01 16:29:59 -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
eaeed9be77
SAAS-669: Long station names overlap with link to airtime.pro
2015-04-01 12:50:49 -04:00
c1038cd92f
SAAS-706: Remove volume bar from player
2015-04-01 11:25:58 -04:00
57cd2eda13
bad merge
2015-03-31 18:21:25 -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
15a8e3fa1f
Moved html5 error listener to MusesPlayer constructor
2015-03-31 17:20:42 -04:00
778df97d3c
SAAS-662: Make player auto-connect if there is a problem with the stream
...
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
79d2ae12fb
Added 2.5.12 upgrader and increased show/show instance description field
...
length
2015-03-31 12:38:42 -04:00
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
d0f7f820a7
SAAS-675: Implement "auto" mode
2015-03-27 16:34:04 -04:00
271dc266fa
S3 proxy cache support + 1 minor analyzer bugfix
2015-03-26 12:08:52 -04:00
775635cdc7
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-03-25 17:36:05 -04:00
669d980565
Fixed conf.php
2015-03-25 17:35:43 -04:00
b1c00932c6
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-03-25 17:34:59 -04:00
58624ec100
Try to silence another permissions error problem
2015-03-25 17:34:38 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
47f7ad2e98
Fix to upgrade path
2015-03-25 12:03:01 -04:00
3d2b189dba
removed logging statement
2015-03-25 11:47:23 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
99d16444d2
Squash unlink warning in CcFiles.php
2015-03-25 10:51:51 -04:00
48b4eaacd6
Squashed ob_end_flush(): failed to delete and flush buffer warning
2015-03-24 17:02:04 -04:00
25d6ecac0e
Disabled broken maintenance screen code to squash warnings on upgrade
2015-03-24 16:54:57 -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
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
7b9efb988f
Fixed logic error Amazon_S3StorageBackend
2015-03-20 18:03:23 -04:00
8c7ae6c890
Added safety checks to Amazon_S3StorageBackend
2015-03-20 17:23:53 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
ddd75cb8e3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-03-20 12:36:46 -04:00
68c4cdcab3
Added missing downgrade() function to the 2.5.11 upgrader
2015-03-20 12:36:28 -04:00
28786e7bf1
SAAS-655: Extract muses player events into our own js object
...
Moved player creation into musesPlayer constructor
2015-03-20 07:41:10 -04:00
20d774874e
SAAS-655: Extract muses player events into our own js object
...
Added skeleton functions for setVolume and setURL
2015-03-20 07:35:18 -04:00
59206bc73b
Fixed typo
2015-03-19 17:53:53 -04:00
2ec2403cce
Moved provisioning change function into controller from helper
2015-03-19 17:32:02 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
bd72252e9e
Fixed typos
2015-03-19 12:07:02 -04:00
766f649f56
Merge branch 'saas-dashboard-provisioning' into saas
2015-03-19 11:59:01 -04:00
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
34de6da2c7
Major performance improvements to the Dashboard and Calendar views
...
* Close the PHP session for writing as early as possible in most AJAX
calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
and Calendar views by putting the data in our HTML response (this
makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
week (date->gmdate bug!)
2015-03-13 18:22:27 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
052055bfff
Merge pull request #106 from sourcefabric/saas-update-disk-usage-upgrader
...
SAAS-628: Create script to update disk_usage for all Airtime pro station...
2015-03-11 16:48:28 -04:00
55ed21a155
SAAS-606: Enable disk quota on Airtime Pro
2015-03-11 13:50:17 -04:00
5b3edaa2ca
Add order by clause to /rest/media index action
2015-03-11 13:25:27 -04:00
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
8198d89095
small change to player form
2015-03-10 16:47:08 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
716244011a
Removed unnecessary conditional around /provisioning/change in Bootstrap
2015-03-10 13:20:11 -04:00
b398fea7e7
SAAS-628: Create script to update disk_usage for all Airtime pro stations
2015-03-10 12:29:30 -04:00
0d790213e3
Merge pull request #103 from sourcefabric/saas-paginagte-rest-media-index-action
...
Saas paginagte rest media index action
2015-03-06 14:31:06 -05:00
e315498a5c
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Modified /rest/media to return items where file_exists = true
2015-03-06 12:21:51 -05:00
47e6879766
Fixed Billing.php again
2015-03-06 11:18:48 -05:00
6cecb7c239
Simplified the FTP upload hook
2015-03-06 11:06:17 -05:00
962f5d925d
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Fixed small typo
2015-03-06 09:32:14 -05:00
e9adf1a7ed
Merge branch 'saas-623' into saas
...
Conflicts:
airtime_mvc/application/common/Billing.php
2015-03-05 18:23:09 -05:00
8cdecff022
Fixed Billing::GetClientInstanceId()
2015-03-05 18:22:04 -05:00
df48de607b
Revert billing client ID change
2015-03-05 17:45:07 -05:00
7607888257
Merge branch 'saas' into saas-paginagte-rest-media-index-action
2015-03-05 14:27:32 -05:00
62d6849d4e
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Added offset and limit parameters to /rest/media index action.
2015-03-05 14:25:48 -05:00
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
181db7617a
Use Billing::getClientInstanceId() in Amazon_S3StorageBackend
2015-03-04 17:02:30 -05:00
df28b47b92
SAAS-624: Request to rest/media throws an exception if the data set is too large
2015-03-04 16:26:35 -05:00
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -05:00
e2054c13c8
Added provisioning code for change requests
2015-03-03 16:04:45 -05:00
95db8533b5
Made provisioning helper slightly more robust
2015-03-03 15:29:34 -05:00
52813045a6
Additional parameters in provisioning when creating stations from dashboard
2015-03-03 15:10:10 -05:00
1f6f880dad
Fixed deleting failed uploads
2015-03-03 13:44:42 -05:00
8a6ee8ad14
Fixed /rest/media endpoint DELETE
2015-03-03 12:52:41 -05:00
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
ccb4b1552e
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:26:13 -05:00
0272eaef44
Changed is_null to empty
2015-03-02 15:25:52 -05:00
a7cedbb34f
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:10:37 -05:00
b6a6f038a9
Added call to setStationDescription in preferences action
2015-03-02 15:10:04 -05:00
7a035e91ec
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 14:58:33 -05:00
13bd0b7589
Fixed removing image when saving preferences with no upload
2015-03-02 14:57:50 -05:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
2e2f1f9762
Fixed SAAS-612: Recreating a station can wipe its database
2015-02-26 17:14:46 -05:00
ac3ad3d23b
Prevent overwriting the database if it already exists
2015-02-26 15:33:35 -05:00
f1a311dad6
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 14:26:33 -05:00
6047670dbd
Fix corner case where failed uploads could show up in the library
2015-02-26 14:12:51 -05:00
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
ab6d83f49d
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 13:10:13 -05:00
93f62eaadd
Added check to hide LiveChat for existing hobbyist users
2015-02-26 12:49:52 -05:00
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
3885abbdb8
Fixed webstream previewing
2015-02-26 11:09:43 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
48b4e3fb62
Also need to diable disk usage in media controller
2015-02-25 16:11:52 -05:00
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
7e167e5a47
Temporarily disabling disk quota limit until all file sizes have been set
2015-02-25 15:28:48 -05:00
e0a050ac60
Fix file deletion bug
2015-02-25 15:09:02 -05:00
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -05:00
38aa1d1cd9
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-24 16:44:17 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
drigato
Albert Santoni
Duncan Sommerville
Duncan Sommerville
Denise Rigato
Albert Santoni