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

25 Commits

Author SHA1 Message Date
Bjarke Berg
d6751e2832 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	version.json
 2023-11-13 18:30:50 +01:00
Bjarke Berg
e263db7b3b post merge fix 2023-09-20 10:02:58 +02:00
Bjarke Berg
4dd3c295e0 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-09-20 09:43:41 +02:00
Bjarke Berg
d421be9d3c Added Indexing to v11+ UmbracoCmsSchema.cs 2023-08-09 15:27:13 +02:00
Bjarke Berg
3c81f968c3 post merge clean up 2023-06-21 08:53:18 +02:00
Bjarke Berg
7ab6598d0b Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
 2023-06-21 08:41:35 +02:00
Bjarke Berg
61a33c734c Merge remote-tracking branch 'origin/v10/dev' into v11/dev 
# Conflicts:
#	src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
 2023-03-29 10:30:16 +02:00
Nikolaj Geisle
79a9d73a90 Remove old proj ref to core from cs proj (#13870) 
Co-authored-by: Zeegaan <nge@umbraco.dk>
 2023-02-21 12:17:17 +01:00
Bjarke Berg
776f5ce1a0 Merge remote-tracking branch 'origin/v10/dev' into v11/dev 2023-02-15 14:06:39 +01:00
Ronald Barendse
2e54579a2f Simplify JSON schema, generation, copying and updating (#13427) 
* Simplify JSON schema and only generate appsettings-schema.Umbraco.Cms.json

* Use Umbraco.JsonSchema.Extensions to dynamically add JSON schema references

* Move DependentUpon items to shared MSBuild props

* Update LangVersion to latest

* Update Umbraco.GitVersioning.Extensions to 0.2.0

* Remove JSON schemas on clean

* Remove Umbraco.JsonSchema.Core project

* Fix JSON schema nullability

* Ignore additional JSON schema files in template

* Update CompatibilitySuppressions.xml

* Remove GlobalSettings.UmbracoPath from JSON schema again

* Remove RemoveUmbracoJsonSchemaFiles target

* Update Umbraco.JsonSchema.Extensions to 0.2.0 and add weights

* Flatten generated JSON schema hierarchy

* Remove LicensesSettings from CMS codebase

* Change AdditionalParameters to IDictionary
 2022-11-22 12:48:11 +01:00
Stephan
ff607aef7a Remove obsolete stuff 2018-07-30 14:04:02 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +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
Sebastiaan Janssen
6f6252b616 Restructures contribution guidelines into multiple files to make them easier to digest for new 
contributors
ref: https://github.com/umbraco/issues-community/issues/2
 2018-05-29 17:18:25 +02:00
Stephan
0cbfebe21c Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:08 +01:00
Sebastiaan Jansssen
99b5b0a396 CONTRIBUTING.md 🎉 2018-02-27 22:01:37 +01:00
Stephan
d37100e2d8 Build with PS 2017-06-28 13:38:06 +02:00
Stephan
4870554f47 U4-10006 - from build.bat to Umbraco.Build PS module 2017-06-15 13:32:00 +02:00
Sebastiaan Janssen
6ca6a08233 Add RevertToEmptyInstall which installs an empty DB with credentials admin/test 
Also deletes all dlls from /bin and rebuilds the project (to remove packages
that have installed dlls).
 2013-04-25 07:15:54 -02:00
Sebastiaan Janssen
cd4f66e7c5 Making a start on adding Selenium integration/UI tests for the backoffice 2013-04-25 06:10:57 -02:00
Sebastiaan Janssen
f947d05582 Use the NUnit workaround, like for v4 and ignore test that have been failing for 
a long time now
 2013-01-16 17:11:13 -01:00
Sebastiaan Janssen
fa862e9a33 Improve build so that you can't forget to set the version number, the version in 
UmbracoVersion.cs will be updated with the version configured in build.bat
 2013-01-14 12:16:55 -01:00
Sebastiaan Janssen
97639040f0 New way of transforming web.config file that should work in both VS2010 and 2012 
Moved transform responsibility to Umbraco.Web.UI (mainly because circular
dependency has been solved already a few months ago)
Managed to clean up build.proj significantly in the process
 2012-12-03 15:53:06 -01:00
Sebastiaan Janssen
19c3b251a0 Include the VS targets file so that the build server can find it as well 2012-11-19 08:09:43 -01:00
Matt@MBP-PC.Home
76fbcffea0 Updated build script to include empty folders in zips 2012-07-09 11:10:54 -01:00