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

31333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
9fea3ea500 Merge branch 'feature/5702-custom-validation-messages' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-feature/5702-custom-validation-messages 
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
 2019-11-21 10:10:15 +01:00
Shannon Deminick
b68f1d44f1 Merge pull request #6599 from ronaldbarendse/v8/bugfix/5947-custom-exceptions 
Fixed and cleaned up custom exception classes
 2019-11-21 19:21:19 +11:00
Andy Butland
54b3e7e60d Moved custom validation message database migrations into 8.4 folder and namespace 2019-11-19 12:35:36 +01:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Warren Buckley
8d3850a50b Merge pull request #7167 from umbraco/v8/bugfix/7147-fix-losing-content-when-using-embed-in-RTE 
Embed function in RTE removes previous content from RTE
 2019-11-19 09:44:44 +00:00
Warren Buckley
7c1af34b3e Update src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js 2019-11-19 08:58:00 +00:00
Claus
5a78c28d19 Merge pull request #7171 from umbraco/v8/bugfix/fix-unclosed-xml-in-italian-language 
Close unclosed key element in italian language file
 2019-11-18 22:29:39 +01:00
mikkelhm
6faa5d79d3 Close unclosed key element in italian language file 2019-11-18 22:17:39 +01:00
Niels Lyngsø
5c160f6390 Only replace content by EmbedItem if the selected content is of type EmbedItem. 2019-11-18 14:20:44 +01:00
Ronald Barendse
979ccebe75 Make publicly exposed internal exceptions public 2019-11-15 21:19:22 +01:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Bjarke Berg
a97e131891 Bump version o 8.6 (8.5 reserved for MB release) 2019-11-14 14:00:49 +01:00
Bjarke Berg
c0dc545c27 Fix for csproj 2019-11-14 13:54:04 +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
Bjarke Berg
ba73ad5792 Merge remote-tracking branch 'skttl/grid-editor-name-templates' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI/config/grid.editors.config.js
 2019-11-14 13:08:05 +01:00
Shannon Deminick
075937de59 Merge pull request #7145 from umbraco/v8/feature/0000-Remove-non-production-mode-from-gulp 
remove isProd from Gulp script
 2019-11-14 13:14:02 +11:00
Shannon
7cbb2840a4 Merge branch 'Jeavon-v8/feature/search-media-files' into v8/dev 2019-11-14 12:40:53 +11:00
Ronald Barendse
b494678dd9 Changed thrown exception types to InvalidOperationException 2019-11-14 00:57:13 +01:00
Ronald Barendse
03c7bcc6c9 Remove serialization of ViewModel in InstallException 2019-11-14 00:29:57 +01:00
Ronald Barendse
3ef10ac8fc Constrain generic type of DataOperationException to an enum 2019-11-14 00:28:24 +01:00
Ronald Barendse
4a84f63ab4 Updated obsolete message for WontImplementException 2019-11-14 00:20:04 +01:00
Ronald Barendse
9f19546c42 Validate options argument and authentication type 2019-11-14 00:10:16 +01:00
Ronald Barendse
b486c54645 Use same argument validation in BeginUmbracoForm overloads 2019-11-14 00:07:28 +01:00
Ronald Barendse
84495f23b5 Update ufprt field HTML to use double quotes 2019-11-14 00:03:05 +01:00
Ronald Barendse
76de5cc4c7 Changed NullReferenceException to InvalidOperationException 2019-11-13 23:57:26 +01:00
Ronald Barendse
f1953bc99c Use same argument validation in AddAttribute as in SetAttribute 2019-11-13 23:56:00 +01:00
Ronald Barendse
5a004581ad Remove DuplicateKeyException 2019-11-13 23:54:00 +01:00
Jeavon
88f6ddeae4 Code tweaks from PR review - also led to adding logging for Deserialization issues and therefore needing to mock the logger for the tests 2019-11-13 12:07:11 +00:00
Niels Lyngsø
e2adb4964c remove isProd from Gulp script 2019-11-13 09:36:40 +01:00
Shannon Deminick
89e9b14f88 Merge pull request #7131 from umbraco/v8/hotfix/7125-update-dependencies-to-same-as-nuspec 
V8: Update the projects to use the same dependencies as required by our nuspec
 2019-11-13 09:21:53 +11:00
Jeavon
10622cc430 Switched to using a dummy Uri so that runtimeState isn't needed as per review 2019-11-12 10:26:25 +00:00
Jeavon
b30f7b6a48 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-11-12 10:12:03 +00: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
Jan Skovgaard
a2551521e4 Settings dashboard: Add translations (#6880) 2019-11-11 20:48:52 +01:00
Niels Lyngsø
5528c721c7 Merge pull request #6811 from umbraco/v8/feature/0000-DataType-DeleteWarning-with-links-to-references 
Adding reference links to DataType delete dialog
 2019-11-08 09:36:11 +01:00
Niels Lyngsø
73f7e85f41 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/0000-DataType-DeleteWarning-with-links-to-references 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
 2019-11-08 09:28:52 +01:00
Richard Thompson
0d2c2846d4 Corrected the model variable name 
The model variable name is registerModel rather than profileModel.
 2019-11-07 15:21:11 +00:00
andyneil
41915080b2 Fix incorrect data types for default member properties. (#7086) 
Issue https://github.com/umbraco/Umbraco-CMS/issues/7051
 2019-11-07 15:01:22 +00:00
Poornima Nayar
52dcdb396f Accessibility Improvement - Open Template in info content app changed from anchor tag to button 2019-11-07 14:34:46 +00:00
Poornima Nayar
603f720636 Changed the styling of Resend Invitation button and fixed the margin 2019-11-07 14:17:08 +00:00
Paul Seal
466610bd32 - added delete title to trash icons in the grid 2019-11-07 14:05:23 +00:00
John Sheard
d747312eb7 encode name of folder rename 2019-11-07 13:06:50 +00:00
Jeffrey Schoemaker
55b76ecc4e Add some help if you're on the wrong repo (#7082) 2019-11-07 12:46:48 +01:00
Bill Bixby
6307a0173b Edit text file to remove reference to App_Data\NuGetBackup folder 2019-11-07 11:24:31 +00:00
Sebastiaan Janssen
60e4727e51 Update CONTRIBUTING.md 2019-11-07 12:05:16 +01:00
Jeffrey Schoemaker
2bbe2c01de Added to switch to the correct repository 
I always forget this.... And it's nowhere in the documentation
 2019-11-07 10:48:00 +00:00
KB
d41e5bb27f Update JQuery CDN In partial snippets, to use newer version without vulnerability 2019-11-05 18:16:47 +00:00
Kenn Jacobsen
759e3ddf5e Make sure we can't rollback trashed items serverside 2019-11-05 18:15:14 +00:00
Kenn Jacobsen
a78aab628f Don't show rollback for deleted content 2019-11-05 18:15:14 +00:00
Søren Kottal
1c70d04ce2 Moves editor name part out of template. Adds null checking in templates 2019-11-05 15:33:29 +01:00