yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,164 Commits 4 Branches 7 Tags
0176e2f2e0566e83b31d71609e973a70a183ae07
Commit Graph

4634 Commits

Author SHA1 Message Date
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
Kenn Jacobsen
8990a8fcb0 Remove the Umbraco core jQuery dependency for macro partials 2018-12-01 09:26:55 +01:00
Shannon
6103832b8a Gets index rebuilding working 2018-11-30 12:22:23 +11:00
Shannon
340b8e6cef Latest examine, updates for dashboard, adds UmbracoExamineIndexDiagnostics 2018-11-29 13:55:51 +11:00
Mads Rasmussen
7032f1424d add overlay to tree when infinite editing is open 2018-11-28 10:13:48 +01:00
prjseal
d6662febec - added the change to the control in the umbraco.web.ui folder as I don't believe it is generated automatically from the other file. 2018-11-27 23:04:04 +01:00
darrenferguson
4e887b843b Include the umbracoApplicationUrl Host in the Healthcheck email notifier (#3595) 2018-11-27 22:16:24 +01:00
Shannon
3fd0aef18e decouples data lookup from indexers and rebuilding logic 2018-11-28 01:23:02 +11:00
Mads Rasmussen
900c8355cc show prompt if node is dirty before opening the doc type editor in infinite editing 2018-11-27 14:04:05 +01:00
Germán Díaz de Rada
d1457cfd75 Updated with more accurate translations (#3742) 
Updated Spanish translations
 2018-11-27 10:22:01 +01:00
Shannon
d3057ea2e1 Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code 
# Conflicts:
#	src/Umbraco.Core/StringExtensions.cs
 2018-11-26 17:34:22 +11:00
Shannon
b6790261c4 Adds test 2018-11-26 17:20:15 +11:00
Shannon
4f7de35e04 Adds HtmlValueType 2018-11-26 12:06:38 +11:00
Kenn Jacobsen
4192a11de0 Update ngdoc and en-us translations 2018-11-25 11:02:33 +01:00
Kenn Jacobsen
ed56845bc1 Implement remove protection + add success messages 2018-11-25 09:17:04 +01:00
Kenn Jacobsen
5026bc03e1 A lot more implementation :) 2018-11-24 19:39:15 +01:00
Kenn Jacobsen
18258fe487 Initial setup of public access dialog 2018-11-23 16:16:06 +01:00
Warren Buckley
7eee1ac76c Merge remote-tracking branch 'origin/temp8-tinymce' into temp8-logviewer 2018-11-22 14:18:58 +00:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00: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
c5b36773c9 Removes the old _searchEmail and configures the 'email' field to be of type EmailAddress 2018-11-22 14:26:26 +11:00
Shannon
2965523029 Configures Umbraco indexes via code, updates to latest examine, simplifies some logic 2018-11-22 14:05:36 +11:00
Warren Buckley
880176e91e Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-11-21 13:16:56 +00:00
Mads Rasmussen
219b38ff77 fix authorize upgrade screen 2018-11-20 12:33:26 +01: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
e6718c6989 more manual merging 2018-11-20 17:44:24 +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
Warren Buckley
b22ae2cf9f Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-11-16 12:55:04 +00: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
Shannon
496ecf5c9a Cleans up how the content path permissions are checked, integrates the bulk publishing into the controller, adds security check to ensure the user can publish the whole branch, updates the UI messaging so they are grouped by publish statuses and deals with multiple publish status (i.e. in bulk), fixes some content tree issues 2018-11-15 15:24:09 +11:00
Anders Bjerner
cb636544c0 Spotted some minor typos 2018-11-13 15:06:58 +01:00
Mads Rasmussen
530a3e2439 fix up invite user functionality 2018-11-13 10:41:09 +01:00
Shannon
5827a8a3e1 I think i've finally got saving a schedule working with the correct validation 2018-11-13 14:31:37 +11:00
Shannon
66394926c0 Gets some validation messages working for sched pub 2018-11-13 00:46:13 +11:00
Shannon
4d13956372 better logic for validating and persisting schedules 2018-11-12 17:29:38 +11:00
Mads Rasmussen
4c3ac097ca wip move login logic from dialog to its own component 2018-11-09 09:59:36 +01:00
Shannon
76f6721c80 Got some of the angular bits wired up 2018-11-09 16:12:08 +11:00
LindaSluijter
6a1568d562 Typo/spelling/grammar fixes for Dutch translation (#3576) 2018-11-08 16:36:40 +00:00
Warren Buckley
1d5ae45b06 Merge remote-tracking branch 'origin/temp8' into temp8-logviewer 2018-11-08 09:58:56 +00:00
Mads Rasmussen
1d07ef7e4d add preview 2018-11-07 18:23:43 +01:00
Mads Rasmussen
dca4c4e3bf open the correct view based on which item you are creating and on the content of the stylesheet file 2018-11-07 15:11:35 +01:00
Dave Woestenborghs
110ecc5fda #3434 use toggle for mandatory validation on property type settings and made a better distinction between mandatory and custom validation 2018-11-07 10:09:04 +01:00
Claus
f764b46b8e Merge pull request #3429 from umbraco/temp8-231-send-to-publish-with-variants 
v8 - send to publish with variants
 2018-11-06 14:19:28 +01:00
Claus
8f43451519 Merge pull request #3503 from kjac/feature-angular-stylesheets-editing-in-tabs 
V8: Angular implementation of stylesheets editing
 2018-11-06 13:52:32 +01:00
Warren Buckley
a5e9ce515f Merge branch 'temp8' into temp8-logviewer 2018-11-06 11:46:46 +00:00
Robert
bdd438e307 Merge branch 'temp8' into temp8-3469-listview-publish 2018-11-06 09:57:38 +01:00
elitsa
acd067bb4e Fixes a reflected XSS issue due to a parameter consumed directly from the request. 2018-11-05 10:07:50 +01:00