Stephan
|
ec6ba01cbf
|
So long Facade
|
2017-10-31 12:48:24 +01:00 |
|
Stephan
|
be00851b50
|
Installer image
|
2017-09-27 12:02:04 +02:00 |
|
Stephan
|
05cb03af11
|
Fix, now boots and runs
|
2017-09-27 10:26:37 +02:00 |
|
Stephan
|
ca0d5e365a
|
Port 7.7 - WIP
|
2017-09-19 16:46:49 +02:00 |
|
Stephan
|
9a28250a8d
|
Port 7.7 - WIP
|
2017-09-15 18:22:19 +02:00 |
|
Stephan
|
ab8fc33691
|
Port 7.7 - WIP
|
2017-08-14 18:21:48 +02:00 |
|
Stephan
|
d34a425dd1
|
porting 7.6@5c5baca into 8
|
2017-05-30 12:54:22 +02:00 |
|
Stephan
|
8561d85f7a
|
porting 7.6-rc1 into 8
|
2017-05-24 12:25:39 +02:00 |
|
Stephan
|
ade6c2f057
|
All projects use C# 7.0
|
2017-04-20 19:16:41 +02:00 |
|
Stephan
|
07a05317ff
|
Merge dev-v7.6 into dev-v8
|
2016-12-14 14:06:30 +01:00 |
|
Shannon
|
90f30c3f3c
|
Ensures tag values are Html encoded both on the client side and on the server side to prevent any xss
|
2016-12-05 17:13:07 +11:00 |
|
Sebastiaan Janssen
|
4855466b38
|
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v8
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Persistence/UmbracoDatabase.cs
# src/Umbraco.Core/Services/ContentTypeService.cs
# src/Umbraco.Core/UmbracoApplicationBase.cs
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Search/ExamineEvents.cs
# src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
# src/Umbraco.Web/UI/Controls/UmbracoControl.cs
# src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/library.cs
# src/Umbraco.Web/umbraco.presentation/macro.cs
# src/Umbraco.Web/umbraco.presentation/template.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
# src/UmbracoExamine/DataServices/UmbracoContentService.cs
# src/umbraco.businesslogic/BasePages/BasePage.cs
# src/umbraco.businesslogic/Log.cs
# src/umbraco.businesslogic/User.cs
# src/umbraco.cms/businesslogic/CMSNode.cs
# src/umbraco.cms/businesslogic/Content.cs
# src/umbraco.cms/businesslogic/ContentType.cs
# src/umbraco.cms/businesslogic/Dictionary.cs
# src/umbraco.cms/businesslogic/Packager/Package.cs
# src/umbraco.cms/businesslogic/Property/Property.cs
# src/umbraco.cms/businesslogic/RecycleBin.cs
# src/umbraco.cms/businesslogic/Tags/Tag.cs
# src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
# src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
# src/umbraco.cms/businesslogic/datatype/DefaultData.cs
# src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
# src/umbraco.cms/businesslogic/datatype/PreValue.cs
# src/umbraco.cms/businesslogic/datatype/PreValues.cs
# src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
# src/umbraco.cms/businesslogic/member/Member.cs
# src/umbraco.cms/businesslogic/member/MemberGroup.cs
# src/umbraco.cms/businesslogic/propertytype/propertytype.cs
# src/umbraco.cms/businesslogic/relation/Relation.cs
# src/umbraco.cms/businesslogic/relation/RelationType.cs
# src/umbraco.cms/businesslogic/template/Template.cs
# src/umbraco.cms/businesslogic/web/Document.cs
# src/umbraco.cms/businesslogic/web/DocumentType.cs
# src/umbraco.cms/businesslogic/workflow/Notification.cs
# src/umbraco.cms/packages.config
# src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
# src/umbraco.editorControls/BaseDataType.cs
# src/umbraco.editorControls/DefaultData.cs
# src/umbraco.editorControls/DefaultDataKeyValue.cs
# src/umbraco.editorControls/DefaultPrevalueEditor.cs
# src/umbraco.editorControls/KeyValuePrevalueEditor.cs
# src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
# src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
# src/umbraco.editorControls/SettingControls/Pickers/Field.cs
# src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
# src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
# src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
# src/umbraco.editorControls/memberpicker/memberPicker.cs
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/tags/PrevalueEditor.cs
# src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
# src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
# src/umbraco.editorControls/umbraco.editorControls.csproj
# src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
# src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
|
2016-11-29 18:01:43 +01:00 |
|
Sebastiaan Janssen
|
47c8e6854e
|
Fixes: U4-9217 - Sanitize tags before storing them in the database
|
2016-11-23 14:24:26 +01:00 |
|
Stephan
|
8e056aba66
|
Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested)
|
2016-11-23 10:33:12 +01:00 |
|
Warren Buckley
|
02bfe3ad72
|
Merge pull request #1603 from rjabreu/U4-9036
added finish button so page only reloads after user input. also added…
|
2016-11-16 16:14:53 +00:00 |
|
Claus
|
f2c406f168
|
Merge pull request #1572 from umbraco/temp-U4-4196-gkonings-html5-dropzone
U4-4196 U7 - Umbraco HTML5 Drop Zone should honor media types
|
2016-11-14 09:59:22 +01:00 |
|
Claus
|
2115367353
|
updating the migration to include only needed ids.
formatting stuff in js.
|
2016-11-14 09:57:17 +01:00 |
|
Mads Rasmussen
|
f9d8754d88
|
add support for one custom media type
|
2016-11-10 12:00:07 +01:00 |
|
Mads Rasmussen
|
07c2a14321
|
If there is only 1 allowed media type set the alias to auto to let the server decide
|
2016-11-10 11:13:00 +01:00 |
|
Mads Rasmussen
|
e77bddd0f2
|
add filtering of media types
|
2016-11-10 11:08:28 +01:00 |
|
Claus
|
cdb0c57416
|
readding the fix crgrieve did for treepicker.controller.js.
|
2016-11-09 11:48:32 +01:00 |
|
Claus
|
0749c6865d
|
Merge branch 'U4-4410' of git://github.com/crgrieve/Umbraco-CMS into crgrieve-U4-4410
|
2016-11-09 11:40:25 +01:00 |
|
Claus
|
d1ba7f31f8
|
Merge pull request #1566 from rpjengaard/dev-v7
Removed old options for linked targets and replaced with checkbox ins…
|
2016-11-09 09:18:27 +01:00 |
|
Claus
|
957096a70a
|
fixing links to be https.
|
2016-11-08 10:33:05 +01:00 |
|
Claus
|
a0c672eb91
|
Merge pull request #1568 from rasmusfjord/dev-v7
Translated dialogs to DK/EN
|
2016-11-08 08:44:01 +01:00 |
|
crgrieve
|
c0a2326a8d
|
Removing whitespace when parsing MNTP comma separated list.
|
2016-11-07 21:03:57 +00:00 |
|
crgrieve
|
e429f8611e
|
Remove all whitespace when parsing MNTP allowed doctypes.
|
2016-11-07 20:53:59 +00:00 |
|
Claus
|
fcca95787b
|
fixing backwards compatibility.
|
2016-11-07 13:05:17 +01:00 |
|
Ivar
|
8944870d4f
|
Renamed icon-globe---europe-africa to icon-globe-europe-africa
|
2016-11-07 13:05:15 +01:00 |
|
Stephan
|
c6e4e3b3ed
|
Merge origin/dev-v7-deploy into dev-v8-zbwip
|
2016-11-04 18:40:42 +01:00 |
|
ricardo abreu
|
7085f198a9
|
changed reloadPage function ($window to window)
|
2016-11-03 17:29:46 +00:00 |
|
ricardo abreu
|
4f211aaf48
|
added finish button so page only reloads after user input. also added localization for en/en_us
|
2016-11-03 17:13:27 +00:00 |
|
Sebastiaan Janssen
|
02840965d7
|
Merge pull request #1577 from Draga/U4-9055
U4-9055
|
2016-11-03 15:25:03 +01:00 |
|
Stefano Chiodino
|
c1ffefc6af
|
U4-9055 remove background-color on preview that was interfering with the website
style
|
2016-11-03 11:51:01 +00:00 |
|
Chris Houston
|
1b2d75ee52
|
Fixed the font being used in the Media Picker when a file has been selected.
|
2016-11-03 11:43:03 +00:00 |
|
Stephan
|
b26b415096
|
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
|
2016-11-03 10:31:44 +01:00 |
|
Mads Rasmussen
|
24402388b4
|
position the overlay to the right
|
2016-11-03 09:57:10 +01:00 |
|
Rasmus Fjord
|
71f3948de2
|
Translated copy dialog (relate to and include descendants) to dk
|
2016-11-02 21:23:02 +01:00 |
|
René Pjengaard Bank
|
a83739c269
|
Removed old options for linked targets and replaced with checkbox instead in linkpicker
|
2016-11-02 20:58:21 +01:00 |
|
Rasmus Fjord
|
e015e73abe
|
Translation of Moving item(media / content)
|
2016-11-02 20:55:15 +01:00 |
|
Mads Rasmussen
|
0426f1f17d
|
Changes from Gerard Konings + a couple of small fixes
|
2016-11-02 14:24:17 +01:00 |
|
Claus
|
5f615d30b2
|
Merge branch 'Email-validation-on-user-form' of git://github.com/Flaeng/Umbraco-CMS into Flaeng-Email-validation-on-user-form
|
2016-11-01 13:35:04 +01:00 |
|
Mads Rasmussen
|
f1d5ccb1e3
|
Fixes: U4-9039 No progress indication when uploading local package
|
2016-10-25 15:40:31 +02:00 |
|
Stephan
|
b7ef002da5
|
Cleanup SignalR
|
2016-10-19 15:35:25 +02:00 |
|
Sebastiaan Janssen
|
40b0a62cc3
|
Use int.MaxValue instead of 0
|
2016-10-19 14:58:56 +02:00 |
|
Shannon Deminick
|
3949b78c61
|
Merge pull request #1533 from callumbwhyte/U4-9042
U4-9042: Fixes backoffice members list view for custom membership providers
|
2016-10-19 14:48:44 +02:00 |
|
Mads Rasmussen
|
517147346e
|
Merge pull request #1534 from umbraco/temp-u4-9048
temp-U4-9048 - security when uploading files
|
2016-10-19 11:01:19 +02:00 |
|
Mads Rasmussen
|
e1e63d079f
|
add curly brackets to fix "grunt vs" task
|
2016-10-19 10:48:14 +02:00 |
|
Stephan
|
a5f1c3e564
|
Merge pull request #1530 from umbraco/temp-U4-8769
fixes: U4-8769 ImageCropper focal points randomly sets to 'null'
|
2016-10-19 09:01:55 +02:00 |
|
Sebastiaan Janssen
|
f4410891e4
|
Merge pull request #1459 from umbraco/temp-U4-8829-dashboards-from-remote-feed
Temp u4 8829 dashboards from remote feed
|
2016-10-18 15:50:15 +02:00 |
|