yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,612 Commits 4 Branches 7 Tags
8c8f10ea2094de648ad9542352c7c5b26030f50e
Commit Graph

13612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
0f37809e17 allow more than 1 digit in property number validation 2015-08-05 12:54:02 +02:00
Shannon
f03ee9f908 Fixes routing tests and reverts to simplified routing logic based on the Language ISO code returned from the IDomain object. 2015-08-05 12:10:13 +02:00
Shannon
b053638204 Fixes: U4-6866 getDescendants of template, N+1 issues for template repo (U4-5618 Repository level performance enhancements - remaining N+1 queries) 2015-08-05 11:50:20 +02:00
Mads Rasmussen
e269331724 fix model binding to use label instead of name 2015-08-05 10:36:59 +02:00
Mads Rasmussen
675d583f27 remove unused templates dialog. It uses generic itemPicker dialog instead 2015-08-05 10:29:15 +02:00
Mads Rasmussen
04767bff7b remove unused content types dialog. It uses generic itemPicker dialog instead 2015-08-05 10:28:02 +02:00
Mads Rasmussen
a4e0d2c60c Move update tabs sort order logic to it's own function 2015-08-05 10:21:35 +02:00
Mads Rasmussen
5712fbfead Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-08-04 18:40:29 +02:00
Shannon
d790194682 Fixes: U4-6918 App_Plugins folder needs to be created properly on app start 2015-08-04 17:36:03 +02:00
Shannon
85534bc3ce Merge branch 'dev-v7' into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-08-04 17:10:58 +02:00
Shannon
3fec2b9756 uses the LanguageIsoCode returned from the domain object during routing so it doesn't need to be re-looked up. 2015-08-04 15:53:08 +02:00
Shannon
bc7a31d791 Updates IDomain to include language ISO code so we can save a lookup 2015-08-04 15:42:44 +02:00
Shannon
05d84c6673 updates the operation status to return the event messages used when raising events 2015-08-04 14:52:34 +02:00
Shannon
f6645e3928 Fixes: U4-6917 ContentTypeService.GetContentType( GUID) throws exception 2015-08-04 14:05:57 +02:00
Shannon
50b00b12b0 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-08-04 13:23:57 +02:00
Shannon
569371ffff Fixes resize panel U4-5308 Umbraco 7 Content Tree Width not resizable or scrollable 2015-08-04 13:22:22 +02:00
Mads Rasmussen
571dc3dc6c strict filtering on alias's for templates 2015-08-04 12:46:44 +02:00
Mads Rasmussen
aef11f22a5 Template section. Move watch logic from controller to directive. Setup logic for doc types with and without template 2015-08-04 12:45:06 +02:00
Per Ploug Krogslund
f7b72b225a Grid: auto-insert layout, row and editors if only 1 is available 
When the grid loads and only one layout is available, it will be
inserted automatically.

When a row is inserted and a cell only has a single editor allowed, it
will be inserted.

These are chained so when an empty grid editor is loaded it will
preload layout + controllers if only one option is possible.

Also fixed the cog icon being visible, even without settings available

Adjusted a bit of styling for TinyMCE editors as they are invisible if
no focus + content entered.
 2015-08-04 12:25:33 +02:00
Shannon
d1bed54cf1 Fixes tabdrop memory leak U4-6907 Bootstrap tab drop has memory leaks, fixes tab/header to use the correct bootstrap tab api, simplifies the header code dramatically and speeds up processing. Fixes mem leak with delayedMouseLeave.directive 2015-08-04 11:59:57 +02:00
Mads Rasmussen
022de26729 Add create doc type with and without template to create dialog 2015-08-04 11:50:37 +02:00
Shannon
ba868887d4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-08-03 12:50:18 +02:00
Mads Rasmussen
c1db51c62e child selector directive - unbind watchers on destroy 2015-08-03 10:08:21 +02:00
Mads Rasmussen
8e78e91543 Validate alias + editor in property settings dialog. Move locked field styles to it's own file. 2015-08-03 10:07:23 +02:00
Shannon
3a7853dcbe makes sure the bottom bar buttons are moved when resizing the left pane and that their position stays relative during tab changing. 2015-08-02 11:32:43 +02:00
Shannon
60af7deacd ensures more unbinding is happening 2015-08-02 11:32:14 +02:00
Shannon
49bc3151b0 Fixes the detectfold processing and tab changing events, creates new umbTabs directive to manage the bootstrap tab changing events so other directives can easily subscribe to the changes. updats all editors to use them. 2015-08-02 11:13:26 +02:00
Shannon
d6b7bae38a reverts tabs back to use only bootstrap tabs (we can change that at a later date now that we have the code), have fixed up a lot of the detect-fold logic so that it doesn't run an insane amount of calculations, however now we need to properly fix the bootstrap tab event bindings. 2015-08-01 17:33:55 +02:00
Sebastiaan Janssen
715cc22722 Revert "Correct trees.config" 
This reverts commit 88b23e09b6.
 2015-08-01 15:11:47 +02:00
Sebastiaan Janssen
88b23e09b6 Correct trees.config 2015-08-01 15:05:01 +02:00
Shannon
612484c0b6 ensures more jquery event listeners are unbound 2015-07-31 12:52:29 +02:00
Shannon
0e4974babe Creates windowResizeListener directive... so there's only a single listener for this and things can register/unregister as required from it and the callbacks will always execute in a $digest. Updates the detect-fold and navResize to use this, it is much snappier now with less overhead. 2015-07-31 12:34:02 +02:00
Sebastiaan Janssen
5fdd7d8bd6 Merge branch 'bjarnef-dev-v7-U4-6898' into dev-v7 2015-07-31 11:29:58 +02:00
Sebastiaan Janssen
b5c87ccfb7 Merge branch 'dev-v7-U4-6898' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6898 2015-07-31 11:29:51 +02:00
Sebastiaan Janssen
2efe6ae7a4 Merge pull request #754 from bjarnef/dev-v7-U4-6179 
Highlight recycle bin tree node
 2015-07-31 11:20:44 +02:00
Shannon
5775984730 have new tab implementation working with backwards compat with bootstrap tabs. For our own editors, we will use the new tabs, this gives us more control and should be a bit quicker, perhaps in v8 we can remove bootstrap tabs entirely. 2015-07-31 10:50:33 +02:00
Mads Rasmussen
cd7597b586 Moved group builder dialogs from 1 model into their own models to be able to revert changes. Apply dialog changes on submit, revert on cancel. Refactored js based on on this change. Do not close dialogs underneath when clicking on stacked dialogs. 2015-07-31 09:35:26 +02:00
Sebastiaan Janssen
cbab70fd7c Should finally fix this test that apparently relies on super strict timings 2015-07-30 19:28:33 +02:00
Shannon
cfa2a30006 Changes how tabs work ... to no longer have to rely on bootstrap tabs and the hacky timing work-arounds, tabs are actually quite easy and now give us much more control. 
Have made this change as backwards compatable (some things are deprecated though). Will update the other editors now.
 2015-07-30 18:44:15 +02:00
bjarnef
09a3b0d155 Highlight recycle bin tree node 
Ensure recycle bin tree node is highlighted when chosen.
 2015-07-30 18:36:22 +02:00
Sebastiaan Janssen
ca9cd77ded Fix log type 2015-07-30 18:14:29 +02:00
Sebastiaan Janssen
812601217a Merge branch 'pete2' into dev-v7 2015-07-30 18:03:09 +02:00
Pete Duncanson
3a6ec5ef0c Add a log message to stop database start up code from swallowing exception messages, now stash them in the logs to give developers a chance ;) 2015-07-30 18:01:24 +02:00
Rasmus Eeg Møller
4197a7654f U4-6902 - Changed from internal to public 
Just like the ContentFinderResolver.cs
 2015-07-30 17:59:18 +02:00
Sebastiaan Janssen
3133014650 Removes more references to FixedDisplayModes 2015-07-30 17:39:07 +02:00
Sebastiaan Janssen
4bce945946 Remove stray FixedDisplayModes reference 2015-07-30 17:19:43 +02:00
Sebastiaan Janssen
2d15c9c01c Use the new views config transform 2015-07-30 17:08:40 +02:00
Sebastiaan Janssen
58e648828b Fix web.config and adds a transform for NuGet 2015-07-30 17:08:40 +02:00
Sebastiaan Janssen
d87b268a40 Update to MVC5 2015-07-30 17:08:39 +02:00
bjarnef
5174645059 Make tree nodes consistent 
Make tree nodes have same position from the left regardless of the arrow
to expand the children.
 2015-07-30 16:04:54 +02:00