bdab0f7b1a
Revert medatdata editor fix
2015-09-30 10:03:34 -04:00
f91d28e3f2
Css fix for playlist editor
2015-09-30 09:02:35 -04:00
2e024bcfdd
Css fixes for metadata and playlist editors
2015-09-30 08:58:39 -04:00
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
70e538ebb4
SAAS-1069 - disable add button when track metadata tab is open
2015-09-29 16:39:54 -04:00
80515ef263
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-29 16:26:47 -04:00
d3e9665063
Fix bug where switching to a webstream tab would throw an error
2015-09-29 16:26:39 -04:00
81bf601a12
SAAS-1099: Dashboard messed up in Safari
2015-09-29 16:03:14 -04:00
3df1081c60
SAAS-1088 - fix broken 'all my shows' checkbox
2015-09-29 15:51:09 -04:00
3fcc3c507a
Fix tabs bug
2015-09-29 15:09:09 -04:00
0029844fa7
Fix layout of schedule tracks dialog
2015-09-29 13:54:43 -04:00
f25457d1eb
SAAS-1098: Max filesize restricted by new uploader
2015-09-29 13:29:06 -04:00
eb5fcec485
SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome
2015-09-29 13:02:22 -04:00
c2cd768398
SAAS-1094 - fix selector for scheduled show selection + context menu
2015-09-29 12:27:45 -04:00
f4fad13eb8
SAAS-1086 - centre cursor when dragging
2015-09-29 12:07:24 -04:00
8cc5e5835c
Fix double processing icon when adding/removing tracks from playlists
2015-09-29 12:00:02 -04:00
f5afc0957f
SAAS-1087 - fix DJ list overflow + styling
2015-09-29 11:36:00 -04:00
7a44a05cb2
Style tweaks
2015-09-29 11:28:30 -04:00
477708ecc9
Style tweaks
2015-09-29 10:29:21 -04:00
6658fca10b
Some polish for the What's New popup
2015-09-28 22:17:34 -04:00
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
febc5fa99d
SAAS-1089 - fix scrolling in metadata editor
2015-09-28 10:17:40 -04:00
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
a24565669b
Fix bug where library would sometimes reference wrong table
2015-09-24 15:55:37 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
e5deae89a4
Generalize datatables style fixes
2015-09-24 12:54:24 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
c5b00e56bb
Fix bug that prevented multiple podcast tabs from being opened
2015-09-23 12:38:08 -04:00
576a457fdb
Small tweaks to tabs, fix merge conflicts in podcast
2015-09-22 20:19:57 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
5bd8a508b1
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
73e489fdc8
Cleanup a comment
2015-09-21 15:41:24 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
18fb0f3509
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 18:29:54 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
515d892f6e
Fixed small table widget ctrl-selection bug
2015-09-18 16:11:49 -04:00
6934bcfdab
Update tabs functionality
2015-09-18 15:38:00 -04:00
6900af8d47
Fix bug where switching from #podcast to other media view would not work as intended
2015-09-18 15:37:41 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
ea0121f5c1
Cleanup and capitalisation for the Table widget
2015-09-17 15:09:50 -04:00
8a7a97f48e
Updated the podcast table widget columns
2015-09-17 15:06:51 -04:00
0826c64719
Refactor table widget to use prototype inheritance better
2015-09-17 14:52:32 -04:00
9f03115ee5
Custom button event handlers for new table widget
2015-09-17 13:07:22 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
39b2bd6a86
Actually move library search bar out of header; add angular.js to libs
2015-09-16 17:58:16 -04:00
a78a0d0cc8
* Fix track number bug in analyzer
...
* Move library search bar out of header
2015-09-16 17:50:21 -04:00
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
7006b55818
js tweaks
2015-09-16 11:26:11 -04:00
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
e55e99365b
SAAS-1068: Crossfade button broken when editing new smart block
...
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
8c65ba8f66
SAAS-1061 - implement podcast list view skeleton; small bugfixes
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
4851b01540
Force more tracks to be shown in the library view
2015-09-11 12:54:28 -04:00
2d2ed25fcc
CC-6137 - datatables is the devil
2015-09-10 16:47:36 -04:00
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
1649d9db77
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-09 17:25:45 -04:00
fb1ee2e284
Fix some issues with the users page
2015-09-09 17:25:40 -04:00
1f319f84a4
Two small radio page tweaks
...
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
bd4fc62e04
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
2569ce4d0a
CC-6136: Playlist fade values don't get or set properly
...
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
03e23daba0
Apply highlight to active submenu item
2015-09-08 17:42:52 -04:00
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
84a1f9071b
Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev
2015-09-04 18:36:26 -04:00
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
3dc8a5f98d
CC-6135 - fix playlist bugs
2015-09-04 16:11:41 -04:00
ba26adc904
CC-6130 - fix empty placeholders appearing when search returns no results
2015-09-04 15:37:04 -04:00
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
56a8293be6
Fix plupload typo
2015-09-03 15:04:46 -04:00
363305fa8d
Fix blank tracks view when no local session is set
2015-09-03 14:56:57 -04:00
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
888762739e
SAAS-1050 - fix track remove buttons in playlist/smart block editors
2015-09-03 12:09:55 -04:00
9071c8d4b6
Update the translations
2015-09-03 10:26:33 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
ab11974799
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 15:28:44 -04:00
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
80d78e9fc5
SAAS-1043 - fix flexbox settings for editors to work in firefox
2015-09-02 13:08:16 -04:00
69293703f2
SAAS-1041 - add confirmation window when deleting a user
2015-09-02 12:53:24 -04:00
0722225211
Front end tweaks and fixes
2015-09-02 12:45:37 -04:00
c45f1ddd1c
SAAS-1039 - add processing overlay to listener stats screen
2015-09-02 11:52:43 -04:00
3e29ecad79
CC-6128 - open placeholder 'Learn more' links in new tab
2015-09-02 11:41:51 -04:00
1fd7f0ea36
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 11:22:32 -04:00
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
a17001a90a
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/application/views/scripts/billing/upgrade.phtml
airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
92f722452a
Adjust user settings form widths to be consistent
2015-09-01 16:05:59 -04:00
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -04:00
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
34e7c09ab7
CC-6118: Playlist crossfade panel needs restyling
...
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
f7a7d4c042
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 15:25:27 -04:00
f21e53b12e
CC-6121 - Fix up user settings page
2015-08-31 15:25:17 -04:00
b0e9b41b0c
Nudge the Airtime logo over a bit to center it better
2015-08-31 15:07:13 -04:00
e0cb33b89c
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-31 15:03:25 -04:00
109a336504
CC-6124 - Fix Add to Current Playlist button
2015-08-31 14:36:44 -04:00
7c9f0a09ae
Fix button styling bugs
2015-08-31 14:21:35 -04:00
f64d7096d1
Fix button styling bugs
2015-08-31 14:21:09 -04:00
cd7d07e5f5
CC-6119 - Fix New button styling
2015-08-31 14:01:31 -04:00
c1e2daaac4
CC-6114 - Remove New button from nav bar
2015-08-31 13:48:22 -04:00
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
d2f46882c1
CC-6113 - Remove select dropdown from library pane
2015-08-31 13:35:46 -04:00
e06f88cd49
CC-6116 - Library new buttons keep colour when disabled
2015-08-31 13:30:00 -04:00
e633bc8899
CC-6112 - Remove button labels at small screen resolutions
2015-08-31 13:25:29 -04:00
5e024023eb
CC-6110 - Change header to be more responsive
2015-08-31 13:10:16 -04:00
d7d27d3c36
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-31 12:35:27 -04:00
2611766498
CC-6109 - Fix display of long usernames in header panel
2015-08-31 12:35:20 -04:00
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -04:00
e349c3013c
CC-6107: Webstreams datatable should refresh when new webstream is created
2015-08-31 10:03:26 -04:00
582bc292aa
CC-6108: Manage User table layout is messed up
2015-08-31 09:26:22 -04:00
765211da39
Merge branch 'saas-showbuilder' into saas-showbuilder-colors
2015-08-28 21:11:26 -04:00
21eb3c502e
Fixed New Show button sliding when you clicked on the calendar
2015-08-28 20:08:52 -04:00
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
13f62cc118
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-28 16:21:53 -04:00
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
8a3f36dea3
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-28 16:09:26 -04:00
005eec5aa5
CC-6095 - better styling for learn about x links
2015-08-28 16:09:18 -04:00
71f149f95f
Unbreak the playlist form during reordering
2015-08-28 15:57:57 -04:00
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
e743c3589e
More smart block and playlist editor improvements
...
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
4307e326f1
CC-6104: Playout History layouts need help
2015-08-28 11:31:08 -04:00
88a9594aca
CC-6090 - restyle editor processing divs
2015-08-28 10:50:10 -04:00
bc4822d8e4
bugfix
2015-08-28 10:36:18 -04:00
ec9b98c48c
CC-6090 - restyle datatables processing divs
2015-08-28 10:34:49 -04:00
4cf40d312a
SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata
2015-08-28 09:44:45 -04:00
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
a08d5b71cf
Calendar colour adjustments
...
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined palette
2015-08-27 20:02:32 -04:00
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
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -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
ef892bb565
Fix some small bugs with Dashboard navigation links
2015-08-26 17:02:01 -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
b99ec51863
CC-6102: Can't upload M4A and FLAC anymore - rejected by dropzone
2015-08-25 15:15:03 -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
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -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
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -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
drigato
Albert Santoni
Duncan Sommerville
Duncan Sommerville