Commit Graph

17929 Commits

Author SHA1 Message Date
Shannon
db86f6e1ee Fixes up issues reported on review and adds a null check 2017-02-03 11:49:22 +11:00
Shannon
c16ce4ce1f Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-02-03 10:21:10 +11:00
Shannon
86021c5052 Adds remaining core methods to make 2FA providers work if you know how to wire it up 2017-02-03 00:47:28 +11:00
Mads Rasmussen
de87701c95 remove option to create xml file 2017-02-02 14:46:23 +01:00
Shannon
a03e0dfb53 Fixes tests 2017-02-02 22:21:36 +11:00
Shannon
5060e709d1 Fixed merge conflicts, adds required methods to auth controllers. 2017-02-02 22:11:34 +11:00
Emil Wangaa
c073191f69 Fixes creation of codefiles in folders 2017-02-02 11:47:46 +01:00
Mads Rasmussen
b4450ca7f2 add null check for startNode 2017-02-02 11:44:13 +01:00
Mads Rasmussen
7004765acf remove unused code 2017-02-02 11:40:53 +01:00
Mads Rasmussen
77a91bc017 fix entity look up 2017-02-02 11:28:56 +01:00
Mads Rasmussen
14b96da588 combine redundant resource code into one function 2017-02-02 11:19:56 +01:00
Emil Wangaa
c21837e906 Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-9429
# Conflicts:
#	src/Umbraco.Web/Editors/CodeFileController.cs
2017-02-02 10:24:42 +01:00
Mads Rasmussen
99324035e5 clean up animation classes 2017-02-02 10:19:54 +01:00
Mads Rasmussen
8b9a5000be move back button styles to class 2017-02-02 10:09:31 +01:00
hartvig
32892cf5e0 Update NewInstallStep.cs 2017-02-02 10:05:14 +01:00
Mads Rasmussen
c82bddb7dd remove fake list view search node 2017-02-02 09:51:13 +01:00
Stephan
478ca30948 U4-9322 fs - create scope option 2017-02-02 09:49:23 +01:00
Mads Rasmussen
f2fd45576b speed up animations 2017-02-02 09:35:01 +01:00
Emil Wangaa
6bf5f4dbdf Fixed up tree menus for scripts, partialviews and partialviewmacros 2017-02-02 09:20:42 +01:00
Shannon
32d757b13c Updates the ContentRepository to not fetch the published version info in the same query when returning a collection of documents, instead we fetch the published version information in a separate query 2017-02-02 17:05:33 +11:00
Shannon
882d5ec7f5 missing null check 2017-02-02 16:02:29 +11:00
Shannon
ce69497a68 Update code to have zero breaking changes for old public APIs 2017-02-02 14:16:39 +11:00
Shannon
1d43cf491b U4-9448 Slave Front End server requires write access to database when master performs unpublish 2017-02-02 14:09:49 +11:00
Mads Rasmussen
d5a687cf3d start on code clean up - make ump-mini-list-view directive + move inline styles to classes 2017-02-01 23:12:49 +01:00
Emil Wangaa
c9082ce511 Changed PostSave method in CodeFileController to create or update instead of only updating - this is for keeping consistency with how other new editors work 2017-02-01 15:46:22 +01:00
Claus
46c7737c17 Merge pull request #1714 from umbraco/temp-u4-9441
Fixes tree syncing issues
2017-02-01 14:04:18 +01:00
Claus
06c829eb27 initializing stringbuilder with text instead of appending after init.
trimming end instead of both beginning and end, since we know whats in the beginning.
2017-02-01 14:03:03 +01:00
Mads Rasmussen
e439302b93 add support for getScaffold for scripts, partialViews and partialViewMacros editor 2017-02-01 13:54:16 +01:00
Emil Wangaa
6a1d7d2586 Adds GetScaffold in CodeFileController to simplify initial view in backoffice
Refactored the FileService a bit to be able to get content of the snippets without duplicate code
2017-02-01 12:33:20 +01:00
Shannon
27283754c0 Changes IndexFieldPolicies to be a StaticFieldCollection which is a keyed collection instead of using Linq and iterating to find the values in critical code 2017-02-01 16:48:09 +11:00
Shannon
ff6ea0b42e Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
2017-02-01 15:23:29 +11:00
Shannon
384a31e3c6 Gets member picker working with UDI, ensures that the GUID is indexed for all things - can't believe this wasn't being done, updates the search model mapper to return the UDI 2017-02-01 15:19:52 +11:00
Shannon
69b913c608 Gets MNTP working with UDI - updates EntityController to support all types of Ids for GetById 2017-02-01 14:07:13 +11:00
Shannon
83757c60b5 Adds UDI support for the content picker 2017-02-01 13:38:42 +11:00
Shannon
5b2212829c Small performance change which makes a fairly large impact when rebuilding very large indexes. 2017-02-01 13:02:22 +11:00
Mads Rasmussen
26acecb720 start on animation and nested list views 2017-02-01 00:28:40 +01:00
Stephan
4a6844b949 U4-9322 - repository caches, cleanup 2017-01-31 19:36:55 +01:00
Stephan
ac9b484d3d U4-9322 - wire EventMessages, cleanup 2017-01-31 18:19:03 +01:00
Stephan
97a76d5ad4 U4-9322 - introduce ScopeContext that lives longer than Scope, now Xml does not multi-clone! 2017-01-31 16:42:01 +01:00
Mads Rasmussen
d4fab66411 add UI for partial views create dialog 2017-01-31 15:00:37 +01:00
Mads Rasmussen
4cd287616e add UI for partial view macros create dialog 2017-01-31 14:44:52 +01:00
Mads Rasmussen
d22afe07db add UI for scripts create dialog 2017-01-31 12:40:56 +01:00
Morten Christensen
fa56f1a59d Merge branch 'dev-v7' into dev-v7.6 2017-01-31 12:27:40 +01:00
Morten Christensen
546209ddb5 Merge pull request #1716 from umbraco/temp-U4-9451
U4-9451 Package installation custom user control is not displayed aft…
2017-01-31 12:24:52 +01:00
Morten Christensen
1e7c44ead0 Merge remote-tracking branch 'origin/temp-U4-9451' into dev-v7.6 2017-01-31 11:38:41 +01:00
Per Ploug
90448f1c78 Added comments and made helper internal 2017-01-31 11:06:14 +01:00
Stephan
6dc34e1167 U4-9322 - cleanup EventExtensions 2017-01-31 10:37:37 +01:00
Warren Buckley
6956e01861 Merge pull request #1713 from umbraco/temp-U4-9413
U4-9413 moving links to document and media to top of generic properties.
2017-01-31 09:37:34 +00:00
Claus
f3b364022a bumping version for deploy. 2017-01-31 10:33:57 +01:00
Claus
56ae2b709d adding deploy entity types for forms. 2017-01-31 10:31:45 +01:00