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
10,963 Commits 94 Branches 33 Tags
46c3fe6e79cf5da6d8ccf1abfcc0dc829d0e4d0f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sébastien Ros ba134bb868 Merge pull request #6660 from infofromca/warning 
Removing unused namespace usings
 2016-03-28 08:54:43 -07:00
Sébastien Ros 80f7661e43 Merge pull request #6661 from infofromca/fix6655 
Fixing some minified resource declarations

Fixes #6655
 2016-03-28 08:54:19 -07:00
Sébastien Ros c2ba016abe Merge pull request #6662 from infofromca/fix6656 
Removing duplicated Newtonsoft.Json declaration

Fixes #6656
 2016-03-28 08:53:30 -07:00
Sébastien Ros dd59417c4a Merge pull request #6658 from fredyfx/master 
Update README.md
 2016-03-25 13:25:04 -07:00
Sébastien Ros 7e11509182 Merge pull request #6611 from OrchardCMS/issue/4569 
Block requests to tenant while it's being restarted
 2016-03-25 10:49:31 -07:00
Sébastien Ros 987ea2b005 Merge pull request #6652 from OrchardCMS/feature/nocloud 
Removed Azure cloud service support.
 2016-03-25 10:40:03 -07:00
Sébastien Ros 5ecfcd861a Merge pull request #6646 from jtkech/patch-3 
[Fixes #6638] AliasHolderUpdater Refresh() is called 2 times
 2016-03-24 14:46:17 -07:00
Sébastien Ros 336cda8c34 Merge pull request #6604 from infofromca/timerNull 
Fixed Timer activity throws NRE

Fixes 6240
Fixes 6445
 2016-03-24 13:06:10 -07:00
Sébastien Ros f660c101cc Merge pull request #6605 from jtkech/patch-2 
Checkboxes issues in form elements editors

Fixes #6302
Fixes #6527
 2016-03-24 13:04:56 -07:00
Sébastien Ros 1f768c8768 Merge pull request #6609 from yw80/1.10.x 
Delete the CamelFriendly function call to DisplayName.
 2016-03-24 13:01:01 -07:00
Sébastien Ros 9736f12bcc Merge pull request #6614 from jtkech/patch-3 
[Fixes #6542] Content picker multi-selection issue
 2016-03-24 12:56:29 -07:00
Sébastien Ros d9e59eada6 Merge pull request #6617 from jtkech/patch-6 
Fixes Layout OnIndexing when using a snippet element
 2016-03-24 12:55:32 -07:00
Sébastien Ros b1f0c4bc36 Merge pull request #6634 from SzymonSel/dev 
[Fixes #6410] Moved Notifier extention change to dev branch
 2016-03-24 12:47:28 -07:00
Sébastien Ros 8f3eadb2ae Merge pull request #6637 from jbuck79/master 
Fixing jQuery-UI resources
 2016-03-24 12:46:27 -07:00
Sébastien Ros 740039d6ef Merge pull request #6601 from jtkech/patch-16 
Fixes 1.10.x compilation errors
 2016-03-17 16:42:13 -07:00
Sebastien Ros d39485abf2 Merge branch '1.9.x' into 1.10.x 
Conflicts:
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Rebracer.xml
 2016-03-17 10:18:46 -07:00
Sebastien Ros 24691e8fb8 Merge branch 'master' into dev 2016-03-17 10:05:46 -07:00
Sebastien Ros 6dcbbc2d93 Merge branch '1.10' 2016-03-17 09:53:07 -07:00
Sebastien Ros c4dd5a9e18 Updating Rebracer settings 2016-03-16 16:34:45 -07:00
Sebastien Ros 9a2c08d31e Fixing tenant load retry logic 2016-03-16 16:34:32 -07:00
Sébastien Ros dd326127ce Merge pull request #6582 from infofromca/typo 
Fixed a typo in DefaultOrchardShell.cs
 2016-03-14 15:32:35 -07:00
Sebastien Ros 3ea1b100d6 Excluding PDBs from deployment packages 2016-03-14 10:54:59 -07:00
Sebastien Ros d4c03997f6 [Fixes #6577] Exclude nuget packages from artifacts 2016-03-14 10:24:11 -07:00
Sébastien Ros 2273d38a7f Merge pull request #6568 from OrchardCMS/sebros/etag 
Adding correct ETag support
 2016-03-11 10:46:38 -08:00
Sebastien Ros 181db18355 Adding correct ETag support 2016-03-11 10:45:57 -08:00
Sébastien Ros 32bf5ed6c8 Merge pull request #6569 from jtkech/patch-6 
[Fixes #6544] NRE with containable part & Orchard.Lists
 2016-03-11 09:28:55 -08:00
Sébastien Ros 5e6a1549ad Merge pull request #6567 from jtkech/patch-5 
Fixing multi-tenancy functional tests
 2016-03-10 14:06:10 -08:00
Sébastien Ros 78bab529d2 Merge pull request #6566 from carlwoodhouse/1.9.x 
[Fixes #6523] Output cache route config
 2016-03-10 13:00:34 -08:00
Sebastien Ros 712ff2f487 Retrying on tenant startup 
Conflicts:
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard/Environment/DefaultOrchardHost.cs
 2016-03-09 15:39:57 -08:00
Sebastien Ros aae9f6270e [Fixes #6526] Unwrap TargetInvocationException when executing a ShapeAttributeBinding 2016-03-09 15:37:44 -08:00
Sébastien Ros 7fb4740e29 Merge pull request #6554 from jtkech/patch-20 
Fixing TextField default values
 2016-03-08 17:22:34 -08:00
Sebastien Ros 1def97d9ce [Fixes #6397] Allowing the default tenant settings to be edited 2016-03-08 14:47:46 -08:00
Sébastien Ros 2b12a43385 Merge pull request #6520 from infofromca/fieldduplicated 
[Fixes #6497] 1.10 Field names duplicated in dropdown list,
 2016-03-08 09:39:28 -08:00
Sébastien Ros 26e2fe9977 Merge pull request #6419 from rtpHarry/fix-6272 
[Fixes #6272] Improve wording for comparisons
 2016-03-03 12:41:25 -08:00
Sébastien Ros b1c606becc Merge pull request #6426 from rtpHarry/terms-mentions-taxonomies 
Fix wrong permission check and incorrect use of taxonomies phrase
 2016-03-03 12:37:27 -08:00
Sébastien Ros 8b8cf0b7e6 Merge pull request #6427 from rtpHarry/module-list-flexbox 
[Fixes #5907] Convert modules admin page to use css flexbox
 2016-03-03 12:36:36 -08:00
Sébastien Ros 7effab96a0 Merge pull request #6429 from rtpHarry/fix-5706 
[Fixes #5706] Force order on Properties, Validation, Bindings
 2016-03-03 12:33:38 -08:00
Sébastien Ros 1b8bcb8a4e Merge pull request #6500 from infofromca/tenantPrefixHost 
[Fixes #6495] Ensure a host or a url is defined for new tenants
 2016-03-03 12:26:53 -08:00
Sébastien Ros 074fa7974a Merge pull request #6525 from kumards/patch-2 
Incorrect data being returned for nonexistent primitive datatypes
 2016-03-03 12:15:50 -08:00
Sébastien Ros a91b06f1b5 Merge pull request #6528 from dcinzona/razor-view-engine 
[Fixes #6514] Update RazorViewEngineProvider.cs
 2016-03-03 12:12:34 -08:00
Sébastien Ros ad6a2b96e5 Merge pull request #6428 from rtpHarry/fix-packaging-display-glitch 
Fixing display glitch in admin packaging/gallery/modules
 2016-02-25 13:06:44 -08:00
Sébastien Ros 773882603f Merge pull request #6455 from dcinzona/patch-5 
[Fixes #6454] Sets the height of the media library correctly
 2016-02-25 13:03:25 -08:00
Sébastien Ros e8af37de95 Merge pull request #6469 from dcinzona/activities-css 
[Fixes #6467] Adding missing user activity css stub
 2016-02-25 12:29:03 -08:00
Sébastien Ros 614bf779f7 Merge pull request #6456 from ryanmagoon/dev 
[Fixes #6330] Using website url for core modules
 2016-02-23 14:47:29 -08:00
Sébastien Ros 1d0a8cfc78 Merge pull request #6441 from dcinzona/patch-2 
[Fixes #6440] Last Login and Created Date
 2016-02-23 12:41:34 -08:00
Sébastien Ros e9e5cd7b6f Merge pull request #6453 from dcinzona/FontAwesome4 
[Fixes #6451] Broken media library font awesome icons
 2016-02-23 12:28:58 -08:00
Sébastien Ros 72c9f0063b Merge pull request #6433 from rtpHarry/fix-5708 
[Fixes #5708] Display mandatory checkbox as required
 2016-02-19 15:50:52 -08:00
Sébastien Ros 47072f91ae Merge pull request #6425 from rtpHarry/widget-ruleengine-typo 
Fix typo in Orchard.Widgets.RuleEngine.cs
 2016-02-18 17:50:45 -08:00
Sébastien Ros 2749f2fa21 Merge pull request #6424 from rtpHarry/fix-taxonomy-permission 
fixes #6423 - wrong permission checked for delete
 2016-02-18 16:30:53 -08:00
Sébastien Ros 290f8e4594 Merge pull request #6420 from rtpHarry/fix-6400 
fixes #6400 - improve notifier messages for terms admin
 2016-02-18 16:05:49 -08:00
Sébastien Ros a1531da11b Merge pull request #6301 from Codinlab/fixes/5593 
Fixes #5593 : Allow disabling HtmlEncode on DynamicForms
 2016-02-18 12:55:31 -08:00
Sébastien Ros 16031ff348 Merge pull request #6335 from KexyBiscuit/patch-1 
Update "Deploy to Azure" button link
 2016-02-18 12:54:32 -08:00
Sébastien Ros 2f6f020d5d Merge pull request #6340 from jtkech/patch-6 
#6304: Prevents client cache from being disabled when public caching
 2016-02-18 12:51:43 -08:00