lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,827 Commits 94 Branches 33 Tags
3cdf4e9a1b06edb17d82808e4eb91dedf17be1f8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros 5bb6c8b27e Create SECURITY.md 2022-08-04 10:03:47 -07:00
Sébastien Ros 27e6401965 Add a fake transparent background for image thumbnails (#8329) 2020-03-05 14:35:11 -08:00
Sébastien Ros fb220a60a3 Add button manage approve disable in edit user (#8321) 2020-03-05 12:06:11 -08:00
Sébastien Ros bb8348626b Using Markdig (#8299) 
Removes usage of regular expressions to convert markdown.
 2019-12-12 12:07:44 -08:00
Sébastien Ros bb6c8ed624 Fixing NRE in DefaultTagCache (#8135) 2018-11-06 09:17:22 -08:00
Sébastien Ros e3f010d62b Remove usage of BinaryFormatter for file cache (#8005) 2018-03-29 14:38:54 -07:00
Sébastien Ros 1908fff595 Fixing the FileSystemOutputCache feature (#7913) 
Fixes #8004 #6115 
- Caching keys for filenames to prevent too long paths
- Separating metadata from content storage to optimize some scenarios
 2018-03-29 09:53:56 -07:00
Sebastien Ros bca5aee822 Merge branch 'refs/heads/1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.min.js
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
 2017-04-25 09:04:16 -07:00
Sebastien Ros 683a37800c Merge branch 'refs/heads/master' into 1.10.x 2017-04-25 08:59:08 -07:00
Sebastien Ros 6e05649c51 Fixing specflow tests 2017-04-25 08:32:59 -07:00
Sebastien Ros cd9bccef96 Supportin VS2017 in build.cmd 
Fixes #7657
 2017-04-24 11:13:42 -07:00
Sebastien Ros 23e16a2f51 Merge branch 'refs/heads/1.10.x' into dev 2017-04-13 12:43:17 -07:00
Sebastien Ros 358c57464e Merge branch 'refs/heads/1.10.x' into 1.10.2 2017-04-13 12:42:46 -07:00
Sebastien Ros f146acf529 Merge branch 'refs/heads/1.10.x' into dev 2017-04-13 12:40:54 -07:00
Sebastien Ros 5d892feceb Merge branch 'refs/heads/1.10.x' into 1.10.2 2017-04-13 12:39:38 -07:00
Sebastien Ros d384110253 Logging errors during Media Upload 2017-04-13 12:12:14 -07:00
Sebastien Ros 8002d34d65 Merge branch '1.10.x' into dev 2017-04-11 16:49:07 -07:00
Sebastien Ros d17930395c Merge branch '1.10.x' into 1.10.2 2017-04-11 16:48:35 -07:00
Sebastien Ros 5eef9c654c Fixing NRE on upgrade 2017-04-11 16:48:06 -07:00
Sebastien Ros 54575ab513 Merge branch 'refs/heads/1.10.x' into 1.10.2 2017-04-11 10:11:10 -07:00
Sebastien Ros 183b9cc5ec Merge branch 'refs/heads/1.10.x' into dev 2017-04-11 10:09:35 -07:00
Sébastien Ros 1870e3eb04 Fixing Author tokenization for RssPart 
Fixes #7629
 2017-04-06 12:06:57 -07:00
Sebastien Ros 51f1499c86 Improving failure message for specflow 2017-04-04 16:56:42 -07:00
Sebastien Ros 81e9a60661 Fixing specflow tests 2017-04-04 16:41:06 -07:00
Sebastien Ros 34f8e3d9ac Updating Specflow web.config to match the official one 2017-04-04 13:50:56 -07:00
Sebastien Ros d51ea7585c Reverting C#5 properties on Glimpse 2017-04-04 13:31:30 -07:00
Sebastien Ros 90bec15c68 Adding binding redirect for owin 2017-04-04 13:22:14 -07:00
Sébastien Ros ac4f7c05c9 Update README.md 2017-04-04 11:43:44 -07:00
Sebastien Ros 3b21f476b7 Trying to fix specflow by adding owin packages 2017-04-03 16:43:45 -07:00
Sebastien Ros 4a6d8a6530 Improving cache concurrency unit tests 2017-04-03 12:46:50 -07:00
Sebastien Ros 98e0b43c26 Updating version number 2017-04-03 12:21:56 -07:00
Sebastien Ros 22a7d6d44d Fixing Owin version in specflow project 
Fixes 7524
 2017-04-03 12:03:47 -07:00
Sebastien Ros eee341696d Merge branch '1.10.2' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
#	src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
#	src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
 2017-04-03 11:54:43 -07:00
Sebastien Ros 17c7c77e3c Merge remote-tracking branch 'origin/1.10.x' into 1.10.2 2017-04-03 11:16:23 -07:00
Sebastien Ros a23e9ea764 Merge branch '1.10.x' into 1.10.2 2017-03-27 15:39:59 -07:00
Sebastien Ros e41e9079d3 Fixing content file marker for tests 2017-03-27 13:21:35 -07:00
Sebastien Ros 149346ce68 Merge remote-tracking branch 'refs/remotes/origin/1.10.x' into 1.10.2 2017-01-24 16:37:22 -08:00
Sebastien Ros 9b6c2315de Fixing unit tests 2017-01-24 11:40:20 -08:00
Sebastien Ros 68c10bce60 Improving IsLocalUrl 2017-01-24 08:50:12 -08:00
Sebastien Ros 8bd74c947e Fixing log typo 
Fixes #7520
 2017-01-19 12:37:03 -08:00
Sebastien Ros ec22a1150d Merge branch 'refs/heads/1.10.2' into dev 2017-01-19 12:05:27 -08:00
Sebastien Ros b7dd2f6055 Merge branch 'refs/heads/1.10.x' into 1.10.2 2017-01-19 12:05:05 -08:00
Sebastien Ros c679547a39 Merge branch '1.10.2' into dev 2017-01-12 14:40:50 -08:00
Sebastien Ros acb93df3ec Merge branch '1.10.x' into 1.10.2 2017-01-12 14:40:22 -08:00
Sebastien Ros 3ac09df891 Fixing Gallery search 
Fixes #7497
 2017-01-12 12:38:33 -08:00
Sebastien Ros 406016d12c Fixing membership unit tests 2017-01-03 16:35:40 -08:00
Sebastien Ros e49faa7cff Merge branch '1.10.x' into dev 2017-01-03 15:38:58 -08:00
Sebastien Ros 4f57ecb487 Fixing unit test 2017-01-03 13:45:09 -08:00
Sebastien Ros 7a9f86dac6 Adding vsvars32.bat is vsvarall cannot be found 2017-01-03 13:42:27 -08:00
Sebastien Ros 6df57dd098 Fixing settings group info matching 
Fixes #7371
 2017-01-03 13:24:08 -08:00
Sebastien Ros cccb358ce1 Fixing QueryHints.Empty mutable usage 
Fixes #7358
 2017-01-03 13:08:32 -08:00
Sebastien Ros 804255cc09 Merge branch '1.10.x' into dev 2017-01-03 13:03:36 -08:00
Sebastien Ros d0b65cb60b [Fixes #7427] Fixing Blog Post permission 
The SummaryAdmin was not using the dedicated permissions.
The default content handler can convert to the owner variation before the blogpost handler.

Fixes #7427
 2016-12-07 12:15:24 -08:00
Sebastien Ros 5c430ef7d1 Merge branch 'refs/heads/1.10.x' into dev 
# Conflicts:
#	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
 2016-10-17 14:40:54 -07:00
Sebastien Ros 59a9f0bf03 Fixing SQL exception during automatic migrations in PostgreSql 
Fixes #6783
Fixes #7323
 2016-10-17 14:34:37 -07:00
Sebastien Ros 3672c96951 Merge branch '1.10.x' into dev 2016-10-06 13:16:03 -07:00
Sebastien Ros a6645abc8f Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Modules/Orchard.Azure/Services/Caching/Output/AzureOutputCacheStorageProvider.cs
 2016-09-22 12:15:32 -07:00
Sebastien Ros a8d4440c2e Encoding error messages for custom forms widgets. 2016-06-14 11:06:33 -07:00
Sebastien Ros eb71d1ced7 Merge branch '1.10.x' into dev 2016-05-11 12:25:48 -07:00
Sebastien Ros 5ef753ef2d Merge branch 'master' into 1.10.x 2016-05-11 12:25:15 -07:00
Sebastien Ros a629ce0f4b Merge tag '1.10.1' 2016-05-11 12:23:08 -07:00
Sebastien Ros c8a4def111 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Package.json
 2016-05-05 17:45:57 -07:00
Sebastien Ros 280de4e6fc Merge remote-tracking branch 'origin/1.10.1' into 1.10.x 2016-05-05 17:39:32 -07:00
Sebastien Ros d21538eb54 Forcing Nuget restore on Kudu 2016-05-05 13:05:35 -07:00
Sebastien Ros 06778eb584 Setting correct nuget path for Kudu 
Fixes #6810
 2016-05-05 12:46:48 -07:00
Sebastien Ros 951962f6d9 Fixing dynamic compilation issues 
Fixes #6858
 2016-05-05 12:40:15 -07:00
Sebastien Ros 2b3451cd13 Updating version numbers to 1.10.1 2016-04-26 10:12:18 -07:00
Sebastien Ros ebd731e70a Merge branch '1.10.x' into dev 2016-04-21 10:26:06 -07:00
Sebastien Ros 8ebf58d27d Fixing multi-submission differently 
Take into account dynamic forms
Client validation
 2016-04-15 13:03:47 -07:00
Sebastien Ros 4a9c4c5019 Fixing Orchard.Web.csproj 2016-04-12 12:16:22 -07:00
Sebastien Ros fe316f480c Removing references to deprecated modules 
Fixes #6749
 2016-04-12 10:24:11 -07:00
Sebastien Ros 6442380bf0 Excluding PDB files from deployments 
Fixes #6711
 2016-04-11 16:30:38 -07:00
Sebastien Ros a4f2e040b2 Merge branch '1.10.x' into dev 2016-04-11 16:09:28 -07:00
Sebastien Ros 3a84a0b79c Merge branch '1.10.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
 2016-04-11 15:21:47 -07:00
Sébastien Ros 9fbe1138d5 Merge pull request #6699 from armanforghani/patch-2 
Adding Priority to Orchard.Resources manifest.

Fixes #6674
 2016-04-01 11:42:56 -07:00
Sebastien Ros e888b07924 Merge branch '1.10.x' into dev 2016-03-31 16:38:16 -07:00
Sebastien Ros 4d7fd2f5ba Fixing taxonomy autocomplete editor 
Fixes #6659
 2016-03-31 16:31:53 -07:00
Sebastien Ros fbb3047195 Fixing Url.HttpRouteUrl usage 
Fixes #4766
 2016-03-31 16:31:05 -07:00
Sebastien Ros 19b8a853ff Merge branch '1.10.x' into dev 
Conflicts:
	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
 2016-03-31 15:33:14 -07:00
Sebastien Ros dfd045005b Reverting dependency on Common 
Fixes #6692
 2016-03-31 15:11:28 -07:00
Sebastien Ros 11454fade9 Ignoring Azure Tests for now 2016-03-31 13:32:21 -07:00
Sébastien Ros a59c1a07c9 Merge pull request #6615 from jtkech/patch-5 
Fixing multi-select for Orchard.Lists

Fixes #6542
 2016-03-31 12:50:54 -07:00
Sébastien Ros 0728793e0e Merge pull request #6616 from jtkech/text-field 
Removing required attribute for default value on TextField
 2016-03-31 12:49:27 -07:00
Sébastien Ros a624080fb2 Merge pull request #6677 from Skrypt/issue/#6512 
Fixing multiple Media Library:clone

Fixes #6512
 2016-03-31 12:45:57 -07:00
Sébastien Ros b36c34bbf4 Merge pull request #6680 from jtkech/patch-6 
Removing dependency on menu.aliases-admin.css
 2016-03-31 12:31:40 -07:00
Sebastien Ros 8f2e9caa8f Merge branch '1.10.x' into dev 2016-03-31 11:45:38 -07:00
Sebastien Ros 2bfd3448a2 Using Nuget version of NUnit 2016-03-31 11:43:10 -07:00
Sebastien Ros 01500bc7a5 Adding missing dependency to Orchard.Resources 
Fixes #6674
 2016-03-30 16:52:02 -07:00
Sebastien Ros d7682123a7 Fixing versions of manifests 2016-03-30 16:50:31 -07:00
Sebastien Ros dad2714852 Fixing exception during command line setup with snippets 
Fixes #6597
 2016-03-30 16:13:22 -07:00
Sebastien Ros 3568db209c Moving Shape snippet to Content group 
Fixes #6624
 2016-03-30 15:55:29 -07:00
Sebastien Ros 2ee299eb6c Adding missing dependency in Orchard.Layouts 
Fixes #6654
 2016-03-30 15:42:16 -07:00
Sébastien Ros 5af991e516 Merge pull request #6640 from Codinlab/issue/6639 
Azure Media Storage doesn't recognize its own URLs

Fixes #6639
 2016-03-30 15:29:41 -07:00
Sébastien Ros 564327ed58 Merge pull request #6645 from Codinlab/issue/6644 
Codegen don't creates Themes/Modules in right Solution directory

Fixes #6644
 2016-03-30 15:12:17 -07:00
Sebastien Ros 7e45c5a339 Fixing references to deprecated modules 
Fixes #6622
 2016-03-30 14:39:31 -07:00
Sebastien Ros db780bb2ba Using Markdown Nuget package 
Fixes #6380
 2016-03-30 14:18:53 -07:00
Sébastien Ros 07b6a44426 Merge pull request #6618 from jtkech/num-field 
Removing required attribute if default value is set (NumericField)
 2016-03-29 08:54:40 -07:00
Sébastien Ros bdde332b49 Merge pull request #6619 from jtkech/other-fields 
Removing required attribute if default value set (input + link + date fields)

Fixes #6550
 2016-03-28 18:32:14 -07:00
Sébastien Ros bfcc304a26 Merge pull request #6626 from jtkech/more-fields 
Removing required attribute for default enum and boolean fields

Fixes #6550
 2016-03-28 17:17:55 -07:00
Sebastien Ros 2a545d992a Merge branch '1.10.x' into dev 
Conflicts:
	ClickToBuildAzurePackage.cmd
	Orchard.proj
	src/Orchard.Azure/Orchard.Azure.sln
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
 2016-03-28 09:19:21 -07:00