yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,271 Commits 4 Branches 7 Tags
c078a1c12f90da67b0e05f4126f16c4efe9f63e8
Commit Graph

1811 Commits

Author SHA1 Message Date
Shannon
c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon Deminick
cce63d6eaa Merge pull request #498 from AndyButland/u4-5461 
U4-5461 - Further amends to date picker behaviour
 2014-10-03 09:21:23 +10:00
AndyButland
3090339962 Removed incorrect option value 2014-10-02 22:08:19 +02:00
AndyButland
d9074da3fd Removed close of date/time picker on date selection when set up with time picker; close picker on click on document 2014-10-02 22:02:41 +02:00
Shannon
1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
 2014-10-02 21:46:39 +10:00
Shannon Deminick
69494c20f4 Merge pull request #491 from AndyButland/u4-5461 
U4-5461 - Close date picker once date is selected
 2014-10-02 21:18:21 +10:00
Shannon Deminick
caa0e82d77 Merge pull request #495 from AndyButland/u4-5012 
U4-5012 Moved preview step for RTE embed dialog to a button press
 2014-10-02 21:16:44 +10:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
Shannon
3400c52e45 Fixes: U4-5443 Unable to add images using markdown editor, U4-5442 Markdown editor breaks on navigation 2014-10-02 13:18:35 +10:00
antoine
2380217c21 Very Basic shadow for the canvas designer 2014-10-01 18:28:25 +02:00
antoine
1231975a78 Bad path refer to grid instead of canvas 2014-10-01 18:27:35 +02:00
antoine
14e241bf21 Layout Editor editor without default box value 2014-10-01 18:26:57 +02:00
antoine
50d3b81ed9 Blank font style issue in canvas designer google font editor 2014-10-01 12:57:33 +02:00
antoine
371e4382cb set a no disposable unique row ID for row styling 2014-10-01 12:56:45 +02:00
antoine
45dde8717b Canvas designer Color editor issue 2014-10-01 12:55:32 +02:00
AndyButland
af256e754d Moved preview step for RTE embed dialog to a button press 2014-10-01 11:28:00 +02:00
antoine
4021b680f8 No more dependency with bootstrap and some comments in less file 2014-09-30 21:39:51 +02:00
antoine
2733dc3129 Canvas grid row editor 2014-09-30 21:38:41 +02:00
antoine
97ed172472 Canvas designer Selector based on schema instead of name 2014-09-30 21:38:05 +02:00
antoine
4ed496921a Reload Page after reset canvas designer style 2014-09-30 21:37:17 +02:00
Shannon
4c0f95a93a Adds GetPagedDescendants to media/content services. Fixes PDF reader disposal. Updates the umb examine indexers to use the services layer, now reindexing is far more efficient. Fixes the examine mgmt dashboard with $timeout. Updates GetPagedResultsByQuery to be more readable. Fixes GetPagedResultsByQuery to use SQL parameters. 2014-09-30 15:13:10 +10:00
AndyButland
2c871e635f Modified datetimepicker to allow passing of a view mode parameter to the hide method; called from datepicker controller to only hide on date change when in day view mode 2014-09-29 23:15:06 +02:00
AndyButland
518353c877 Close date picker once date is selected 2014-09-27 22:23:49 +02:00
AndyButland
110521f0d8 Minor pluralisation, spacing and wording improvements on list view bulk actions 2014-09-27 17:52:04 +02:00
antoine
7fcb982e33 disable canvasdesigner css link on the preview mode (with canvasdesigner enable) 2014-09-23 19:45:35 +02:00
antoine
6d1ccaa7a4 Renames Tuning to canvasdesigner (code and comments) 2014-09-23 19:10:51 +02:00
antoine
6035971a88 Various Styles Bug fixed and improvement 
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/slider.html
 2014-09-23 17:58:44 +02:00
antoine
3aedb69490 New design for the tuning, all panel at the left sight 
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.front.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
 2014-09-23 17:57:41 +02:00
antoine
699a88558e use thumbnail in media list 2014-09-23 17:51:17 +02:00
antoine
ae66c422ab improvement and rename of the wide/layout less editor 
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.html
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/wide.less
 2014-09-23 17:51:16 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00
per ploug
e1793ad95c merge 2014-09-23 08:48:36 +02:00
per ploug
9dd803fb73 Fixes up missing .less merge 2014-09-23 08:47:14 +02:00
per ploug
c63f152c8f last .less change for empty sections 2014-09-23 08:45:20 +02:00
Shannon
58db323eee fixes U4-5430 2014-09-23 12:40:30 +10:00
Shannon Deminick
28e812580a Merge pull request #482 from codegecko/7.2.0 
U$-5430: Fixed issue with user login with single-access to custom section
 2014-09-23 12:07:20 +10:00
Shannon
a2a3d2e6c7 removes unused/unneeded files 2014-09-23 11:57:19 +10:00
per ploug
872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:06:15 +02:00
per ploug
375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:03:09 +02:00
per ploug
5f5c8c7693 Forms section + dashboard 2014-09-22 20:07:35 +02:00
per ploug
9464d2a648 Adds support for hiding navigation when tree is empty 2014-09-22 20:07:03 +02:00
Sebastiaan Janssen
357187a7fd #U4-5530 Fixed Due in version: 7.2.0 
Check if getElementById actually has a result before using it
 2014-09-22 15:38:38 +02:00
TimoPerplex
34510e288b Load gravatar image securely if needed 2014-09-22 12:22:35 +02:00
TimoPerplex
6814aefb33 Load gravatar image securely if needed 2014-09-22 12:21:49 +02:00
Shannon
d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
antoine
d4be8036f0 Shadow to the grid sortable box 2014-09-19 11:40:52 +02:00
antoine
9ccba9ec77 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/gridview.less
 2014-09-19 11:38:15 +02:00
antoine
8e455257ef Grid control and row sortable bug fixed and improvement 2014-09-19 11:34:35 +02:00
Shannon
41b585aed4 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-19 18:31:49 +10:00