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,334 Commits 94 Branches 33 Tags
ec0ea5e3215d550601ade8f2d2dc74d7a46c18a4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastien Ros b52a846c5f #5664: Lucene should page operations 
Fixes #5664
 2015-08-27 15:31:39 -07:00
Sébastien Ros 9a8b64393e Merge pull request #5671 from RoyalVeterinaryCollege/4352 
#4352: orphaned awaitingactivities

Fixes #4352
 2015-08-27 12:39:24 -07:00
Sebastien Ros 4b59569013 #5490 Fixing HttpRequestBase DependenciesShouldBeUpgradedFirst 
Fixes #5490
 2015-08-26 17:19:04 -07:00
Sébastien Ros a603c7e07a Merge pull request #5678 from jchenga/issues/5618 
#5618 taxonomy in autoroute needs to be saved twice

Fixes #5618
 2015-08-26 16:48:13 -07:00
Sebastien Ros 96f6cb36fd Reverting session factory changes 2015-08-26 16:40:02 -07:00
Sébastien Ros 3d63c6d333 Merge pull request #5544 from yw80/patch-2 
Remove the blank line at the bottom of every page after the default theme rendering.
 2015-08-26 16:11:35 -07:00
Sébastien Ros 4cdb081c9d Merge pull request #5543 from yw80/patch-1 
Correct CSS class name of MediaLibraryPickerField field
 2015-08-26 16:05:16 -07:00
Sébastien Ros 9ed6b4261d Merge pull request #5542 from jtkech/patch-2 
##5369: Allows simple properties null checking on a dynamic ContentItem or ContentPart

Fixes #5369
 2015-08-26 16:04:09 -07:00
Sébastien Ros a0e78f2eb0 Merge pull request #5571 from jersiovic/patch-6 
Fixed #5140 Recipe from Migrations didn't work
 2015-08-26 15:59:03 -07:00
Sébastien Ros af4e41a717 Merge pull request #5667 from qt1/IBN-Labs/ItemEditLink_htmlAttributes 
Support htmlAttributes in ItemEditLink

Fixes #5666
 2015-08-26 15:54:13 -07:00
Sebastien Ros 7f91e787de Adding debug log when content item is imported 2015-08-26 14:44:56 -07:00
Sebastien Ros 6810cf473f Updating indexing tasks when content is imported or restored 2015-08-26 14:44:50 -07:00
Sebastien Ros 79a0ae86e8 Create index command should not delete existing index 2015-08-26 14:44:40 -07:00
Sebastien Ros 4cec35daf8 Disposing the session when a transaction is rolled back 2015-08-26 14:44:32 -07:00
Sebastien Ros 8d4cb98d59 Adding missing content handler Restore events 2015-08-26 14:44:25 -07:00
Sebastien Ros e6424e2589 Removing empty folder 2015-08-26 14:44:15 -07:00
Sebastien Ros dcc7783f12 Adding storage filter events for Import/Export 2015-08-26 09:47:39 -07:00
Sebastien Ros d35ebe04e7 Adding User identity resolver 
To improve import step for Users
 2015-08-26 09:47:26 -07:00
Sebastien Ros c80f2d4baa Fixing Search settings export 2015-08-26 09:46:46 -07:00
Sébastien Ros 9a4e0c1741 Merge pull request #5694 from dcinzona/patch-2 
Fixes #5693 - DisableTheme Part breaks admin theme
 2015-08-25 09:56:31 -07:00
Sebastien Ros 9e95f96195 Supporting .. syntax in watched assets 2015-08-21 16:01:44 -07:00
Sébastien Ros 5b42c707b1 Merge pull request #5627 from Codinlab/fixes/ContentTypeEncoding 
Fixes 5591 : ContentType's name encoding
 2015-08-20 13:03:28 -07:00
Sébastien Ros 83a35f89cf Merge pull request #5644 from mvarblow/patch-1 
Allow for packaging a debug build
 2015-08-20 12:22:00 -07:00
Sébastien Ros b206a656e8 Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x 
Ordered layers alphabetically in Widget admin UI.
 2015-08-06 12:41:19 -07:00
Sébastien Ros 32669d347a Merge pull request #5610 from psenechal/1.9.x 
Update Module.txt
 2015-08-06 12:40:44 -07:00
Sébastien Ros 5bdfb6e98a Merge pull request #5476 from dcinzona/patch-1 
Added mimetype declarations to root web.config
 2015-08-06 12:40:01 -07:00
Sebastien Ros 41bd9ce9bc Adding a file system backed output cache provider 2015-08-05 16:59:34 -07:00
Sebastien Ros e346170f24 Adding some documentation for IAppDataFolder 2015-08-05 14:21:22 -07:00
Sebastien Ros 430c3de460 Compressing output cache content in Redis 2015-08-04 17:28:49 -07:00
Sebastien Ros f25758cc05 Refactoring connection multiplexer usage 
For consistency with other services using Redis
 2015-08-04 10:30:23 -07:00
Sebastien Ros bb6a44634d Handling output cache provider exceptions 2015-08-04 10:29:46 -07:00
Sebastien Ros 8a08680a74 Localizing RedisTagCache keys 2015-08-03 14:37:25 -07:00
Sebastien Ros 25670b9620 Fixing pager text encoding 
Fixes #5359
 2015-07-31 17:00:31 -07:00
Sebastien Ros fa09e2e83a Using master content item to create translations 
Fixes #5535
 2015-07-31 16:19:34 -07:00
Sebastien Ros a9a1413331 Fixing unit tests 2015-07-31 16:12:36 -07:00
Sebastien Ros 637cea6a02 Fixing Redis connection creation 
With the previous code, when multiple threads tried to create
a Redis connection, the ConcurrentDictionary would have
called the factory delegate multiple times and added only one
of the resulting connections. This is by design, and a solution
is to use a Lazy object to defer the creation of the connection.
Multiple Lazy objects will be created but it doesn't have any impact.
 2015-07-31 15:10:08 -07:00
Sebastien Ros cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07:00