yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,151 Commits 4 Branches 7 Tags
5f7bf3a211d920c8e2efca17955ecc457c1d9151
Commit Graph

7911 Commits

Author SHA1 Message Date
Sebastiaan Janssen
0095429ff0 Fix package.json after merge 2018-12-07 09:24:15 +01:00
Stephan
159ae136f3 Merge branch 'temp8' into temp8-3675-variant-tags 2018-12-07 08:49:25 +01:00
Shannon
8da992aabf manually merges changed lang files and a few other things 2018-12-07 12:03:33 +11:00
Warren Buckley
7f380347dc Some WIP binding updates in the view - will mostly need to bind an array of integers back to items 2018-12-06 15:35:40 +00:00
Mads Rasmussen
57f462b204 wire up create package 2018-12-06 15:26:12 +01:00
Mads Rasmussen
e566e240b1 prefill umbraco version number 2018-12-06 14:49:02 +01:00
Mads Rasmussen
9409b46ef4 fix back buttons 2018-12-06 13:57:21 +01:00
Mads Rasmussen
7df0869649 wire up delete 2018-12-06 13:13:55 +01:00
Mads Rasmussen
3c399ade16 last textarea should be actions 2018-12-06 12:50:08 +01:00
Mads Rasmussen
452f97de62 wire up get created package by id 2018-12-06 11:53:26 +01:00
Mads Rasmussen
68006f78ee wire up end point for get created packages 2018-12-06 11:33:03 +01:00
Mads Rasmussen
849cc2d383 remove tree sync for packages and users as we don't have a tree 2018-12-06 10:20:48 +01:00
Shannon
07f15ec7b3 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
#	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.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/ru.xml
#	src/Umbraco.Web.UI/Umbraco/developer/RelationTypes/EditRelationType.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/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/XmlDataIntegrityHealthCheck.cs
#	src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs
#	src/umbraco.cms/businesslogic/language/Language.cs
 2018-12-06 17:13:23 +11:00
Mads Rasmussen
74d9945e09 Add title to files and control pickers 2018-12-05 15:42:44 +01:00
Mads Rasmussen
749a25aabb user overlayService for ysods 2018-12-05 15:41:55 +01:00
Warren Buckley
28c4b2ee7f Merge branch 'temp8-packages-ui' of https://github.com/umbraco/Umbraco-CMS into temp8-packages-ui 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js
 2018-12-05 14:29:32 +00:00
Warren Buckley
00428ec2de Adds in new hidden aka initialized=false tree (so that it can be displayed only as a dialog/infinite editor) to display files & folders from root of the site for the package creator UI 2018-12-05 14:28:07 +00:00
Shannon
dd2c43485d Moves tag editor to a component, fixes issue with typeahead and invariant properties, fixes migration to update the IX_cmsTags index correctly 2018-12-06 01:10:53 +11:00
Mads Rasmussen
d77796bcac show selected files and control 2018-12-05 15:06:50 +01:00
Mads Rasmussen
e599685684 wip file pickers ui 2018-12-05 14:20:34 +01:00
Mads Rasmussen
bd505a8574 get doctypes, datatypes, languages etc from the server and bind selection to model + add content picker 2018-12-05 13:37:01 +01:00
Stephan
c74fc7a8f9 Misc cleanup and renaming 2018-12-05 12:57:23 +01:00
Sebastiaan Janssen
901af2be8e Fix docs build 2018-12-05 10:44:06 +01:00
Sebastiaan Janssen
f002b371b9 Update npm marked reference 2018-12-05 10:42:44 +01:00
Mads Rasmussen
a4bdcf99b1 wip create package editor 2018-12-05 10:36:20 +01:00
Stephan
c6a9701e53 Merge branch temp8 into temp8-di2690 2018-12-05 09:05:47 +01:00
Shannon
d549cb8e3d Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 2018-12-05 17:36:50 +11:00
Shannon
b48a7fa4a9 Gets search tools working for explicitly defined searchers, have tested with a multi index searcher, refactors SupportsUnpublished vs SupportSoftDelete vs OnlyPublishedContent booleans and made some sense out of the reindexing items in ExamineComponent which didn't really work, cleans up IPublishedContentQuery implementation 2018-12-05 16:53:25 +11:00
Mads Rasmussen
bd455aaede fixing up styles to better fit new UI 2018-12-04 11:19:08 +01:00
Mads Rasmussen
04e8fc7fa3 fix missing form from install local package 2018-12-04 11:18:32 +01:00
Mads Rasmussen
cb7c1f9bbd use table for installed packages 2018-12-04 11:18:12 +01:00
Shannon
1717f94fcf Gets searching on dashboard working with paging and viewing field values 2018-12-04 15:41:54 +11:00
Shannon
56d1a317c0 Gets searching working in the dashboard, updates to latest examine 2018-12-04 14:25:37 +11:00
Kenn Jacobsen
9ad69c11cb Fix publish dates issues (#3507) 2018-12-03 18:45:50 +01:00
Kenn Jacobsen
ce980fc822 Merge branch 'temp8' into v8-feature-angular-public-access 2018-12-03 15:56:10 +01:00
Sebastiaan Janssen
a8d7660150 So close, come on dependencies! 2018-12-03 13:30:25 +01:00
Sebastiaan Janssen
0410a788cb One more attempt to fix vulnerable dependencies 2018-12-03 13:23:37 +01:00
Warren Buckley
8b5eb1f0a4 Merge pull request #2478 from Shazwazza/U4-2827 
U4-2827 Allow dashboards via manifest
 2018-12-03 12:13:12 +00:00
Sebastiaan Janssen
763fda2857 Hopefully resolve the rest of the vulnerabilities 2018-12-03 13:11:39 +01:00
Sebastiaan Janssen
137439d6eb Fixes the flatmap-stream issue. package-lock went nuts, but couldn't figure it out even with Mads' help :/ 2018-12-03 12:43:39 +01:00
Warren Buckley
0d6ee927bc Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-dev-dependencies 2018-12-03 11:01:32 +00:00
Warren Buckley
e4fb2dff96 Merge remote-tracking branch 'origin/temp8' into temp8-upgrade-depdendencies 2018-12-03 09:39:26 +00:00
Warren Buckley
8b77c5e278 Merge pull request #3792 from umbraco/temp8-upgrade-jquery 
Temp8 upgrade jquery
 2018-12-03 09:35:45 +00:00
Warren Buckley
dd7b4669d5 Merge pull request #3786 from umbraco/temp8-3651 
add overlay to tree when infinite editing is open
 2018-12-03 09:21:41 +00:00
Warren Buckley
a40a6fbe8f Merge pull request #3783 from umbraco/temp8-3110 
Temp8 3110
 2018-12-03 09:16:33 +00:00
Mads Rasmussen
32ed237729 package-lock 2018-12-03 09:48:59 +01:00
Shannon
162b90194d Gets sln building, removes old legacy settings, removes ascx dashboard support 2018-12-03 16:14:49 +11:00
James Coxhead
df961d9199 Merge branch 'temp8' into 3436-relations-editor 
# Conflicts:
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
 2018-12-02 23:31:54 +00:00
James Coxhead
c6d09cbcff Split relation type and associated relations into tabbed view 2018-12-02 22:53:30 +00:00
James Coxhead
a4f270bd02 Added localisation 2018-12-02 22:33:15 +00:00