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

26180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Warren Buckley
2a0748fc1e Merge pull request #3745 from umbraco/temp8-tinymce 
Temp8 tinymce
 2018-11-22 14:05:44 +00:00
Shannon
77f855a649 Removes a ton of duplicate code 2018-11-22 17:46:49 +11: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
3947a471be Fixes tree sync with sorting media 2018-11-21 16:59:23 +11:00
Shannon
fda327a604 removes $routeParams from a dependency on content.resource, fixes event ordering during nav init, fixes tree re-syncing after sorting, removes some obsolete/old code 2018-11-21 16:40:13 +11:00
Stephan
64dd7c113c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-11-20 15:19:07 +01:00
Stephan
e056f1b282 Fix tests 2018-11-20 15:17:01 +01:00
Mads Rasmussen
219b38ff77 fix authorize upgrade screen 2018-11-20 12:33:26 +01:00
Shannon
63470c80dd fixes build 2018-11-20 20:28:17 +11:00
Shannon Deminick
e8e6374c95 Merge pull request #3693 from umbraco/temp8-3096-angular-bulk-publish 
Angular bulk publishing integration
 2018-11-20 19:38:12 +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
Shannon
82e7be4ae9 Fixes creating content type collections 2018-11-20 18:43:41 +11:00
Stephan
8aaa75778e Cleanup 2018-11-20 08:35:28 +01:00
Stephan
5f8e46e3cd Merge branch 'temp8' into temp8-3713 2018-11-20 08:15:26 +01:00
Shannon
fad566afba Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-11-20 18:14:36 +11:00
Shannon
3dfa3eaac7 fixes media picker svg handling to only use a single IMG tag, else this resulted in a number of 404's with invalid paths like [Object,object] 2018-11-20 18:13:19 +11:00
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
d5a8e7751b Removes the word "Kim" from the list view 2018-11-20 15:25:02 +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
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
c9b2cbc75f Removing files that weren't meant to be added 2018-11-19 21:26:32 +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
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
35a5146cad Fix ContentService branch publishing 2018-11-16 13:30:42 +01:00
Shannon
3e5e9aa9d7 temp refactor for fixing issue with return AlreadyPublishedStatus 2018-11-16 16:39:27 +11:00
Stephan
889e48ea4a Detect incomplete migrations 2018-11-15 19:36:23 +01: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
6a8fc09acd Fix ContentService branch publishing events 2018-11-15 14:58:10 +01:00
Stephan
243fa78edf Fix scheduled publishing 2018-11-15 14:57:56 +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
Stephan
f316931a50 Merge branch 'temp8-224-db-updates-sched-publishing-with-variants' into temp8-3096-angular-bulk-publish 2018-11-15 13:34:02 +01:00
Stephan
eb37e03ebc Deal with fixme/review 2018-11-15 13:25:21 +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