swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,791 Commits 73 Branches 219 Tags
fc39568415f43a1f2cc484fcbf8dd4bc697e207f
Commit Graph

4275 Commits

Author SHA1 Message Date
Shannon fc39568415 Updated audit info to include full lang name 2018-10-30 14:49:25 +11:00
Mads Rasmussen bce2c43fdd small fixes to alignment and copy 2018-10-26 11:21:56 +02:00
Mads Rasmussen 5356d0a0ab Merge branch 'temp-3433' of git://github.com/dawoe/Umbraco-CMS into dawoe-temp-3433 2018-10-26 10:35:24 +02:00
Shannon 83f73c085f Fixes unpublish, allows to be permission assigned and checks this permission when trying to perform that action 2018-10-26 16:40:28 +11:00
Shannon 555a275e13 fixes build 2018-10-26 13:21:30 +11:00
Dave Woestenborghs 2fbe2bb3da #3433 added short cut for toglle allow culture variants to short cuts overview 2018-10-25 12:54:17 +02:00
Dave Woestenborghs 3c217adc2e #3433 added language keys for text of culture variant permissions 2018-10-25 12:49:32 +02:00
Shannon Deminick 3652a96687 Merge pull request #3352 from umbraco/temp8-dirty-tracking-on-variants 
v8 - allows audit trail/logging of changed cultures
 2018-10-25 01:11:53 +11:00
Shannon c7cb8b52cc Fixes AuthorizeUpgrade page since it was still referencing the old UmbracoClient folder 2018-10-24 15:23:21 +11:00
Stephan c0a1e7f2f6 Merge branch temp8 into temp8-dirty-tracking-on-variants 2018-10-23 17:43:52 +02:00
Shannon ce6b4f4a51 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
 2018-10-23 22:16:48 +11:00
Shannon fa64f4a6a8 Fixes member group editing, removes old dialog tasks, removes old references in the old ui.xml file 2018-10-23 21:38:24 +11:00
Stephan 9699e6cb71 Merge branch 'temp8' into temp8-dirty-tracking-on-variants 2018-10-23 10:51:28 +02:00
Warren Buckley e3c6cfa63c Merge pull request #3312 from umbraco/temp8-3298-move-rollback 
Temp8 3298 move rollback
 2018-10-23 09:28:41 +01:00
Shannon d9a4d1fa97 Manual merging 2018-10-23 16:12:23 +11:00
Shannon c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	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/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.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/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00
Anders Bjerner 39edf4c6dd Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:58:45 +02:00
Anders Bjerner 6f359b3d18 Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:57:01 +02:00
Anders Bjerner e1919e0c52 Added keys for "enterAlias" and "generatingAlias" 2018-10-21 13:54:17 +02:00
Kenn Jacobsen 00cf8dcf05 Reload the node when publishing all unpublished children 2018-10-21 11:01:45 +02:00
Kenn Jacobsen f993869482 Remove the default SMTP configuration 2018-10-19 15:16:01 +02:00
Ed Parry 201a2cd7b1 Added the user ID and GUID to the user details view. (#3279) 2018-10-19 15:13:07 +02:00
Bjarne Fyrstenborg 8e1065a2b6 Fix missing semicolons and remove comma at end 2018-10-19 15:08:17 +02:00
Mads Rasmussen 126a834ad4 fix installer facts 2018-10-19 14:49:27 +02:00
Shannon abeb4e04e5 Enhance implementation of ObservableDictionary so we can re-use this in more places, changes CultureNameCollection to ObservableDictionary, fixes issue with dirty tracking changed property type collections ... this was working by pure fluke before! Fixes more tests. 2018-10-19 15:41:28 +11:00
Shannon 8dfb0dc35c more send to translate cleanup 2018-10-19 13:25:06 +11:00
Shannon cc4ee6527d Gets the correct variant logging put in to the audit trail, cleans up audit trail messages to make sense, makes sure audit trail is reloaded when changing variants 2018-10-19 13:24:36 +11:00
Warren Buckley 321313f134 Remove rollback .aspx dialog 2018-10-18 14:32:44 +01:00
Robert 15f5e9a98e Typo in lazyload JS path for AuthUpgrade page 2018-10-18 11:25:05 +02:00
Warren Buckley bdf474f111 Typo in lazyload JS path for AuthUpgrade page 2018-10-18 09:06:46 +01:00
Warren Buckley b27be1153c Merge pull request #3239 from umbraco/temp8-3092-publish-descendants 
Temp8 3092 publish descendants
 2018-10-16 12:20:40 +01:00
Shannon 10873c1dfc Cleans up all old tree classes. woohoo! 2018-10-16 17:41:02 +11:00
Shannon 831657537f tree webforms cleanup 2018-10-16 16:56:28 +11:00
Shannon 339417b977 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
 2018-10-16 13:11:09 +11:00
Lotte Pitcher a3de30934d Re-adding the language keys for login greeting on a Sunday (greeting0) that were accidentally removed 2018-10-14 16:56:18 +02:00
Mike Masey fe906f0e81 Update lazyload.js reference on install pages. 2018-10-13 17:59:43 +01:00
Warren Buckley bbc28b132d Merge pull request #3260 from umbraco/temp8-remove-bower 
Temp8 remove bower
 2018-10-11 14:38:45 +01:00
Mads Rasmussen 7a372bf814 fix lazyload 2018-10-11 13:50:52 +02:00
Shannon c6a4b014cb Merge remote-tracking branch 'origin/temp8-3087-tree-grouping' into temp8-3087-tree-grouping 2018-10-11 10:28:47 +02:00
Warren Buckley eb3fd54e2e Remove empty/unused keys for these tree header groupings 2018-10-11 09:21:39 +01:00
Shannon a534457f53 Merge remote-tracking branch 'origin/temp8' into temp8-3087-tree-grouping 2018-10-11 10:15:07 +02:00
Mads Rasmussen 66333aa5ec fix label for schedule publish invariant content 2018-10-10 15:19:29 +02:00
Mads Rasmussen 75d5c7e30c add translations, autoslect active variant, order by active + clean up 2018-10-10 14:48:54 +02:00
Mads Rasmussen 8fdbfea23f wip publish descendants dialog 2018-10-10 11:33:42 +02:00
Kenn Jacobsen afa3e9b5eb Improve image cropper UX (#3149) 2018-10-09 22:54:51 +02:00
Kenn Jacobsen 4d1b361f8f Style Public access dialog (#3194) 2018-10-09 21:32:54 +02:00
Poornima Nayar 9986c10cec Cleaned up the view by removing inline styles and style tags on the view itself. 
Removed inline styles in the code behind files
Moved all styles into the modals.less stylesheet
 2018-10-09 12:35:32 +02:00
Kenn Jacobsen 62d65f0e3a Style the sort result so it looks like e.g. the copy dialog result 2018-10-09 12:09:12 +02:00
Warren Buckley 31b616f0ae Merge branch 'temp8' into temp8-3087-tree-grouping 
# Conflicts:
#	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/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
 2018-10-09 09:25:00 +01:00
Nathan Woulfe 08818c6358 removes ng-show from iframe, make loader background a solid color to hide iframe while it loads 2018-10-09 10:08:51 +02:00