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
9,473 Commits 94 Branches 33 Tags
4cc48a380d4aab71c750ffbe950bf8ab85dcc0c6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros 899379e94a Merge pull request #6290 from armanforghani/patch-1 
Updated feed URL for Orchard gallery.
 2016-01-21 14:28:21 -08:00
Sébastien Ros 128376b662 Merge pull request #6296 from hannan-azam/1.9.x 
[Fixes #5689] Remove Alias when Item is Destroyed
 2016-01-21 12:03:37 -08:00
Sebastien Ros eb7574df0b [Fixes #6248] Prevent users from renaming their root folder 2016-01-15 08:55:32 -08:00
Sebastien Ros f17f2c3a93 [Fixes #6279] Adding confirmation for deleting taxonomies 2016-01-14 17:52:07 -08:00
Sébastien Ros 40db1e2a84 Merge pull request #6236 from jtkech/patch-3 
[Fixes #6192] Using Lazy IWorkContextStateProvider
 2016-01-14 12:15:24 -08:00
Sébastien Ros eb6f2f2752 Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums 
Added handling of nullable enums.
 2016-01-14 12:14:16 -08:00
Sebastien Ros e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Sebastien Ros a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
Sebastien Ros 112f13bf39 [Fixes #5969] Listing unlistable types in Contents/List 2016-01-13 13:03:46 -08:00
Sébastien Ros 2d42c74395 Merge pull request #6207 from Codinlab/features/2027 
[Fixes #2027] Add role rule  in Orchard.Widgets module
 2016-01-07 12:35:31 -08:00
Sébastien Ros 7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor 
Improving monitors usage for output cache
 2016-01-07 12:14:52 -08:00
Sébastien Ros 5dd54b6d55 Merge pull request #6125 from neTp9c/issue/6107 
[Fixes #6107] Fixing content permissions part
 2016-01-07 12:12:26 -08:00
Sébastien Ros 7ee227b73e Merge pull request #6114 from Codinlab/fixes/6113 
[Fixes #6113] Anchor custom link on homepage produces bad href
 2016-01-07 12:10:03 -08:00
Sébastien Ros da8898e946 Merge pull request #6178 from Jwheuvel/1.9.x 
All /lib dll files are now correctly taken into account when using git
 2015-12-17 12:32:38 -08:00
Sébastien Ros 2853197117 Merge pull request #6183 from mvarblow/issue-1978 
[Fixes #1978] Extending MarshalByRef object lease
 2015-12-17 12:32:04 -08:00
Sebastien Ros 117dd09f8c Improving monitors usage for output cache 2015-12-15 10:36:06 -08:00
Sébastien Ros fd7feeafaa Merge pull request #6102 from Codinlab/fixes/4622 
[Fixes #4622] ShapeTracingFactory Should Not be Activable w/o HttpContext
 2015-12-03 12:34:06 -08:00
Sébastien Ros 143cc5e41d Merge pull request #6119 from mvarblow/patch-3 
Add missing user activity
 2015-12-03 12:08:09 -08:00
Sébastien Ros bc820e6f9a Merge pull request #6124 from dcinzona/patch-3 
Removing duplicate fields from content parts fails
 2015-12-03 12:05:52 -08:00
Sébastien Ros 7d689710cc Merge pull request #6067 from MpDzik/pr/tokens-1.9.x 
Fix handling braces in tokens
 2015-11-23 08:56:36 -08:00
Sébastien Ros db1efab940 Merge pull request #6060 from mkinawy/issue/6052 
[Fixes #6052] Href should be no-op when applied on absolute url
 2015-11-20 14:17:12 -08:00
Sébastien Ros def163953c Merge pull request #6057 from mkinawy/issue/5978 
[Fixes #5978] Move Select button at the top in modal Media Library frame
 2015-11-20 12:09:13 -08:00
Sébastien Ros a02e6e8ab7 Merge pull request #6055 from MpDzik/pr/tokens-1.9.x 
Fix TextTokens - Format and TrimEnd
 2015-11-19 14:40:31 -08:00
Sébastien Ros f701482ff9 Merge pull request #6044 from DanielLackenbyBede/daniellackenbybede/bug/6043/listable_content 
[Fixes #6043] Filter out when no contentTypeNames provided
 2015-11-19 12:25:05 -08:00
Sébastien Ros bd00caf5be Merge pull request #6050 from Codinlab/fixes/6023 
Fixes #6023 : Ellipsize can spilt an HTML encoded character
 2015-11-19 12:19:11 -08:00
Sébastien Ros 219f29cd20 Merge pull request #5972 from rtpHarry/patch-4 
Revamp readme.md and update version to 1.9.2
 2015-10-22 12:20:48 -07:00
Sébastien Ros 51003bf582 Merge pull request #5967 from carlwoodhouse/redis-patch 
[Fixes #5958] Improving Redis extensions use of keys
 2015-10-22 12:19:26 -07:00
Sebastien Ros 0d5cff66a9 Fixing Azure Portal integration 2015-10-21 14:41:41 -07:00
Sébastien Ros 4574a9fb0b Merge pull request #5915 from rtpHarry/patch-1 
[Fixes #5912] Improve warning css in multi-tenant edit
 2015-10-19 16:35:44 -07:00
Sebastien Ros 101d61b808 Merge branch 'master' into 1.9.x 2015-10-15 15:00:14 -07:00
Sébastien Ros ff97d1e975 Merge pull request #5918 from rtpHarry/patch-3 
[Fixes #5908] Triple columns don't fit on small screens
 2015-10-15 12:22:16 -07:00
Sébastien Ros e26fee3d6c Merge pull request #5844 from escofieldnaxos/feature/Content-Picker-MultiSelect 
Enhancement to allow multi-select for the content picker
 2015-10-15 12:09:10 -07:00
Sebastien Ros ec0ea5e321 Updating ManageOwnMedia defaults 
Fixes #5894
 2015-10-15 11:41:07 -07:00
Sébastien Ros dd9d67fe48 Merge pull request #5952 from dcinzona/patch-2 
Fixes #5896 - AzureFileStorageProvider
 2015-10-15 11:36:49 -07:00
Sébastien Ros 9105187f78 Merge pull request #5950 from mattcowen/1.9.2 
Fix for orchard issue #5869
 2015-10-15 11:19:12 -07:00
Sébastien Ros 52c6debc97 Merge pull request #5937 from dcinzona/patch-1 
Fixes for #5936 #5938 #5941 and #5891
 2015-10-14 09:11:08 -07:00
Sébastien Ros f3be4fa2c7 Merge pull request #5946 from dcinzona/azure.storage-5.0.2.0 
[Fixes #5935] Updates Azure.Storage to 5.0.2.0
 2015-10-14 09:08:56 -07:00
Sébastien Ros 1e87eee2e4 Merge pull request #5852 from Codinlab/issue/5737 
[Fixes #5737] ChangeListView throws NRE on unpublished Lists
 2015-10-08 12:27:02 -07:00
Sébastien Ros 53244d702c Merge pull request #5851 from mjy78/issue/5125 
[Fixes #5125] Ensure the modified taxonomy items are not lost if a model validation…
 2015-10-08 12:26:25 -07:00
Sébastien Ros 07cc3a6bad Merge pull request #5804 from mvarblow/patch-2 
Prevent no-op tasks for taxonomy field updates.
 2015-10-08 12:19:11 -07:00
Sébastien Ros 6f4762a30c Merge pull request #5785 from mjy78/issue/21244 
[Fixes #5073] Display warning when insecure custom forms are created
 2015-10-08 12:12:53 -07:00
Sébastien Ros ce3179307d Merge pull request #5784 from mjy78/issue/20514 
[Fixes #4343] Remove id from custom form returnUrl hidden field
 2015-10-08 12:11:06 -07:00
Sebastien Ros 9c88c7fcd1 Fixing draft indexation 2015-10-02 15:44:35 +02:00
Sebastien Ros 62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Sébastien Ros 8ed39703e5 Merge pull request #5864 from Garpo001/patch-1 
Serialization error is thrown when creating layout or page in the dashboard when using Layouts in a Web Farm.
 2015-09-28 09:38:04 -07:00
Sebastien Ros 5b0efdba58 Excluding long running tests from Test step 2015-09-25 16:00:10 -07:00
Sebastien Ros 8865041a8b [Fixes #5820] Fixing default layout support 
The default layout was just set in the text editor, and would not be
taken into account if the Part settings were not saved. A user would
then think the default template was there but actually not.

The change here is to leave the text editor empty, and if the setting is
empty load the default from the service. To actually have an empty template
a user needs to provide an empty object.
 2015-09-25 15:07:56 -07:00
Sebastien Ros d9e833ba58 [Fixes #5112] Removing Layout dependency on TinyMce 2015-09-25 15:05:33 -07:00
Sebastien Ros 9137414305 [Fixes #5819] Fixing column element default size 2015-09-25 15:04:06 -07:00
Sebastien Ros eb9bfa0d29 Merge branch 'feature/webpi' into 1.9.2 2015-09-24 09:10:44 -07:00
Sebastien Ros 1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
Sebastien Ros 7a289ca1ad [Fixes #5846] Saving settings would reset Markdown part settings 2015-09-23 17:12:59 -07:00
Sebastien Ros b7a0b007e4 [Fixes #5835] Restoring cache invalidation propagation 2015-09-23 16:14:19 -07:00
Sebastien Ros f2fb1d520d Preventing concurrency when monitoring extensions 2015-09-23 10:17:17 -07:00
Sebastien Ros 248cc7ecde Updating webpi package files 2015-09-21 15:29:31 -07:00
Sébastien Ros bb41f1f559 Merge pull request #5831 from OrchardCMS/feature/ownmedia 
Implementing own media management
 2015-09-21 15:08:19 -07:00
Sébastien Ros 5903f75665 Merge pull request #5828 from OrchardCMS/feature/layoutpermission 
Adding ManageLayout permission
 2015-09-21 15:07:57 -07:00
Sébastien Ros 46182edc5d Merge pull request #5827 from rtpHarry/1.9.x 
[Fixes #5826] Restore placements confirmation message fix
 2015-09-21 14:36:44 -07:00
Sebastien Ros accd4196dc Implementing own media management 2015-09-21 14:09:37 -07:00
Sebastien Ros d3d85f3519 Adding ManageLayout permission 2015-09-21 14:04:37 -07:00
Sébastien Ros 6e90f704f8 Merge pull request #5833 from mjy78/issue/5829 
[Fixes #5829] Cannot delete spam comment when viewing comment details
 2015-09-21 13:02:32 -07:00
Sébastien Ros 497b782a6a Merge pull request #5837 from mjy78/issue/5836 
#5836 Fix null ref exception in CommentPartDriver
 2015-09-21 12:58:01 -07:00
Sebastien Ros bc935f18b3 Fixing unit tests 2015-09-21 12:45:57 -07:00
Sebastien Ros 12a51ea7af [Fixes #5751, #5794] Removing Edit inline 2015-09-21 12:08:19 -07:00
Sebastien Ros f0b1639143 [Fixes #5616] Revert "Using master content item to create translations" 
This reverts commit fa09e2e83a.
 2015-09-21 11:27:46 -07:00
Sebastien Ros 4214329a1f Prevent unnecessary db calls for containers 2015-09-16 17:52:33 -07:00
Sebastien Ros 921b2472f1 Adding filter for own content 2015-09-16 17:52:27 -07:00
Sebastien Ros 9e9e19c439 Add setting to hide Container editor 2015-09-16 17:52:13 -07:00
Sebastien Ros f3595881fe Hide taxonomy link if permission is not granted 2015-09-16 17:52:04 -07:00
Sebastien Ros ba36eae848 Prevent MediaLibrary popup without permissions 
If the user doesn't have ManageMedia permissions,
the markdown editor will use a specific image editor.
 2015-09-16 17:51:50 -07:00
Sebastien Ros 0bf76dc7ac Implementing a positioned wrapper for text elements 
When adding a text directly to a zone, the position will now
be taken into account. This is also useful for the Capture feature.

Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-16 17:51:23 -07:00
Sébastien Ros f9ef297777 Merge pull request #5780 from mjy78/issue/5779 
[Fixes #5779] Query and Taxonomy Elements should include value attribute for default option
 2015-09-11 15:07:51 -07:00
Sébastien Ros 801b8998db Merge pull request #5783 from mjy78/issue/20377 
[Fixes #4206] Ensure comment tokens available to anti-spam module.
 2015-09-11 15:03:45 -07:00
Sébastien Ros 47133604c3 Merge pull request #5676 from RoyalVeterinaryCollege/3404 
[Fixes #3404] Added Required attribute to Enumeration and Numeric Fields
 2015-09-10 12:24:28 -07:00
Sebastien Ros 80b93e412a Supporting custom display type for search results 2015-09-09 15:44:53 -07:00
Sebastien Ros e839f84537 Fixing unit test 
The ThemeExtensionFolder stub should have been used
 2015-09-09 14:53:16 -07:00
Sebastien Ros a548e47f90 [Fixes #5283] Adding some documentation for ResourceDefinition.SetVersion 
It has to be a vallid SermVer format.
 2015-09-09 14:52:41 -07:00
Sebastien Ros 89e8658f49 Improving protected zones in settings UI 
Protecting MaxPagedCount
Protecting BaseUrl
Unhiding BaseUrl and SuperUser so that users can see what the values are
 2015-09-09 11:27:18 -07:00
Sebastien Ros 6d255f24ab Fixing exception when the Default layer doesn't exist 2015-09-09 09:25:01 -07:00
Sebastien Ros e8f0ba6ec7 Fixing RecipeManagerTests 2015-09-08 17:12:44 -07:00
Sebastien Ros 60798f9346 Fixing TokenManagerTests 2015-09-08 17:09:53 -07:00
Sebastien Ros c83f5d88cb Supporting lazy cache manager resolution 2015-09-08 17:04:45 -07:00
Sebastien Ros 2f2134412e [Fixes #5492] Adding JavaScriptEncode token 2015-09-08 16:13:55 -07:00
Sébastien Ros 1e6b6bb24f Merge pull request #5568 from Codinlab/Tokens 
Token chaining improvements
 2015-09-08 16:08:17 -07:00
Sébastien Ros 16de29dabd Merge pull request #5652 from Codinlab/issues/5614 
Fixes #5614 : ContentPickerField and LayoutPart issue
 2015-09-08 15:57:38 -07:00
Sebastien Ros 691809cd85 [Fixes #5733] Update default Layout state settings 2015-09-08 15:40:28 -07:00
Sébastien Ros ce1df8d794 Merge pull request #5677 from dcinzona/Gulpfile-watch-assets.json 
Enables gulp watch of Assets.json
 2015-09-08 11:37:54 -07:00
Sébastien Ros 74be36d8a3 Merge pull request #5763 from phillipsj/1.9.x 
Updating DynamicForms Module.txt
 2015-09-08 11:11:12 -07:00
Sebastien Ros c4592aa65f Selecting the layer "Default" on the widgets start screen 
Fixes a specflow bug which expect "Default" to be the default
selected layer. Appeared since layers are ordered alphabetically.
 2015-09-08 09:27:36 -07:00
Sebastien Ros 9bac35b3f1 Removing duplicated using 2015-09-08 09:12:26 -07:00
Sébastien Ros 0f757655b8 Merge pull request #5736 from Codinlab/issue/5735 
Fixes #5735 : ContentType name encoding in Lists
 2015-09-04 16:35:03 -07:00
Sebastien Ros 39fb266221 Skipping DateTime tests until the right solution is found 
c.f. #5702
 2015-09-04 15:59:24 -07:00
Sebastien Ros 9b91b1b260 Removing unnecessary resolution 2015-09-04 13:20:08 -07:00
Sebastien Ros c2194381f8 Removing unused usings 2015-09-04 12:12:13 -07:00
Sebastien Ros c860b89e23 Removed erroneous HttpContextBase registrations 2015-09-04 12:12:02 -07:00
Sebastien Ros 04f29ba70c Revert "Cherry picked ce630f980c7a79ae17b36598f3834c4ffd523739." 
This reverts commit aba53e122d.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 10:59:31 -07:00
Sébastien Ros e118695ea7 Merge pull request #5738 from harmony7/4852-orchardshellevents-workcontext 
#4852: Wrap IOrchardShellEvents in a work context
 2015-09-04 10:09:36 -07:00
Sébastien Ros f3d08d61c4 Merge pull request #5741 from mvarblow/patch-2 
Mark the npm repository as private
 2015-09-03 14:24:05 -07:00
Sébastien Ros 22697edeec Merge pull request #5742 from mvarblow/patch-3 
Suppressed warning CS0436 in Orchard.Framework
 2015-09-03 14:23:26 -07:00
Sebastien Ros a0d61c67b8 Refactoring Import methods 2015-08-28 17:06:34 -07:00