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

6632 Commits

Author SHA1 Message Date
Warren
44e76adbd1 Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
 2018-08-08 12:01:15 +01:00
Warren
6372d393ee Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this ! 
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
#	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/dialogs/notifications.aspx
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
 2018-08-07 15:48:21 +01:00
Warren
65571f4ee2 Change endpoint name to be inline with others prefixing with Post in the Controller method 2018-08-07 10:34:03 +01:00
Warren Buckley
5e01da2013 Merge pull request #2838 from umbraco/temp8-bye-umbraco_client 
Bye umbraco_client
 2018-08-07 10:09:36 +01:00
Warren Buckley
b0756b0b0e Fix typo selectedSting to selectedString 2018-08-07 09:24:59 +01:00
Warren Buckley
b4de7fd64a Removes unused dependancies notificationService & localizationService 2018-08-07 09:23:45 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
Robert
398c75ca4d Merge pull request #2833 from umbraco/temp8-126 
fixes: Update UI on the dictionary editor to match V8 styles
 2018-08-06 11:04:20 +02:00
Warren Buckley
4b2ddbdbdd Merge pull request #2832 from umbraco/temp-92 
fixes temp-92: Code editing: Convert overlays into infinite editors
 2018-08-06 09:54:58 +01:00
Mads Rasmussen
85b18eec05 only allow to open template if user has access to settings section 2018-08-06 10:47:20 +02:00
Mads Rasmussen
41f5d7d113 This treeSync code doesn't work and I don't know why 2018-08-03 11:17:48 +02:00
Mads Rasmussen
85938e5432 fix sorting of root nodes 2018-08-03 10:52:09 +02:00
Mads Rasmussen
ad12026e29 add sorting for media 2018-08-03 10:24:44 +02:00
Mads Rasmussen
8177d08df2 add sort by table headings 2018-08-02 20:59:55 +02:00
Mads Rasmussen
1e5db34679 add empty state and error handling for save 2018-08-02 19:22:17 +02:00
Mads Rasmussen
23c86ecc4a forgot the parentId was still in use 2018-08-02 17:37:29 +02:00
Mads Rasmussen
3dff904264 get children from the current node id and not the parent 2018-08-02 17:15:26 +02:00
Mads Rasmussen
2b25de4ae6 save sort order 2018-08-02 16:17:53 +02:00
Mads Rasmussen
0ea7bdfe7b get children for sort dialog 2018-08-02 15:51:41 +02:00
Warren
6967ed1846 Adds in Sort Angular dialog from Mads & removes some of the old sort dialog parts 2018-08-02 13:52:13 +01:00
Warren
1b20f0be0d Scaffold HTML & Angular Controller to put in a UI (Probably with some help from Mads) 2018-08-02 11:16:31 +01:00
Sebastiaan Janssen
89bdbf500e Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)" 
Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename"
This reverts commit 9663cfde82 and commit 11aea0f515
 2018-08-02 11:48:12 +02:00
Mads Rasmussen
bef6afe359 post-merge fix: open doctype in infinite editing from info app 2018-08-02 11:41:40 +02:00
Mads Rasmussen
fceb7804b4 fixes: Update UI on the dictionary editor to match V8 styles 2018-08-02 11:05:04 +02:00
Mads Rasmussen
788ed8b61b make template editor support infinite editing 2018-08-02 10:00:11 +02:00
Warren
eb220b6db0 Add in jQuery VUpalidate & Unobtrusive into bower 
Update ref's to new path
 2018-08-01 22:35:03 +01:00
Mads Rasmussen
759c21cec9 use infinite macropicker in partial views and partial view macro editior 2018-08-01 20:06:35 +02:00
Mads Rasmussen
3e36e06d77 add extra markup for the infinite editor 2018-08-01 19:01:44 +02:00
Mads Rasmussen
0a31ac6ef3 use macropicker in template editor 2018-08-01 18:47:55 +02:00
Mads Rasmussen
bf4b48aa9d move the macropicker files to the infinite editor folder 2018-08-01 18:47:08 +02:00
Mads Rasmussen
caf942db8b Merge branch 'temp8' into temp-92 2018-08-01 16:01:41 +02:00
Mads Rasmussen
b28d23b8e7 add item picker infinite editor + use in template editor 2018-08-01 15:20:48 +02:00
Mads Rasmussen
b5f02367ab Use new template section infinite editor instead of the old overlay in the template editor 2018-08-01 13:34:01 +02:00
Mads Rasmussen
fbfcccc13d add infinite editor markup to template sections 2018-08-01 13:33:17 +02:00
Mads Rasmussen
37db8516ed move template sections overlay to infinite editors 2018-08-01 13:13:09 +02:00
Mads Rasmussen
d7c0a92d9f update insert code snippet infinite editor to use new insert field editor 2018-08-01 12:30:31 +02:00
Mads Rasmussen
d88ed02a8d use insert field infinite editor in template, partial views and macro partial views editors 2018-08-01 11:47:48 +02:00
Mads Rasmussen
4cc31a62c0 convert insertfeld overlay to an infinite editor 2018-08-01 11:46:28 +02:00
Mads Rasmussen
4ede57836e move insertfield files to new location 2018-08-01 09:51:44 +02:00
Sebastiaan Janssen
638f71d80e Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/default/StartupDashboardVideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
 2018-08-01 08:45:18 +02:00
Sebastiaan Janssen
f849ca38fc Merge pull request #2829 from readingdancer/U4-11551 
Fixing various broken links in the source code
 2018-08-01 08:04:20 +02:00
Chris Houston
9663cfde82 Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828) 2018-08-01 07:16:38 +02:00
Sebastiaan Janssen
1d5a807e0d Merge pull request #2826 from bjarnef/dev-v7-U4-9025-3 
U4-9025 - Fix styling of prevalues
 2018-08-01 06:43:29 +02:00
Chris Houston
bb59c4708d Just triggering AppVeyor :) 
As per my other pull request, pretty sure the one unit test failed due to it running close to midnight on the last day of the month.
 2018-08-01 00:30:44 -04:00
Chris Houston
23fda3a0ed Fixing various broken links in the source code, some are just in comments and others are actually used within Umbraco, also added HTTPS where possible. 2018-07-31 23:00:46 -04:00
Shannon
19851b6986 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/PluginManager.cs
#	src/Umbraco.Core/Services/Implement/UserService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
#	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
#	src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
#	src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
#	src/Umbraco.Web/Install/FilePermissionHelper.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/requestModule.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.cms/businesslogic/Content.cs
#	src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
 2018-08-01 12:26:26 +10:00
Bjarne Fyrstenborg
a6d9b4b260 Add text-overflow for long labels 2018-07-31 23:25:56 +02:00
Bjarne Fyrstenborg
c4fc5a04f9 Adjust color picker prevalues to fit within overlay 2018-07-31 22:16:33 +02:00
Bjarne Fyrstenborg
63bbbbab31 Adjust multivalues styles 2018-07-31 22:15:30 +02:00
Sebastiaan Janssen
fe914dc339 Also make sure the alias gets generated from the full name and not just the part before the & 2018-07-31 22:01:35 +02:00