yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,360 Commits 4 Branches 7 Tags
6e2222d3570d2fc32dbba5dc8299632cc28cd769
Commit Graph

3912 Commits

Author SHA1 Message Date
Shannon
6e2222d357 Merge remote-tracking branch 'origin/dev-v7' into temp8 2018-05-30 16:16:04 +10:00
Shannon
6868279909 csproj bump 2018-05-30 16:15:23 +10:00
Shannon Deminick
49062d3ede Merge pull request #2625 from poornimanayar/U4-11159 
Fixed typos in tours
 2018-05-30 08:10:25 +02:00
Shannon
2c41f3dbfa Updated web.config for /umbraco/views 2018-05-30 15:32:33 +10:00
Shannon
9b08a73210 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2018-05-30 15:29:08 +10:00
Shannon
00e0dbaa65 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-30 15:22:09 +10:00
Shannon
4705a6bc10 updates views web.config 2018-05-30 15:21:59 +10:00
Stephan
373fad6efe Merge ModelsBuilder in, NuGet dies on circ dependencies now 2018-05-21 10:05:52 +02:00
Stephan
129e094b09 Fix Umbraco.Web.UI references 2018-05-18 15:24:12 +02:00
Mads Rasmussen
c3c24eba4f Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-18 12:33:16 +02:00
Mads Rasmussen
145858a302 hide culture dropdown in culture and hostnames dialog 2018-05-18 11:07:54 +02:00
Stephan
6ce24bf1a1 Various fixes 2018-05-17 17:24:30 +02:00
Stephan
76bf84f8ea Forgot to update binding redirects 2018-05-17 16:34:05 +02:00
Stephan
a8ba8598f2 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 15:34:27 +02:00
Stephan
7387379aea Upgrade to ModelsBuilder -alpha.18 2018-05-17 15:32:27 +02:00
Shannon
3da120ce33 Adds Property Type to the published content model, fixes some web.config versions 2018-05-17 13:32:20 +02:00
Stephan
20ecb6a779 Merge branch origin/temp8 into temp8-xbuild 2018-05-17 13:04:57 +02:00
Stephan
f44c5ad757 Cleanup nuget, bindings, build 2018-05-17 12:17:42 +02:00
Claus
9e3db051c9 Merge remote-tracking branch 'origin/temp8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
#	src/Umbraco.Web.UI/web.Template.config
 2018-05-17 08:26:02 +02:00
Claus
70d1bed396 Merge branch 'temp8' into temp-U4-11218 2018-05-17 08:16:17 +02:00
Stephan
fe1a4f7d4f Depend on Umbraco.SqlServerCE 2018-05-16 15:54:07 +02:00
Stephan
6bedc1020b Cleanup solution and build wip 2018-05-16 15:46:51 +02:00
Shannon
34de58e0dc adjust assembly redirects 2018-05-16 15:21:23 +02:00
Shannon
1bc3fdd07c Fixes package tree references 2018-05-16 10:49:43 +02:00
Shannon
95c6de5534 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 10:15:57 +02:00
Shannon
c655873b7d Cleanup canvas designer files, no more dotless dependency, cleans up preview, removes bloat 2018-05-16 10:13:55 +02:00
Shannon
ea6c466323 Fixes up some warnings 2018-05-16 10:06:51 +02:00
MADSRASMUSSB4A1\madsrasmussen
6e647d87fa Merge branch 'temp8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
 2018-05-16 09:51:26 +02:00
Shannon
07e7068c22 removed too many assembly bindings 2018-05-15 18:07:48 +02:00
Shannon
971114e0fd Updates to 472 and re-targets to the original System.Threading.Tasks.Dataflow package against netstandard 1.3 but with 472 this completely fixes dependency outputs 2018-05-15 17:17:05 +02:00
Shannon
842d5049b5 Fixing dependencies so we aren't relying so much on netstandard 1.3 libs which require system runtime facade's 2018-05-15 17:02:06 +02:00
ragivi
2b4cf7d185 Update preview page 
In order to avoid indexing.
 2018-05-14 14:48:01 +02:00
Poornima Nayar
d05819e125 Fixed typos in tours 2018-05-11 12:23:51 +01:00
Shannon
f2b78c06ef FIxes issue where an invariant property type was being validated with a culture when that would always fail. Fixes issue when saving a content type to ensure that a property type is never both variant and invariant. Adds test. 2018-05-10 18:01:41 +10:00
Mads Rasmussen
600979d129 Merge branch 'temp8' into temp-U4-11218 2018-05-09 08:51:34 +02:00
Shannon
d90ccbb7f0 no matter what you can always publish the current variant 2018-05-09 14:34:55 +10:00
Shannon
b1eeb5b193 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282 2018-05-08 00:39:12 +10:00
Shannon
97cb752cda Ensures the whole doc gets unpublished if a mandatory culture is unpublished, updates content service Unpublish to have it's own status result enum since that is needed. 2018-05-08 00:37:41 +10:00
Shannon
5a991c9424 Fixes Publishing/Unpublishing variants and it's nuances 2018-05-07 23:22:52 +10:00
Robert
ff505531c2 Merge pull request #2614 from umbraco/temp8-U4-11283 
fixes - U4-11283 Cannot save content when a doc type is variant but a property type is invariant
 2018-05-07 13:18:15 +02:00
Mads Rasmussen
1d5751a1e5 Merge branch 'temp8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
#	src/Umbraco.Web.UI.Client/src/views/content/edit.html
 2018-05-07 11:25:38 +02:00
Stephan
73b5694aad Fix web.config transform 2018-05-04 18:35:01 +02:00
Robert
48c70604a9 Added localization for "Ready to publish?" publish overlay, added previously removed property which was still in use. 2018-05-04 13:42:33 +02:00
Shannon
912711bfa0 Fixing tree, navs, initializing, sequence of events, oh my. The init logic is much more stable but we have issues with tracking the mculture query string 2018-05-04 00:58:18 +10:00
Stephan
41144bb7f7 Fix references and build 2018-05-03 15:11:33 +02:00
Stephan
5798d8e57b Enable src/preserve.belle to stop rebuilding Belle all the time 2018-05-03 15:11:25 +02:00
Sebastiaan Janssen
a4cc67f732 Make NuGet package install work 2018-05-02 12:35:10 +02:00
Warren Buckley
394e7f3d6d Merge pull request #2609 from umbraco/temp8-U4-11173 
Fixes - U4-11173 Update the publish dialog list to only show languages that have pending changes
 2018-05-02 09:39:08 +01:00
Robert
106955f6c3 Adds localization keys for some text, removed duplicate loading indicator 2018-05-01 16:41:36 +02:00
Robert
a4b5e08a73 Simplified the way we mark variants as drafts trough localization keys, show published languages in the overlay instead of hiding them 2018-05-01 12:03:34 +02:00