099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
b6f33f6083
Completed smart block, playlist, and webstream editor form overhauls
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
playlist contents back rather than the entire HTML fragment for the
editor.
* Keep more of the playlist/smartblock editor view persistent across
saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
acc4ef0054
CC-6085, CC-6101 - uploader styling
2015-08-27 15:44:59 -04:00
0ebe7a85e1
CC-6066 - Add/Remove content screen update
2015-08-26 17:56:17 -04:00
7d8c6dc90d
Fix upload page styling
2015-08-26 16:11:49 -04:00
c728be38ab
CC-6078: Help page updates
...
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
98ac8fd851
Major layout work on the smartblock and playlist editors
...
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
706caa8458
SAAS-1025: Restyle the billing page
...
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
7e1fe030fe
SAAS-1025: Restyle the billing page
...
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
6ecb208962
SAAS-1021: Billing page restyle
2015-08-26 09:11:25 -04:00
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
0752e78b2c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-25 13:27:48 -04:00
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
c921aabfd4
Small css fix on recent uploads table
2015-08-25 13:19:18 -04:00
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
bb2757127d
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css tweak
2015-08-25 12:56:02 -04:00
2da431895f
SAAS-1022: Re-implement disk quota status on side nav bar
...
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
2015-08-25 12:43:08 -04:00
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
b15160d0fb
Fix more selection bugs
2015-08-21 14:39:30 -04:00
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
f7733757f6
Fixed select menu styling and eliminated ColVis fade time
2015-08-21 13:14:20 -04:00
604b81071c
CC-6084 - fix calendar drag and drop
2015-08-21 11:09:45 -04:00
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
6f0b7f6d32
SAAS-1022: Re-implement disk quota status on side nav bar
...
Layout tweak
2015-08-21 10:06:40 -04:00
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
f48c7186ca
SAAS-1022: Re-implement disk quota status on side nav bar
2015-08-21 09:08:36 -04:00
d9455f86ea
Change menu item order and change trial box position
2015-08-20 10:56:11 -04:00
b718171729
Fixed aspect ratio of logo
2015-08-19 18:26:05 -04:00
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
a71752f5c4
Lightened up sidebar icons and fixed context menu arrow alignment
2015-08-19 16:21:10 -04:00
93d2d8ad67
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
8dab79da1c
Restyle top panel to account for larger nav panel width
2015-08-19 14:29:54 -04:00
42bbfc3834
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-19 13:02:16 -04:00
ae66b2272b
Fix editor styling and layout issues
2015-08-19 13:02:14 -04:00
f9cc8b41df
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-19 12:58:49 -04:00
8dcd0a2595
CC-6071: Icons for navigation bar
2015-08-19 12:58:31 -04:00
a3e9a7355c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-19 11:47:20 -04:00
0471d4bbdb
Tweaked text shadow on usability hints
2015-08-19 11:47:13 -04:00
ff930549db
Fix broken sortable placeholders
2015-08-19 11:32:41 -04:00
59a9862ba3
CC-6072: Wrapper has weird positioning during page load
2015-08-19 10:56:41 -04:00
8afc652ff1
Submenu and body background color tweaks
2015-08-18 18:40:09 -04:00
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
a04f5afcbd
More navbar and submenu layout fixes
2015-08-18 17:13:17 -04:00
20a810fc52
Fixed one more navbar highlight inconsistency
2015-08-18 15:50:10 -04:00
5a4bf6bb80
Fixed main navigation sidebar highlight inconsistencies
2015-08-18 15:48:33 -04:00
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
cee2fe5a63
CC-6082 - add y-scrollbar to file metadata editor at small resolutions
2015-08-18 12:58:34 -04:00
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
d30e32c2d3
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-18 07:46:39 -04:00
4adb9cc55a
CC-6070 - standardize editor buttons
2015-08-17 18:34:39 -04:00
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
31982a7238
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-14 20:00:17 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
cb2d0bd444
SAAS-948 - js fixes for dashboard nav, change logo image in master panel
2015-08-14 16:42:39 -04:00
7ce9dfa1b3
SAAS-948 - add title to library pane
2015-08-14 15:33:45 -04:00
536bbfb678
SAAS-948 - css tweaks to top panel
2015-08-14 15:11:46 -04:00
fb1f22b913
SAAS-948 - css tweaks
2015-08-14 13:29:26 -04:00
12c4e4a374
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/public/js/airtime/common/common.js
2015-08-14 10:54:53 -04:00
809b743785
SAAS-948 - Add livechat event listeners
2015-08-14 10:24:49 -04:00
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
6c7a6aaad3
Expand user management height
2015-08-13 10:11:25 -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
c931b81b35
SAAS-948 - library datatable header tweaks
2015-08-12 15:10:56 -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
0cfc55116d
Colour tweaks
2015-08-12 13:50:42 -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
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
3bb1dccd65
Ditched hiding overflow, more styling changes
2015-08-10 12:32:39 -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
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
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -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
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
33d2fe0900
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
2015-08-04 19:56:12 -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
7de507c99a
Forgot to commit promo banner
2015-07-31 10:49:24 -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
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
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
fcbc37977f
SAAS-948 - Frontend tweaks
2015-07-28 11:42:04 -04:00
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -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
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
dddc6e6591
Fix for context menu on calendar being too small sometimes
2015-07-15 07:19:48 -04:00
fdef9d9f78
Fixed calendar context menu width
2015-07-14 13:45:37 -04:00
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
45b09a0d24
Merge branch 'saas-dev' into saas-dev-usability-hints
...
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
6d883d2fa4
Fix Add Show button bug and update styling
2015-07-13 13:23:24 -04:00
55999a07ec
SAAS-940: Provide usability hints to user
2015-07-13 08:06:41 -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
c44035c27d
SAAS-938: Long track metadata messes up player bar on the radio page
2015-07-10 09:08:19 -04:00
5ec3684ea6
CSS fix onradio page schedule widget
...
Widen width or show time and name columns on mobile phones
2015-07-09 10:34:48 -04:00
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
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
3c33cfd8b2
Remove min-width on showbuilder panel to fix add-content pane issue
2015-06-30 16:35:25 -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
133f1b72ca
Remove min-height on datatables for now
2015-06-29 11:32:28 -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
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
a338616aca
Add max-width to logo on radio page
2015-06-16 15:38:21 -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
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
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
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
890f30590c
Reduced size of placeholder background PNG for Radio Page
2015-06-10 16:03:12 -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
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
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
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
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
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -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
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
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -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
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
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
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -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
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04: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
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
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
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -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
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -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
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
f5b4928538
More work on web installer
2014-12-09 17:48:16 -05:00
9fed113f74
More work on setup/installation process
2014-12-03 18:04:47 -05:00
8f46b4dca7
More work on new installer
2014-11-28 15:30:11 -05:00
6b8163748d
Updated styles for csrf elements
2014-11-13 09:46:44 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
534b56351e
Added styles to completely hide csrf elements on the page; changed tabs to spaces
2014-11-05 17:26:05 -05:00
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
ee92f41a8d
Updated look and feel and added front-end validation for image elements in add-show
2014-09-18 16:28:52 -04:00
b89a764442
Updated to include show image functionality
2014-09-17 19:41:17 -04:00
f1610485c3
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-26 17:45:48 -04:00
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
51b7fe9adf
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-25 20:33:10 -04:00
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
338fd06f81
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -04:00
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
51d930cd84
Make Live Chat not block the Add Media pagination buttons
2014-06-04 13:47:27 -04:00
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -04:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
afc7df8469
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 16:41:25 -04:00
19f231bd11
CC-5709: Airtime Analyzer
...
* Add Media page CSS file that I forgot to commit ages ago
2014-04-01 16:40:54 -04:00
b209108604
CC-5732 : History -> Playout History: live chat banner blocks navigator buttons
...
avoid livechat problems
2014-03-13 12:37:56 -04:00
8d2926aeed
CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
...
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
653f0e02a4
CC-5648: Events are shifted down in the month view
...
* Fixed it.
2013-12-17 15:25:43 -05:00
f16d8ca2ea
Fixed a bunch of annoying/major graphical issues with the calendar
...
* Fixed a bug where the calendar would keep shrinking smaller and
smaller as you resized the window.
* Fixed the size and alignment of the time span combobox in the corner,
which fixes a bug where the text was cut off.
* Fixed a bug where the schedule header would grow as you flipped
to the next or previous week.
* Dropped javascript from the resizing of the calendar (for the most
part).
2013-12-14 00:05:13 -05:00
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
52b7dbb226
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-09-26 08:36:11 -04:00
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -04:00
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
8dc100126a
Alert icon for missing file in Now Playing should be orange, to match Media Builder
2013-09-25 17:36:50 +01:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
53c326b320
pagination buttons look better if they can fit on the same line.
2013-08-30 01:23:35 -04:00
7b54d3b6ce
fixing colour to go back to default theme
2013-08-30 01:08:49 -04:00
2c88d1e0a0
formating the date start/end of each show in the accordian.
2013-08-30 01:06:59 -04:00
91d4d1224e
redoing accordian properly.
2013-08-29 15:52:24 -04:00
ec31fd50c9
deleteing items from the show table.
2013-08-29 15:34:34 -04:00
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -04:00
3769f5e5db
IM-933 : datepicker switch/design
2013-08-28 14:54:44 -04:00
05054fa823
IM-931 : Icon Overlap
2013-08-28 14:48:35 -04:00
12a62a3827
CC-5309:Calendar-> Recording Show: Fail to open context menu
...
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
f1b1352077
matching selected row colours to the library table.
2013-08-23 13:31:37 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
f7531d5da2
remove sizing of history content div in JS. CSS to fix width and containing box problems.
2013-08-22 14:50:58 -04:00
3ea2b920a6
crlf
2013-08-19 23:20:26 -04:00
09693ef174
changing to context menu single edit/delete.
2013-08-19 23:19:13 -04:00
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
333ee7453e
downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x
2013-08-09 15:52:22 -04:00
7183396da5
needed to update jquery, fullcalendar needed updating for the new JS.
...
working on configuring a template.
2013-07-29 08:57:31 -04:00
46ecdf393d
dynamic form rendering for template
...
bootstrap datetime widget.
jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
9545d8aacb
Removed dropping and recreating cc_schedule table index before inserting into this table.
...
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
950cc6d6b7
CC-5177: Create "?" icon beside linked show check box
2013-05-28 14:18:26 -04:00
408ecc530d
CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time
2013-05-27 14:37:16 -04:00
75e6f21ce0
CC-5108 : Waveform Editor UI
...
putting on the timescale for time reference.
fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
7ec664823d
Fixes whitespace to the left of 'Open Media Builder' button (CC-5166)
2013-05-22 10:23:42 +01:00
Albert Santoni
Duncan Sommerville
drigato
Duncan Sommerville
Albert Santoni
Naomi
denise
Daniel James
cliff.wang