ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
ad39174f57
Fix fieldset flow for Firefox
2015-07-08 14:19:50 -04:00
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
b200a29f43
SAAS-928: Time strings on Radio Page are not localized
2015-07-07 09:21:44 -04:00
31ce52b857
CC-6062 - Fix stretching last column after adding show in calendar view
2015-07-06 11:52:04 -04:00
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
e3101e90b2
Resize player windows to correct dimensions on open
2015-07-02 16:07:49 -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
3c33cfd8b2
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:25 -04:00
765a61d09f
Don't show status page on Airtime pro fix
2015-06-30 16:21:33 -04:00
771aeaacb6
Don't show status pages on Airtime Pro
2015-06-30 15:19:05 -04:00
7f9b54b006
SAAS-908 - Styles for new field layout
2015-06-30 12:15:15 -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
a8f214803b
Fix javascript error on some browsers
2015-06-29 17:07:17 -04:00
133f1b72ca
Remove min-height on datatables for now
2015-06-29 11:32:28 -04:00
19fb67c8d6
Fix broken delete button
2015-06-29 11:28:27 -04:00
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
ca9c805ce4
SAAS-906 - Change wording on Add to Show button
2015-06-26 15:25:58 -04:00
c79e4fb9ea
CC-4922
2015-06-26 15:12:52 -04:00
9d60a3d130
Move Help Translate Airtime link to help menu
2015-06-26 14:27:27 -04:00
3a51e66b07
Add transifex link to login page
2015-06-26 13:25:19 -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
79f51f77cb
Merge branch '2.5.x-installer' into saas-dev
2015-06-25 18:21:40 -04:00
c59f401eb1
Fix shift selection in library and builder views
2015-06-25 18:21:22 -04:00
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -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
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
4c797cf100
Update installer to work with saas branch
2015-06-23 19:02:55 -04:00
a3f1cf1d56
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:47:34 -04:00
e36c8a16d4
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:46:29 -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
02e0537be9
Merge branch 'saas-dev' into soundcloud
2015-06-18 13:29:59 -04:00
080c2c43b5
Add soundcloud callback file for saas routing
2015-06-17 17:39:37 -04:00
3a1d34dffe
Merge branch 'saas-dev' into soundcloud
2015-06-17 10:14:03 -04:00
a338616aca
Add max-width to logo on radio page
2015-06-16 15:38:21 -04:00
0cd9b1d0e5
Merge branch 'saas-dev' into soundcloud
2015-06-16 15:10:14 -04:00
68a02e3c95
Radio page background scrolling issue on small screens
2015-06-16 12:53:07 -04:00
4bebe1e0fb
Radio page fixes
2015-06-16 12:50:40 -04:00
91d391c80c
Merge branch '2.5.x-installer' into saas-dev
...
Conflicts:
airtime_mvc/public/.htaccess
2015-06-16 11:32:45 -04:00
674d748149
CC-6058: htaccess should be combined into apache site config
2015-06-16 11:32:09 -04:00
609f073a25
Merge branch '2.5.x-installer' into saas-dev-plus
...
Conflicts:
airtime_mvc/public/css/styles.css
airtime_mvc/public/index.php
2015-06-16 11:20:43 -04:00
57d63ebb19
Backport some CSS fixes
2015-06-16 11:17:41 -04:00
8c9981a155
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
aa286efee4
Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android
2015-06-15 17:54:28 -04:00
7d84e92b1b
Undo last commit
2015-06-15 16:40:47 -04:00
cd6e326e13
Radio page fix for background image on android
2015-06-15 16:36:29 -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
ad5121f2ca
Radio Page improvements
2015-06-15 14:42:37 -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
1cdeddc3b3
Changed radio page background image
2015-06-12 14:50:22 -04:00
ba2aeae7b4
Radio page changes
...
Moved login button to top right corner.
Changed background image.
2015-06-12 13:07:47 -04:00
980e2ad767
Unbreak the design from my last commit
2015-06-11 15:09:44 -04:00
505d6fbc57
Fixed some issues with embedded schedule widget style
2015-06-11 15:04:59 -04:00
1efc47beb9
Tweaked layout of the embed widgets page
2015-06-11 14:30:52 -04:00
6007daf601
Adapted the default schedule widget skin to be more like the player skin
2015-06-11 14:21:56 -04:00
255bbf74b7
CC-6057: Empty show schedule should show message in Schedule Widget
2015-06-11 09:16:59 -04:00
8163608666
Merge branch 'saas-dev' into soundcloud
2015-06-10 16:25:30 -04:00
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
890f30590c
Reduced size of placeholder background PNG for Radio Page
2015-06-10 16:03:12 -04:00
fe5b20c29e
Fix for default station logo not displaying
2015-06-10 15:51:31 -04:00
f9dd70ad27
Fix for incorrectly displaying the installer screen
2015-06-10 15:38:27 -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
816e620399
CSS fix on premium player
2015-06-10 13:04:51 -04:00
d181a931b8
Fix schedule widget layout by removing table structure
2015-06-09 10:30:47 -04:00
1b0d69f3d7
SAAS-851: Embed schedule widget loses format with long show names
...
Applied fix for premium style sheet
2015-06-08 11:14:05 -04:00
1974774e0c
SAAS-851: Embed schedule widget loses format with long show names
2015-06-05 14:35:27 -04:00
8386145cb9
SAAS-836: Create a new schedule widget skin
2015-06-04 16:09:19 -04:00
80bfb7fd93
SAAS-848 - Add soundcloud_callback file
2015-06-04 12:01:04 -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
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
df501d7a38
SAAS-841: Default station logo to the Airtime logo
...
logo image file
2015-06-03 11:54:05 -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
43815510dc
SAAS-833: Radio page UI improvements/fixes
...
Fix spacing between schedule widget and logo
2015-06-02 16:16:39 -04:00
fad88cb5ab
SAAS-833: Radio page UI improvements/fixes
...
Removed scrolling on entire page and added it only to schedule widget
2015-06-02 15:39:56 -04:00
db17112432
SAAS-833: Radio page UI improvements/fixes
...
Fix schedule widget responsiveness
2015-06-02 12:59:59 -04:00
6682f7907d
SAAS-833: Radio page UI improvements/fixes
...
Removed unnecessary/duplicate css classes from radio page css file
2015-06-01 15:07:04 -04:00
7e4d6995b5
SAAS-833: Radio page UI improvements/fixes
...
Removed unnecessary css classes from premium player css file
2015-06-01 15:02:12 -04:00
77e518eec0
SAAS-821: Wire up new player bar with muses
...
Got metadata displaying
2015-05-29 09:40:50 -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
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -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
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -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
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
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
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
8aea86b451
SAAS-744 - Updated double click and Add button functionality on Now Playing and Add/Remove content screens
2015-04-30 16:23:52 -04:00
d1dfa9d3be
Fixed add/remove content dialog being too low
2015-04-30 10:50:23 -04:00
be614415de
SAAS-757: metadata edit window goes under the header menu
2015-04-30 10:29:43 -04:00
950dd22697
Fix for add remove media popup layout
2015-04-29 14:45:14 -04:00
c1af91bb9a
Suspension notice layout fix
2015-04-29 13:58:50 -04:00
f382b1338f
Layout fixes for library and Now Playing screens
2015-04-29 13:41:52 -04:00
49456318ff
Fix layout being too narrow sometimes
2015-04-29 13:22:22 -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
7d1b112db9
Stopped redirecting to /login if no valid session
2015-04-21 11:26:48 -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
5d25fcea2d
Style tweaks to the suspension notice.
2015-04-17 12:58:05 -04:00
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
Duncan Sommerville
drigato
Albert Santoni
Albert Santoni