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

3934 Commits

Author SHA1 Message Date
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
e8aa6701ef Renormalize 2018-07-04 09:03:59 +02:00
Stephan
b3696c29cc Refactor Variants at service level 2018-07-04 08:59:50 +02:00
Stephan
a697608529 Fix un/publishing with variants + urls 2018-07-03 13:05:20 +02:00
Mads Rasmussen
451f894976 Merge branch 'temp8' into temp8-83 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2018-07-02 10:07:50 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
c1f3de7e5c Umbraco.Web.UI/Umbraco not /umbraco 2018-06-29 19:51:59 +02:00
Mads Rasmussen
f402b9e449 update labels on generate models buttons when using infinite editing 2018-06-28 10:57:09 +02:00
Mads Rasmussen
96fada7586 add translations 2018-06-26 14:00:29 +02:00
Shannon
9d49ddba7c Fixes installer including some c# bits, fixes the hash bang to be back to normal 2018-06-15 15:51:37 +10:00
Warren
3be22bd6a7 Fix up modelsbuilder dashboard - we now use ng-bind-html directive as opposed to ng-bind-html-unsafe 2018-06-13 12:27:22 +01:00
Sebastiaan Janssen
6e8214e697 Merge remote-tracking branch 'origin/dev-v7' into temp8 2018-06-06 22:36:22 +02:00
Marc Goodson
0eceb3c7fc U4-11369 - Add list of content types where a composition content type is used to compositions dialog (#2668) 2018-06-06 22:35:10 +02:00
Sebastiaan Janssen
9008e6af88 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	docs/CONTRIBUTING_DETAILED.md
#	docs/README.md
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/LanguageTreeController.cs
 2018-06-06 21:15:11 +02:00
Stephan
062a47f2aa Use ModelsBuilder from NuGet, -alpha.44 2018-06-04 11:37:19 +02:00
Stephan
f92a03b996 Use ModelsBuilder from NuGet, -alpha.43 2018-06-04 11:32:53 +02:00
Stephan
1255eed84c Remove ModelsBuilder project 2018-06-04 11:10:55 +02:00
Stephan
ac788320a2 U4-11375 - 'try' ascii 2018-05-31 08:26:38 +02:00
Stephan
985385bb30 U4-11375 - url segments are ascii by default 2018-05-31 08:23:22 +02:00
Mundairson
fefe5660ef Added merged files from dev-v7 2018-05-30 10:07:05 +01:00
Shannon
685a052339 tweak /umbraco/view/web.config to only block cshtml, so the *.html files can be downloaded 2018-05-30 16:29:16 +10:00
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
Mundairson
6fb4f8fc8b Corrected some spelling and grammar. 2018-05-22 01:10:41 +01: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