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

22520 Commits

Author SHA1 Message Date
Shannon
e6718c6989 more manual merging 2018-11-20 17:44:24 +11:00
Shannon
bc66d4cbc6 manually merges list view changes with new blueprint functionality, manually merges other files, fixes issue with Action drop down in v8 2018-11-20 17:00:37 +11:00
Shannon
96d7cca68d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
 2018-11-20 14:12:26 +11:00
Shannon
b4c2c8bd74 manually merging 2018-11-20 14:11:35 +11:00
Shannon
9ae4d1cdf5 fixes how the grid rte resizes when a tab changes to use the proper event handler 2018-11-20 14:10:20 +11:00
Shannon
80070e7332 Fixes how the new move method on MediaService deals with event messages 2018-11-20 12:20:16 +11: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
Shannon
543a34a6f3 Fixes how the new move method on MediaService deals with event messages 2018-11-19 17:58:42 +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
889e48ea4a Detect incomplete migrations 2018-11-15 19:36:23 +01:00
Bjarke Berg
0fedeab45d Merge pull request #3516 from umbraco/temp8-expr-visitor 
Fix expression visitor for WHERE IN
 2018-11-15 14:54:38 +01:00
Mads Rasmussen
40c0b4ef2b delete angular-bootstrap file. It is never loaded anyway 2018-11-15 13:18:15 +01:00
Sebastiaan Janssen
06db9d2223 Reverts PR #3449 and #3493 2018-11-15 13:00:54 +01:00
Mads Rasmussen
29a2e4664b Remove global close dialog events and add them to each component so we can clean up correctly 2018-11-15 10:58:47 +01:00
Stephan
c2a72ad98f Fix tags migration 2018-11-15 10:11:22 +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
Mads Rasmussen
a067242f5e fix list view card layout 2018-11-14 15:31:17 +01:00
Mads Rasmussen
c7e1cdec17 delete dialogService 2018-11-14 14:49:11 +01:00
Mads Rasmussen
86e280f7d3 delete last dialogService views 2018-11-14 14:30:21 +01:00
Mads Rasmussen
136309dd29 remove dialogService from new login screen 2018-11-14 14:11:43 +01:00
Mads Rasmussen
10caf7b75b remove old login screen code 2018-11-14 14:11:11 +01:00
Mads Rasmussen
4f2ed545da remove migration code for legacy views 2018-11-14 13:52:43 +01:00
Mads Rasmussen
9f8f1a1df2 This file doesn't seem to be in use 2018-11-14 13:49:04 +01:00
Mads Rasmussen
66fd184480 remove references to dialogService 2018-11-14 12:50:50 +01:00
Mads Rasmussen
49a624ade7 fix discard changes for permissions context dialog 2018-11-14 11:56:04 +01:00
Mads Rasmussen
bea074c964 fix up "Do something else"-buttons 2018-11-14 11:17:44 +01:00
Stephan
7a0040ce82 Bugfix visitor 2018-11-14 10:52:24 +01:00
Shannon
413791fb19 Fixes problem with UserRepository.GetProfile since it was looking up the wrong fields :( this meant that the security audit events were not being raised since it wasn't finding users by their login 2018-11-14 20:32:20 +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
Mads Rasmussen
b38547396b fix up more context menu close buttons 2018-11-14 09:46:11 +01:00
Stephan
7c6b92b539 Merge branch 'temp8' into temp8-expr-visitor 2018-11-14 09:20:06 +01:00
Shannon Deminick
5c255ba846 Merge pull request #3525 from umbraco/temp8-265-cant-create-partial-view-macro-files 
Change sections on views for partial view macros
 2018-11-14 19:07:26 +11:00
Shannon Deminick
d4836d0cb8 Merge pull request #3523 from umbraco/temp8-264-cant-reload-tree-nodes-in-templating-area 
Bugfix: Can't reload tree Nodes in the Templating area of the Settings section
 2018-11-14 18:56:16 +11:00
Mads Rasmussen
17497e7cc7 fixing up a bunch of close buttons in the context menu dialogs 2018-11-13 17:38:22 +01:00
Anders Bjerner
cb636544c0 Spotted some minor typos 2018-11-13 15:06:58 +01:00
Mads Rasmussen
d7f59adc64 dont get currentNode from dialogOptions 2018-11-13 14:26:43 +01:00
Mads Rasmussen
259e17b45d open context menu dialog based on appState instead of dialogService 2018-11-13 14:25:15 +01: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
Mads Rasmussen
530a3e2439 fix up invite user functionality 2018-11-13 10:41:09 +01:00
Mads Rasmussen
340ad8b853 add white background to user invite confirmation screen 2018-11-13 09:40:04 +01:00
Mads Rasmussen
253797573e dont bind the form to the vm 2018-11-12 11:40:03 +01:00
Mads Rasmussen
db2f1e9cb1 use overlayService for ysods 2018-11-09 13:49:19 +01:00
Mads Rasmussen
ad805acd38 fix reset password flow 2018-11-09 11:18:01 +01:00
Mads Rasmussen
1e167113b7 fix show reset password button 2018-11-09 10:39:33 +01:00