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

8364 Commits

Author SHA1 Message Date
Kenn Jacobsen
47ccc8f584 Group content and media types by folder when setting up compositions (#3900) 2018-12-19 17:59:31 +01:00
Kenn Jacobsen
4d48254a93 Don't show "Create" and "Sort" for deleted items in the media tree 2018-12-19 15:33:53 +01:00
Shannon Deminick
fde64f157c Merge pull request #3818 from umbraco/temp7-268-xss-xslt 
Fixing XSS issue with Xslt files.
 2018-12-17 15:20:36 +11:00
elitsa
3c74ce2427 Implementing anti forgery token which will not allows members to be created by sending a request directly to the registration controller when the request is not coming from a page in the application 2018-12-10 08:55:54 +01:00
Kenn Jacobsen
7149ebcb68 Localize document type scaffolds for nested content (#3483) 2018-12-09 18:15:11 +01:00
Kenn Jacobsen
fb094f46be Fix edit content localization errors (#3840) 
* Fix wrongly formatted localizations

* Swap hardcoded time format for a localized one

* Split date and time in publish messages
 2018-12-07 14:17:34 +01:00
Kenn Jacobsen
9ad69c11cb Fix publish dates issues (#3507) 2018-12-03 18:45:50 +01:00
elitsa
ae8e20546f Reverting - unrelated changes. 2018-12-03 12:15:01 +01:00
elitsa
978f409f23 Removing malicious code when creating or editing the name of a xslt file. 2018-12-03 12:07:41 +01:00
elitsa
0abe685d7f Removing malicious code from the name of a Stylesheet. 2018-12-03 09:00:44 +01:00
elitsa
ae36e02f4c Reverting to the origin. 2018-12-03 08:54:08 +01:00
elitsa
3a26fe8fe2 Removing malicious code from the name of a Stylesheet. 2018-12-03 08:45:11 +01:00
Sebastiaan Janssen
f316b45ff8 Merge branch 'dev-v7' into dev-v7 2018-11-27 23:08:44 +01:00
prjseal
75fdee6d6d - added links to relation items in relatin view 2018-11-27 23:04:04 +01:00
Gareth Wright
63f548ea35 removed languages used for creating language. Removed languages used when editing language apart from current language. 2018-11-27 22:55:04 +01:00
Kenn Jacobsen
269f12edbf Remove the default action from tree menus if it isn't allowed 2018-11-27 22:35:38 +01:00
Kenn Jacobsen
fe26239f73 Fix the sort order of dictionary items in both the tree and list view 2018-11-27 22:20:54 +01:00
darrenferguson
4e887b843b Include the umbracoApplicationUrl Host in the Healthcheck email notifier (#3595) 2018-11-27 22:16:24 +01:00
Enkel Media
e9d53252b8 #3317 Appening Querystrings to url in ContentFinderByRedirectUrl (#3731) 2018-11-27 21:23:11 +01:00
Laura Weatherhead
03d965eada U4-11088 - XML Data Integrity "Fix Button" not Visible (#3782) 2018-11-27 20:52:20 +01:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Shannon
08dc94a535 Merge branch 'temp8' into temp-tinymce 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
 2018-11-22 15:38:58 +11:00
Shannon
57074d3545 some code cleanup 2018-11-22 15:26:10 +11:00
Shannon
9e7384a330 Merge branch 'temp8' into temp8-3096-angular-bulk-publish 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
 2018-11-20 19:37:39 +11:00
Shannon
d2a61e5b9c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 19:31:08 +11:00
Stephan
5f8e46e3cd Merge branch 'temp8' into temp8-3713 2018-11-20 08:15:26 +01:00
Shannon
f7f81945a0 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 11:51:59 +11:00
Shannon Deminick
c981f5e1b0 Merge pull request #3711 from aaronpowell/temp8-3710 
Fixes 3710: Removing the usage of HostingEnvironment.MapPath
 2018-11-20 11:31:26 +11:00
Aaron Powell
8a809fe97a Pushing crash handling on app domain into CoreRuntime 2018-11-19 22:02:51 +11:00
Aaron Powell
bcf542506d setting up more of the core in CoreRuntime, this time the logger and Umbraco Core 2018-11-19 22:00:50 +11:00
Aaron Powell
71026d6d15 Fixes 3713 
Moved the UmbracoApplicationBase from Core to Web
Moved the WebProfiler from Core to Web
Removed UmbracoApplicationBase from the CoreRuntime, it's still in the WebRuntime (and registered there in DI)
 2018-11-19 21:23:08 +11:00
Shannon
99d9c49c9f Gets sln building and manually merges the entity/media service changes 2018-11-19 17:54:36 +11:00
Shannon
c3736ce7ab Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	.github/README.md
#	build.bat
#	src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs
#	src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
#	src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
#	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IMediaService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Services/NotificationService.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
#	src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
#	src/Umbraco.Web.UI.Client/src/less/main.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.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/mediatypes/copy.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.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.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
#	src/Umbraco.Web.UI/Umbraco/developer/Macros/editMacro.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx
#	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/es.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Editors/ContentControllerBase.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/PasswordChanger.cs
#	src/Umbraco.Web/HttpRequestExtensions.cs
#	src/Umbraco.Web/Models/ContentEditing/Tab.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/Templates/TemplateRenderer.cs
#	src/Umbraco.Web/Trees/ApplicationTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/_Legacy/Controls/TabView.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
#	src/umbraco.cms/Actions/Action.cs
#	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2018-11-19 15:32:26 +11:00
Aaron Powell
e1be4effca Fixes 3710: Removing the usage of HostingEnvironment.MapPath 2018-11-19 14:31:20 +11:00
Warren Buckley
31969cd767 Merge pull request #3625 from umbraco/temp8-login-screen 
Temp8 login screen
 2018-11-16 12:34:05 +00:00
Stephan
149dfda975 Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-3096-angular-bulk-publish 2018-11-15 14:58:51 +01:00
Stephan
243fa78edf Fix scheduled publishing 2018-11-15 14:57:56 +01:00
Sebastiaan Janssen
06db9d2223 Reverts PR #3449 and #3493 2018-11-15 13:00:54 +01:00
Stephan
42857ebc2a Simplify version management, SolutionInfo is only the source now 2018-11-15 08:47:47 +01:00
Stephan
bd9a67f5a9 Fix dropdown migration 2018-11-15 08:43:54 +01:00
Bjarke Berg
94790e5eab Merge pull request #3528 from umbraco/temp7-3015-change-password-should-not-reset 
If a password is provided, then use this instead of an autogenerated …
 2018-11-15 07:42:35 +01:00
Shannon
e5e2194316 Updates some messaging 2018-11-15 17:20:00 +11:00
Shannon
496ecf5c9a Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues 2018-11-15 15:24:09 +11:00
Shannon
c8f1863e0d Getting publish with descendants working 2018-11-15 00:09:57 +11:00
Mads Rasmussen
4f2ed545da remove migration code for legacy views 2018-11-14 13:52:43 +01:00
Shannon
204c4e21fc fix merge 2018-11-14 22:31:51 +11:00
Shannon
b029215933 Updates logic for PasswordChanger so when the ChangePasswordWithMembershipProvider it correctly updates the password and raises the right event 2018-11-14 20:09:29 +11:00
Shannon
d80ce16e66 Merge remote-tracking branch 'origin/temp8-224-db-updates-sched-publishing-with-variants' into temp8-226-sched-pub-angular 2018-11-14 17:40:04 +11:00
Robert
c1bbc22087 Merge pull request #3511 from umbraco/temp7-262-xss-updating-removing-publicAccess 
Adding html encoding when updating or removing Public Access of a con…
 2018-11-13 12:54:11 +01:00
Stephan
6cb20c1d79 Deal with events and contexts in scheduled publishing 2018-11-13 11:51:25 +01:00