1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
8449194ca1
Merge branch 'saas' into saas-speedy
2015-04-15 16:44:43 -04:00
f3c8f40183
Tweaks to fix up my optimizatinos
...
* Fixed a rendering glitch with empty shows in the Now Playing screen
* Changed drag and drop placeholder to show the track name. Reverted it
from the default DataTables placeholder, which unfortunately gets the
column widths wrong.
2015-04-14 17:39:52 -04:00
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
a48ae75907
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-14 11:36:22 -04:00
a606fef5af
Gracefully handle bad ColReorder deserialization
2015-04-14 11:36:13 -04:00
b1ea1f27a3
Fixed empty show Showbuilder bug and started making checkboxes work like cursors used to
2015-04-14 11:30:18 -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
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
caa591bd5e
Player - set fixed height for metadata area
2015-04-10 11:07:42 -04:00
4d7d48d6fb
Player - fix height
2015-04-10 10:55:39 -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
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
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
4ab4fe5cb9
Fixed player css so long artist and track names don't overflow
2015-04-02 15:00:46 -04:00
fdd8cdfaea
Fixed Airtime badge spacing
2015-04-02 14:35:13 -04:00
06f43ef2d7
CSS modifications
...
Added fixed width and height to player.
Floated Airtime badge to the right
2015-04-02 12:45:05 -04:00
0bffa07ed9
SAAS-669: Long station names overlap with link to airtime.pro
2015-04-01 12:59:31 -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
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -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
dab9cc775c
Hide the show form after updating a show because it was broken at that point anyways
2015-03-31 15:39:06 -04:00
3fe1a46c41
Fixed dropdown menus not behaving correctly
2015-03-26 12:50:53 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -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
5c4533d785
SAAS-644: Embed Player -> Update embed src code and preview when an option changes
2015-03-23 10:11:33 -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
0764ca60e6
Delete muses skin files
2015-03-20 09:09:09 -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
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
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
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
7744e6b656
Delete player css file for now
2015-03-10 16:34:06 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -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
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
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -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
562c2f0100
Remove widget JS snippet animation because it's bugged
2015-02-24 15:18:39 -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
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
3c064b13a9
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
2015-02-18 16:03:14 -05:00
68cd5b027a
CC-5998: Prevent users from spamming the delete button in the library
2015-02-18 15:56:28 -05:00
d46f4a52eb
Installer tweaks and a pypo bugfix
...
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
a20f90cd2d
Marginally better error handling for 401 in REST controller
2015-02-06 15:20:01 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
7717692b41
Merge branch '2.5.x' into saas
2015-02-02 18:03:39 -05:00
df4bc01ff8
Log all PHP errors (including parse errors) to our zend log
2015-02-02 18:03:13 -05:00
163227439c
Raise exception again in index.php as alternative to die()
...
* Backport from saas
2015-01-27 18:27:03 -05:00
1ddc27bb77
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/public/index.php
2015-01-27 18:26:39 -05:00
e83c86a0ff
Refactored the logging class to reduce code, use error levels correctly, and improve performance.
2015-01-27 18:24:13 -05:00
ac8fadfc80
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
CREDITS
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-23 16:36:31 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
6e43505379
Merge branch '2.5.x' into 2.5.x-installer
2015-01-22 17:36:12 -05:00
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
6492128ce9
Hide Now Playing toolbar for Guest users
2015-01-21 15:15:22 -05:00
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
75306936c0
Workaround for comment character conflict between python ConfigObj and PHP
2015-01-16 10:22:43 -05:00
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -05:00
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
d07195f048
Rework redirect to config page at the end of the web install
2015-01-12 14:40:22 -05:00
23f33cd8da
Reorder final setup steps
2015-01-12 13:41:39 -05:00
2b882cc313
Reorder final setup steps
2015-01-12 12:45:52 -05:00
0fcac545e6
For now, just prompt users to start background services at the end of the install process
2015-01-12 10:53:31 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
fc68dfa256
Fixed service execution calls
2015-01-05 11:16:58 -05:00
b094e59df3
SAAS-526: Change prefix from station name to station id
...
Just seeing if we can get the hosting id from a function in the Billing Controller
2014-12-17 15:39:18 -05:00
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
b47f02d331
TODO
2014-12-15 09:53:50 -05:00
5f315abb79
Updated final install step
2014-12-15 09:52:10 -05:00
Albert Santoni
drigato
duncan