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 2 Packages Projects Releases Wiki Activity
9,384 Commits 94 Branches 33 Tags
9e49568d38ebf5f01f44fed6ed4a8210bd09e1ff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros 7758eb66f2 Fixing build 2015-06-30 14:47:22 -07:00
Sebastien Ros e7ceb732b1 Merge branch '1.9.x' into dev 2015-06-30 14:39:06 -07:00
Sebastien Ros 03a193b6c2 Fixing compilation 2015-06-30 14:38:12 -07:00
Sebastien Ros 1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sebastien Ros 6b0985a44e Merge branch 'master' into 1.9.x 2015-06-30 11:31:35 -07:00
Sebastien Ros 2c3973bfa0 Merge branch '1.9.1' 2015-06-30 11:30:37 -07:00
Sebastien Ros 760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Sebastien Ros 622b191ad5 Merge branch '1.9.x' into dev 2015-06-22 10:11:56 -07:00
Sebastien Ros 78fb58f016 Fixing localization gender 2015-06-22 10:10:58 -07:00
Sebastien Ros 8481768b58 Fixing culture list encoding 2015-06-22 10:06:34 -07:00
Sebastien Ros d6c452466c Merge branch '1.9.x' into dev 2015-06-19 12:57:49 -07:00
Sebastien Ros 51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
Sebastien Ros a4edee5474 Refactoring authentication validation 2015-06-19 11:33:44 -07:00
Sebastien Ros 0e47295b9f Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
 2015-06-19 11:33:12 -07:00
Sebastien Ros 2cd5af5193 Reverting IMembership usage in FormsAuthenticationService 2015-06-19 10:54:46 -07:00
Sebastien Ros 1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sebastien Ros 8d134ba0c5 Fixing html-encoding in WebSearch settings page 2015-06-18 16:47:38 -07:00
Sebastien Ros 745e88805c Fixing unresolvable IMembership dependency 
Fixes #5395
 2015-06-18 16:23:27 -07:00
Sebastien Ros db66ec941c Adding setting to set allowed media types 2015-06-18 16:03:50 -07:00
Sebastien Ros fb923f09e0 Merge branch '1.9.x' into dev 2015-06-18 14:20:08 -07:00
Sebastien Ros 9d5bc20666 Fixing unit tests 2015-06-18 14:19:44 -07:00
Sebastien Ros 95a073ff93 Ignoring auth cookies of logged out users 2015-06-18 14:06:01 -07:00
Sebastien Ros 6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros f276501923 Merge branch 'sebros/authcookie' into 1.9.x 2015-06-18 10:31:57 -07:00
Sebastien Ros 76408da930 #5315: Adding new settings to configure SSL cookies 
- Creating ISslSettingsProvider to define whether cookies can only be sent over SSL or not
- Implementing DefaultSslSettingsProvider based on Sites.config and web.config
making it configurable per tenant or for the whole site
- Implementing SecureSocketsLayerSettingsProvider in Orchard.SecureSocketsLayerSettingsProvider

Fixes 5315
 2015-06-17 18:06:47 -07:00
Sebastien Ros 20c5b494cd By default, html-encode translation parameters 
Also ensure that any existing parameter is not double-encoded by
removing .Text when used as a translation parameter.
 2015-06-16 16:50:45 -07:00
Sebastien Ros cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Sebastien Ros aa2e2cf1d0 Ignoring VS 2015 settings files 2015-06-16 11:16:35 -07:00
Sebastien Ros f2b8d68345 Merge branch '1.9.x' into dev 2015-05-14 10:26:10 -07:00
Sebastien Ros a35cc754a4 Merge branch 'master' of https://github.com/OrchardCMS/Orchard 2015-05-05 21:51:13 -07:00
Sebastien Ros 02b889a925 Merge branch '1.8.x' into 1.x 2015-05-05 21:42:52 -07:00
Sebastien Ros 2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sebastien Ros 72534d632d Adding more detailed message on failing tests 2015-04-29 15:15:43 -07:00
Sebastien Ros d941ea1509 Fixing failing culture based test on CI 2015-04-29 15:15:20 -07:00
Sebastien Ros 6ff69e27fd Fixing specflow tests 2015-04-29 13:04:19 -07:00
Sebastien Ros dd8d793a40 Adding unsafeUrl support in specflow tests 2015-04-29 13:04:08 -07:00
Sebastien Ros 6164729808 Fixing some specflow tests 2015-04-28 18:32:59 -07:00
Sebastien Ros ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros 8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Sebastien Ros cdd3722009 Forcing POST method on user moderation actions 2015-04-28 10:27:40 -07:00
Sebastien Ros 5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Sebastien Ros 29e373202a Refactoring PBKDF2 support 2015-01-22 18:36:26 -08:00
Sebastien Ros 93a13c5b9c Fixing compilation 2014-11-14 14:22:46 -08:00
Sebastien Ros 065e4fdf42 #21068: Fixing caching of value types 
Work Item: 21068
 2014-11-14 11:21:36 -08:00
Sebastien Ros b5f1b49723 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
 2014-10-23 20:53:47 -07:00
Sebastien Ros 04c710ab8d Merge branch 'feature/messagebus' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Caching/Services/DefaultCacheStorageProvider.cs
 2014-10-21 21:53:48 -07:00
Sebastien Ros 15740d1aad Optimizing keys count 2014-10-21 21:45:22 -07:00
Sebastien Ros b77f3a4c24 Fixing style 2014-10-21 21:32:47 -07:00
Sebastien Ros d1f0eda6f4 Fixing specflow test 2014-10-21 11:57:21 -07:00
Sebastien Ros e42ed577bf Prevent cache of pages with notifications 2014-10-10 12:46:56 -07:00
Sebastien Ros 2cdd3a3f1b Refactoring building scripts 2014-10-01 10:46:49 -07:00
Sebastien Ros d0c7091964 Adding Orchard.Redis module 2014-09-30 16:25:49 -07:00
Sebastien Ros 7a7528fa53 Creating Orchard.MessageBus 2014-09-30 10:26:17 -07:00
Sebastien Ros 6efbde45ac Finishing Redis cache provider 2014-09-29 17:47:32 -07:00
Sebastien Ros 64689433bc Fixing build scripts 
Calls the environment variables initialization script
in all cases.
 2014-09-29 15:45:58 -07:00
Sebastien Ros fc21ebc891 Fixing HTML encoding for feed tokens 2014-09-29 14:40:04 -07:00
Sebastien Ros d7a87893d7 Ignoring new VS14 CTP solution files 2014-09-29 12:03:10 -07:00
Sebastien Ros abed55164d Fixing performance issue in OutputCache 2014-09-26 12:54:40 -07:00
Sebastien Ros aafb915892 #20960: Fixing infinite loop when creating index tasks 
Work Item: 20960
 2014-09-26 12:21:14 -07:00
Sebastien Ros 9f84c29e39 #20959: Refactoring the Taxonomy service 
Work Item: 20959
 2014-09-25 11:34:19 -07:00
Sebastien Ros 8dfd9048b3 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
 2014-09-19 10:19:29 -07:00
Sebastien Ros 1824a738a9 Fixing IContentManagerSession usage 2014-09-19 10:15:28 -07:00
Sebastien Ros ba9a812d87 #20366: Fixing sort criteria order 
Work Item: 20366
 2014-09-18 16:02:50 -07:00
Sebastien Ros c590337df1 #20900: Creating Indexing tasks by batches 
Work Item: 20900
 2014-09-18 15:39:03 -07:00
Sebastien Ros a0e8fda8a2 Clearing IContentManagerSession in SessionLocator 2014-09-18 15:38:42 -07:00
Sebastien Ros 65abba550f #20634: Removing unallowed media chars in requests 
Work Item: 20634
 2014-09-18 15:09:53 -07:00
Sebastien Ros d5507f2661 #20953: Fixing potentially corrupted IndexTaskRecord 
Work Item: 20953
 2014-09-18 14:37:34 -07:00
Sebastien Ros 6665cff9d7 Fixing target framework in codegen template 2014-09-18 11:25:42 -07:00
Sebastien Ros 84993f3a4e Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Updater/AliasHolderUpdater.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
 2014-09-18 10:53:40 -07:00
Sebastien Ros e349349860 Bullet proofing TransactionManager.Cancel() 2014-09-18 10:45:31 -07:00
Sebastien Ros 21b5a1b2ac Fixing PublishLater/CreatedUtc behaviors 2014-09-16 17:03:04 -07:00
Sebastien Ros d89e36d78d Don't analyze username in index 2014-09-16 10:58:50 -07:00
Sebastien Ros 85159d8728 Fixing migration isolation and sessions lifetime 2014-09-15 17:28:14 -07:00
Sebastien Ros f2a7bc59da #20737: Removing ReliableSqlConnection as we moved to 4.5.1 
c.f. http://tudorturcu.wordpress.com/2013/11/11/ado-net-connection-resiliency/

Work Item: 20737
 2014-09-11 17:29:25 -07:00
Sebastien Ros 8c9f0692a1 #20902, 20177: Fixing profile performance 
Work Items: 20177, 20902
 2014-09-11 17:06:38 -07:00
Sebastien Ros 899b5950b3 #20487: Fixing comments email case sensitivity 
Work Item: 20487
 2014-09-11 16:50:56 -07:00
Sebastien Ros 5b294d3106 Fixing NRE during setup 2014-09-10 12:55:11 -07:00
Sebastien Ros 17c911d9a4 Merge branch '1.x' into feature/owin 
Conflicts:
	src/Orchard.Web/Web.config
 2014-09-03 09:29:20 -07:00
Sebastien Ros eccea78185 Applying the RequireNew pattern correctly 2014-08-28 13:58:44 -07:00
Sebastien Ros af0ea26f85 #20909: Optimizing some queries for performance 
Work Item: 20909
 2014-08-28 13:53:22 -07:00
Sebastien Ros 1b18621e00 Revert "Removing DefaultContentManagerSession" 
This reverts commit 262c825c26.
 2014-08-27 18:29:11 -07:00
Sebastien Ros 7b565c0517 #20905: Fixing unit tests 
Work Item: 20905
 2014-08-27 12:22:26 -07:00
Sebastien Ros 5f92beb0fb Improving indexing process 2014-08-27 12:22:23 -07:00
Sebastien Ros 262c825c26 Removing DefaultContentManagerSession 2014-08-27 12:09:18 -07:00
Sebastien Ros 3b5d4f4e85 Improving sessions management 2014-08-26 18:08:23 -07:00
Sebastien Ros 6637200b8a Hide culture filters if not more than 1 2014-08-26 15:08:37 -07:00
Sebastien Ros 09c2ae76e4 Adding content filters 2014-08-26 10:59:35 -07:00
Sebastien Ros ad9a10d9be #20868: Fixing term type duplication 
Work Item: 20868
 2014-08-25 15:24:19 -07:00
Sebastien Ros d7fded7ce9 #20848: Preventing unintentional empty slugs 
Work Items: 20848
 2014-08-25 15:20:43 -07:00
Sebastien Ros 293c58ef46 Adding binding redirect in unit tests for NHibernate 2014-08-22 17:06:28 -07:00
Sebastien Ros 52b0367cdf Defining default search fields in Search recipe 2014-08-22 16:46:31 -07:00
Sebastien Ros 0295764234 Updating NHibernate 4.0 
Using a local updated build of FluentNHibernate (still 1.4.0)
 2014-08-22 16:10:55 -07:00
Sebastien Ros e27090bbe7 Fixing drafts indexing 2014-08-22 11:24:02 -07:00
Sebastien Ros 284891dbaa #20781: Fixing template alternates support 
Work Item: 20781
 2014-08-21 17:53:40 -07:00
Sebastien Ros 4157896464 Refactoring menu permissions 2014-08-20 17:12:50 -07:00
Sebastien Ros 651175c499 Adding Securable metadata 2014-08-20 14:56:08 -07:00
Sebastien Ros 288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros b6a69beed0 Fixing specflow tests web.config 2014-08-20 11:29:41 -07:00
Sebastien Ros 508c198f9d Adding binding redirects on Autofac for unit tests 2014-08-15 15:27:58 -07:00