yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,215 Commits 4 Branches 7 Tags
3a487e447b63f3d1abdb949b3a78d6ebc1fe40c4
Commit Graph

24215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
3a487e447b moves migrations 2018-07-30 22:25:29 +10:00
Shannon
10db2834aa committing new migrations from v7 so we can properly rename them on next commit 2018-07-30 21:36:15 +10:00
Shannon
a83ea47c25 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
#	src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
#	src/Umbraco.Web.UI.Client/src/views/media/move.html
#	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/umbraco.MacroEngines/Resources/Web.config
#	src/umbraco.cms/Actions/ActionRestore.cs
#	src/umbraco.editorControls/yesno/YesNoDataType.cs
 2018-07-30 21:31:35 +10:00
ashallcross
7559fab5ce Update readme (#2806) 2018-07-27 16:01:34 +02:00
Richard Thompson
60910efc53 U4-10681 Restore option in media recycle bin (#2342) 2018-07-27 15:56:18 +02:00
Sebastiaan Janssen
c0cdf727ca Merge pull request #2804 from ashallcross/Update-Readme 
Updated the umbraco.org URL's to be umbraco.com
 2018-07-27 15:15:23 +02:00
Adam Shallcross
675ce08469 Updated the umbraco.org URL's to be umbraco.com 2018-07-27 14:09:51 +01:00
Sebastiaan Janssen
8c1f236e3f Fix unit test 2018-07-27 15:08:48 +02:00
BatJan
bd3f7ffcd4 U4-11538 Color picker thumbnail is to wide (#2801) 2018-07-27 14:35:04 +02:00
Sebastiaan Janssen
940bc0c7de Merge pull request #2799 from BatJan/features/temp-U4-11537 
U4-11537 - Add title attributes to the umbConfirmAction directive's "buttons"
 2018-07-27 13:51:32 +02:00
Jan Skovgaard
b8af6f7987 Add title attributes to the "buttons" inside the umbConfirmAction directive providing translations for english and danish at the same time 2018-07-27 13:03:12 +02:00
Sebastiaan Janssen
fd993f733f Merge pull request #2798 from LottePitcher/temp8 
In build.ps1, use .Path if .Source returns nothing
 2018-07-27 12:57:14 +02:00
Sébastien Sougnez
f7e097be8e Minor update to the grid settings/style section (#2797) 2018-07-27 12:50:30 +02:00
Lotte Pitcher
e920d3f4b2 In build.ps1, use .Path if .Source returns nothing 2018-07-27 11:39:27 +01:00
BatJan
9b9173d64f Use the umbConfirmAction directive when deleting tags (#2795) 2018-07-27 11:24:29 +02:00
Sebastiaan Janssen
e0c0eecaac Merge pull request #2796 from umbraco/temp-U4-11536 
fixes U4-11536 Migration is breaking upgrade path to v. 7.12
 2018-07-27 10:29:35 +02:00
Sebastiaan Janssen
ed4ded79ee Merge pull request #2794 from dawoe/temp-U4-10502 
U4-10502 added dutch translations for user management
 2018-07-27 10:29:22 +02:00
Claus
f11c71599b fixes U4-11536 Migration is breaking upgrade path to v. 7.12 2018-07-27 09:10:46 +02:00
Dave Woestenborghs
7109338f68 U4-10502 added dutch translations for user management 2018-07-27 08:01:59 +02:00
Sebastiaan Janssen
26a49fbe9f Fixes U4-9244 2018-07-26 15:55:33 +02:00
Sebastiaan Janssen
6deb97e356 Merge branch 'TimGeyssens-dev-v7' into dev-v7 2018-07-26 15:34:54 +02:00
Sebastiaan Janssen
ff0af2f227 Merge branch 'dev-v7' of https://github.com/TimGeyssens/Umbraco-CMS into TimGeyssens-dev-v7 
# Conflicts:
#	src/Umbraco.Web/Trees/TreeController.cs
 2018-07-26 15:33:52 +02:00
Sebastiaan Janssen
2bb5d0b30e Merge pull request #2775 from bjarnef/dev-v7-U4-9025-2 
U4-9025 - Add sortable to color picker prevalues
 2018-07-26 13:47:53 +02:00
Sebastiaan Janssen
dffe33569a Merge branch 'dev-v7' into dev-v7-U4-9025-2 2018-07-26 13:47:36 +02:00
Bjarne Fyrstenborg
567863079e Update a few names and descriptions for prevalues 2018-07-26 12:03:31 +02:00
Bjarne Fyrstenborg
c571284f40 Adjust a bit more styling 2018-07-26 11:50:31 +02:00
Stephan
52bb935604 Merge pull request #2684 from jamescoxhead/U4-6231 
U4-6231 Refactored Umbraco.Web.WebServices classes
 2018-07-26 11:30:34 +02:00
Bjarne Fyrstenborg
89c84c7a30 Set same width as for multivalues 2018-07-26 11:28:24 +02:00
Bjarne Fyrstenborg
d2e8b084f5 Remove width on label 2018-07-26 11:25:38 +02:00
Bjarne Fyrstenborg
99181d5bf4 Adjust thumbnail styling 2018-07-26 11:23:24 +02:00
Stephan
1f353da33c Cleanup IShortStringHelper if controller is gone 2018-07-26 11:23:06 +02:00
Stephan
8c88f8709b Fix merge 2018-07-26 11:22:53 +02:00
Bjarne Fyrstenborg
0f3a8bff5d Add consistency and a few localizations 2018-07-26 11:17:53 +02:00
Sebastiaan Janssen
0811baef9b Merge pull request #1620 from bjarnef/dev-v7-U4-9186 
U4-9186 - Fix positioning of file icon extension label
 2018-07-26 10:55:55 +02:00
Sebastiaan Janssen
7d76e2efbc Merge branch 'dev-v7-U4-9186' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-9186 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
 2018-07-26 10:53:40 +02:00
Stephan
eadd79771d Merge branch temp8 into temp8-6231 2018-07-26 10:42:35 +02:00
Stephan
8a3232bd23 Renormalize 2018-07-26 10:39:13 +02:00
Owain Williams
0eddf6b755 Implementing new colour picker for document types (#2792) 2018-07-26 10:04:55 +02:00
Stephan
3c8a5c3a0d Remove obsolete code 2018-07-26 09:56:23 +02:00
Stephan
6f4ad059ef Cleanup 2018-07-26 09:41:43 +02:00
Sebastiaan Janssen
295f59e236 Merge pull request #2230 from StefanoChiodino/dev-v7 
Normalises whitespace (replace tabs) and add EOF line
 2018-07-25 22:17:33 +02:00
Sebastiaan Janssen
b39b724303 Merge pull request #2241 from marcemarc/temp-u4-10537 
U4-10537 - Enable editor to skip Macro Selection step, when there is only one macro, and it has parameters
 2018-07-25 21:56:11 +02:00
Sebastiaan Janssen
4ca88e48c2 Merge pull request #2259 from AndyFelton/U4-10577 
Use the underlying Peta Poco DB type to get the Type
 2018-07-25 17:25:13 +02:00
Sebastiaan Janssen
53aed514fa Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-07-25 17:12:29 +02:00
Sebastiaan Janssen
6afb28088d Merge branch 'Attackmonkey-U4-10334' into dev-v7 2018-07-25 17:11:34 +02:00
Sebastiaan Janssen
33fdfbbad5 Merge branch 'U4-10334' of https://github.com/Attackmonkey/Umbraco-CMS into Attackmonkey-U4-10334 2018-07-25 17:02:54 +02:00
Sebastiaan Janssen
a9d6a842b6 Merge pull request #2326 from bjarnef/dev-v7-U4-10694 
Change types of listview properties
 2018-07-25 16:44:27 +02:00
Sebastiaan Janssen
cbe4154013 Merge pull request #2344 from matthew-darby/U4-8879 
U4-8879 - Create button on member and media list view
 2018-07-25 16:41:15 +02:00
Bjarne Fyrstenborg
02ac44e214 U4-10792 - highlight error when trying to add duplicate in listview columns (#2362) 2018-07-25 16:29:20 +02:00
Anders Bjerner
187a32cdc0 Added fallback URLs for the "umbNodePreview" directive (#2369) 2018-07-25 16:01:36 +02:00