yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,957 Commits 4 Branches 7 Tags
050cdd2bb040ed54e8fcb396fa2ba9fd3944baf9
Commit Graph

4751 Commits

Author SHA1 Message Date
Sebastiaan Janssen
08bba71ef0 Merge branch 'v8/8.10' into v8/8.11 2021-01-11 11:37:03 +01:00
Sebastiaan Janssen
51a6995b7f Merge branch 'v8/8.9' into v8/8.10 2021-01-11 11:36:21 +01:00
Sebastiaan Janssen
ffcc958f58 Merge branch 'v8/8.8' into v8/8.9 2021-01-11 11:35:38 +01:00
Sebastiaan Janssen
12e8dfd4c7 Merge branch 'v8/8.7' into v8/8.8 2021-01-11 11:35:13 +01:00
Sebastiaan Janssen
e249c4f68d Merge branch 'v8/8.6' into v8/8.7 2021-01-11 11:34:44 +01:00
Warren Buckley
3914be43b8 Merge pull request #9629 from umbraco/v8/bugfix/4637-variation-deleting-content 
V8: Fix bug where allowing culture variation would delete content from element types #7471
(cherry picked from commit 463bc46675)
 2021-01-11 11:32:11 +01:00
Warren Buckley
463bc46675 Merge pull request #9629 from umbraco/v8/bugfix/4637-variation-deleting-content 
V8: Fix bug where allowing culture variation would delete content from element types #7471
 2021-01-11 09:58:45 +00:00
Mole
e243162ade Add unit test for the bug 2021-01-08 15:44:55 +01:00
Martin Humlund Clausen
d9c6584d90 Updated NPoco from 3.9.4 -> 4.0.2 (#9061) 2021-01-08 15:32:09 +01:00
Sebastiaan Janssen
967485f4e1 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
 2021-01-08 15:18:03 +01:00
Shannon Deminick
74e7ddb45f Merge pull request #9482 from umbraco/v8/feature/unattended-install 
Add support for unattended installs
 2021-01-07 19:19:52 +11:00
Shannon
fce13e23e9 Fixes test, adds null checks 2021-01-07 17:51:03 +11:00
Shannon
9e3d1836f0 fix build 2021-01-06 14:29:41 +11:00
Ronald Barendse
0abd229928 Fix, update and extend Range model (#9032) 
* Update Range documentation comments and use expression-bodied methods

* Implement IEquatable<Range<T>> and override Equals and GetHashCode

* Add Range formatting methods

* Use invariant culture in ToString

* Add RangeTests

* update ToString()
 2020-12-24 02:06:29 +01:00
Shannon
28b9b62781 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/nucache-perf 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-12-16 15:26:57 +11:00
Shannon
348ae22d91 Fixing tests 2020-12-14 12:37:30 +11:00
Warren Buckley
eeae4afe0b Merge remote-tracking branch 'origin/v8/dev' into v8/feature/property-label-on-top 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-11-27 15:34:53 +00:00
Sebastiaan Janssen
f88144ae48 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Examine/ContentIndexPopulator.cs
 2020-11-04 11:34:27 +01:00
Sebastiaan Janssen
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +01:00
Nik
9a0746da84 Issue #8568 Add an override for GetMostRecentRedirectUrl to allow for culture being passed in (#9191) 2020-10-27 10:48:16 +00:00
Sebastiaan Janssen
befa23190b Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:18:21 +02:00
Sebastiaan Janssen
b69e65ab3b Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-22 14:15:10 +02:00
Sebastiaan Janssen
2aefe899e4 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:08:05 +02:00
Shannon
a6101ce499 Merge branch 'dawoe-temp_8879' into v8/contrib 
(cherry picked from commit 35bf59dee4)
 2020-10-22 13:52:10 +02:00
Shannon Deminick
657f1fcdc7 Fixes regression issue with property values being updated in content repositories (#9146) 2020-10-21 20:30:35 +02:00
Shannon
a27e9a6b36 Merge branch 'v8/dev' into v8/feature/nucache-perf 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2020-10-13 16:36:42 +11:00
Dave Woestenborghs
fc9f80c30d Fix broken unit tests 2020-10-12 16:55:16 +02:00
Warren Buckley
f569200272 Fix & update tests 2020-10-07 21:20:53 +01:00
Sebastiaan Janssen
e9627f2ee9 Merge branch 'v8/dev' into v8/contrib 2020-10-05 21:12:51 +02:00
Ronald Barendse
2bfef74191 Fix casing of 'URL' (#9080) 2020-10-05 20:48:38 +02:00
Warren Buckley
1b7f095048 Trying to get the model mapping done correctly - but still stuggling. 
This can be persisited to DB correctly but does not hydrate model correctly back to a model
 2020-10-02 13:32:23 +01:00
Shannon
67a9b5bb97 Refactors the serialization of the content data that is stored in the nucache table. This had to change because we need to resolve content type data in order to check if the property should be compressed and we cannot do that data lookup while the data is being processed since we get an open data reader exception. This is fixed now by using a serializer factory instead so the Create method can do any initialization needed prior to running any serialization operation. Renames a few things so we dont have ContentNested (whatever that meant ) 2020-09-25 00:32:11 +10:00
Shannon
8c4650951d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/nucache-perf 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
 2020-09-24 16:00:49 +10:00
Shannon
0e44acc45e Merge remote-tracking branch 'origin/v8/8.8' into v8/8.9 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-09-24 14:19:58 +10:00
Sebastiaan Janssen
75830e1d3e Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:24:32 +02:00
Sebastiaan Janssen
d6275f34f7 Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/Security/MembershipHelper.cs
 2020-09-23 11:09:40 +02:00
Claus
a2cb264f27 Merge remote-tracking branch 'origin/v8/bugfix/8433-member-login-sql-locks' into v8/8.6 
(cherry picked from commit 6122bffa24)
 2020-09-22 14:49:28 +02:00
Shannon
75dc416ed9 Merge remote-tracking branch 'origin/v8/8.8' into v8/feature/no-local-login 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-09-17 15:38:04 +10:00
Shannon
26d8126497 More tests fixes up a few things with external login service, adds notes changes column to ntext 2020-09-11 14:37:31 +10:00
Shannon
3b23b85dd5 Adds more functionality to the external login table and services to store additional user data with the provider info and adds tests. 2020-09-11 00:02:57 +10:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 12:48:28 +02:00
Shannon
98bda6759e Adds more tests, cleans up tests 2020-09-08 11:25:37 +10:00
Shannon
56dd39bb1a cleanup 2020-09-08 02:09:05 +10:00
Shannon
a2c24bcc76 Gets copying logic working for the block editor, needs more tests though 2020-09-08 02:07:02 +10:00
Sebastiaan Janssen
79ac19bff8 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/edit.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
 2020-09-02 10:14:10 +02:00
Shannon
880e5179bf Fixing tests 2020-08-26 16:11:58 +10:00
Shannon
9a06b6291a Simplifies compression implementation, adds compression options to target all complex editors, ensures the options are per document type/property type 2020-08-26 15:57:13 +10:00
Sebastiaan Janssen
c8da5156fa Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-08-19 13:12:13 +02:00
Shannon
9a1de6468b notes and unit test, just wanted to see if this query could be improved but it can't 2020-08-19 13:33:49 +10:00
Shannon
666d67e562 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/nucache-perf 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
 2020-08-14 00:49:03 +10:00