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

2173 Commits

Author SHA1 Message Date
Bjarke Berg
b84961bcbc Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2020-01-22 07:06:43 +01:00
Shannon Deminick
3fa969eef2 Merge pull request #7400 from bielu/allow-override-internalsearch-constants 
Add possibility to override internal hardcoded configs for backoffice search
 2020-01-22 11:18:32 +11:00
abi
d33928f425 Correct project references 2020-01-03 01:43:37 +01:00
Shannon
a46e9124d2 First commit in fixing deadlock - committing my notes, etc... 2020-01-03 10:38:48 +11:00
abi
575ec6fec4 Correct project references 2020-01-02 13:39:23 +00:00
abi
00c913d621 add InternalSearchConstants 2020-01-02 12:02:48 +00:00
Ronald Barendse
b9e749152f Merge branch 'v8/dev' into v8/bugfix/contentquery-search 2019-11-15 09:49:50 +01:00
Bjarke Berg
7c72fb57f2 Merge remote-tracking branch 'origin/v8/8.3' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/LanguageCacheRefresher.cs
 2019-11-14 13:40:32 +01:00
Ronald Barendse
634f648517 Require Examine 1.0.2 2019-11-14 09:20:18 +01:00
Bjarke Berg
7eef6b4037 https://github.com/umbraco/Umbraco-CMS/issues/7125 - Updates the projects to use the same versions as required by our nuspec 2019-11-12 08:50:31 +01:00
Jeavon
4be1c3b4c4 Add UmbracoVirtualNodeByUdiRouteHandler (#6796) 
* Add UmbracoVirtualNodeByUdiRouteHandler

* Parameter must be a GuidUdi
 2019-10-29 21:38:29 +01:00
Ronald Barendse
7f0a077f58 Add SecurityCodeScan static code analyzer (#6636) 
* Added SecurityCodeScan to all projects

* Enable analysing of content items
 2019-10-29 19:37:15 +01:00
Bjarke Berg
c072015288 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB2913-DataTypeTracking 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2019-10-21 09:40:21 +02:00
pirvandr
174a1d731d # fix issue 6467: removed all the MacroContainer related files… (#6518) 2019-10-14 14:03:51 +02:00
Shannon
ac300179e6 Adds new endpoint to DataTypeController to return the correct data and wires that up to angular 2019-10-09 15:19:03 +11:00
Shannon
62ee1899ad Fixes Return 503 status code when in upgrade mode #6334 2019-10-01 18:26:36 +02:00
Shannon
5cfdfd6e9c Moves temp file cleanup to a background task 2019-09-18 22:03:31 +10:00
Shannon
c27e876c75 Removes BackgroundPublishedSnapshotNotifier 2019-09-16 17:40:48 +10:00
Shannon
2b9ab0a38a Merge branch 'v8/bugfix/background-pure-live-rebuild-AB1833' into v8/bugfix/AB2684-purelive-model-regen 
# Conflicts:
#	src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
 2019-09-16 17:38:10 +10:00
Shannon
44fbdb7028 renames class 2019-09-10 14:23:42 +10:00
Shannon
b997281e1f Only waits for background processing to finish if it's a front-end request, required caching the check for a front-end request which required moving the check to it's own class. 2019-09-10 14:10:26 +10:00
Shannon
296afb18a4 Renames and puts in temp fix to try to find out why we are binding to old models 2019-09-10 11:50:09 +10:00
Shannon
fdad387414 renames objects/methods and adds a lock to the routing mechanism 2019-09-09 23:32:02 +10:00
Shannon
8fef824dc1 Moves rebuilding models and cache to background thread 2019-09-09 23:32:02 +10:00
Warren Buckley
1ec88a6647 Add new API controller for uploading images dragged/pasted into a TinyMCE editor 2019-08-29 14:06:29 +01:00
Claus
66ba6f51da Merge pull request #6147 from umbraco/v8/feature/2196-improve-tiny-load 
Improve JS Asset load of TinyMCE Editor
 2019-08-26 13:25:34 +02:00
Sebastiaan Janssen
1f2c4e38ac Fix #5335 - Multiple Media Picker not available as macro parameter 2019-08-19 16:01:03 +02:00
Warren Buckley
b9b4721295 * Adds TinyMCE JS assets into init page load via script in default.cshtml view for Umbraco backoffice ng-app 
* Add TinyMCE JS assets array via NG app.value & uses assetsService to load (if not loaded in time by main init script above)
 2019-08-19 14:36:56 +01:00
Shannon
db6714d3b8 Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
 2019-08-14 10:39:15 +10:00
Shannon
be4536cf16 Refactors ugly statics and nested classes 2019-08-05 17:14:29 +10:00
Shannon
9f6a7dec2e Fixes how examine starts up to make it easier for custom index developers 2019-08-02 00:28:48 +10:00
Shannon
28a8027179 removes reference to old packages.umbraco.org 2019-07-24 19:25:32 +10:00
Warren Buckley
bb8356d7db Merge pull request #5924 from umbraco/v/bugfix/5035-slot-swap2 
Fixes race condition in PublishedSnapshotService and more...
 2019-07-23 09:18:44 +01:00
Shannon
817a458334 Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/packages.config
 2019-07-18 16:22:38 +10:00
Shannon
f3bfc1ffb2 Puts back UmbracoAntiForgeryAdditionalDataProvider for backwards compat reasons but it is not used 2019-07-18 16:18:11 +10:00
Shannon
3603090421 Fixes race condition in PublishedSnapshotService and more... 2019-07-17 22:51:14 +10:00
Shannon
b675f6252c removes files (should have been part of cherry pick?), fixes logic 2019-07-16 23:07:31 +10:00
Shannon
d52420183e Cherry picks ValidateUmbracoFormRouteStringAttribute implementation and fixes up some logic 2019-07-16 23:03:26 +10:00
Shannon
0cbe0b4796 Cherry picks ValidateUmbracoFormRouteStringAttribute implementation 2019-07-16 22:34:34 +10:00
Sebastiaan Janssen
57e3187e3a For some reason this file was not part of the project any more :-( 2019-07-03 22:10:01 +02:00
Shannon
37bf6fe938 Automatically refresh the page if we encounter a ModelBindingException 2019-07-03 19:15:54 +10:00
Shannon
33aff7ff61 Merge branch 'v8/dev' into v8/bugfix/fixes-for-bypass-securtiy-after-merge 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2019-07-03 11:04:34 +10:00
Sebastiaan Janssen
4d2c551b79 Merge branch 'v7/dev' into v8/dev 2019-07-02 22:01:34 +02:00
Sebastiaan Janssen
5b7ae7150f Fix weird merge 2019-07-02 21:55:54 +02:00
Sebastiaan Janssen
5bf29a907a Fixes #5206 2019-07-02 21:47:14 +02:00
Bjarke Berg
66abd7b50c Merge remote-tracking branch 'origin/v8/dev' into v8/dev 2019-07-02 11:31:14 +02:00
Bjarke Berg
e6484687e5 Small fixes after v7 to v8 merge regarding the bypass security feature 2019-07-02 11:17:23 +02:00
Claus
178b1ccf40 Merge pull request #5743 from umbraco/v8/feature/sourcelink-update 
V8: Adds in SourceLink Debugging Feature
 2019-07-02 10:49:11 +02:00
Shannon
ba7cd48b8f Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715 
# Conflicts:
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2019-07-02 10:49:20 +10:00
Warren Buckley
b64f303537 Mark the release PDB as portable too - the Powershell build uses Release not Debug 2019-07-01 11:20:07 +01:00