lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,336 Commits 83 Branches 32 Tags
e853550bda869d665598015b98a8f3444d40ec25
Commit Graph

9336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mvarblow
d958df3041 Update TermsPartHandler.cs 2015-09-14 17:03:30 -04:00
mvarblow
8690278bed Update TaxonomyService.cs 
Improves, but does not fully resolve, the performance problems described in issue #5663.
 2015-09-14 17:01:08 -04:00
Nicholas Mayne
85c4a99c13 Merge pull request #5798 from mvarblow/patch-4 
Fixed typo in Sites.Config comment.
 2015-09-13 17:35:28 +01:00
Sipke Schoorstra
a3fe3592c6 Merge pull request #5799 from mvarblow/patch-5 
Code clean-up in TermCountProcessor.cs
 2015-09-13 13:42:39 +01:00
mvarblow
a2c31a1e5c Code clean-up in TermCountProcessor.cs 
Removed an unused field and unused using statements.
 2015-09-13 08:33:08 -04:00
mvarblow
3f6dfa3dec Fixed typo in Sites.Config comment. 2015-09-12 20:54:54 -04: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
myates
a28b966685 Issue 21244 - Display warning when insecure custom forms are created 2015-09-11 17:52:19 +10:00
myates
3656e5e466 Issue 20514 - Remove id from custom form returnUrl hidden field 2015-09-11 17:31:45 +10:00
myates
92b7ad7554 Issue 20377 - Ensure comment tokens available to antispam module. 2015-09-11 17:15:42 +10:00
myates
18bb847488 Force empty value attribute on default option label in taxonomy and query element dropdown lists. 2015-09-11 14:19:52 +10: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
Jamie Phillips
2bb7eb2f91 Updating DynamicForms Module.txt 
The CustomForms module name and website were listed.
 2015-09-08 13:06:04 -04: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
Lombiq
2a0f866f26 Fixing exception when importing Projection Elements with the default layout selected 
Fixed the export of this previously, this was remaining.
 2015-09-08 01:01:23 +02:00
Thierry Fleury
371238a882 Add parameterized tokens tests 2015-09-07 15:14:20 +02:00
Thierry Fleury
67e7d1074e Allow Text token chaining when possible. 
Correct some errors on token descriptions.
 2015-09-07 11:57:20 +02:00
Thierry Fleury
25c34d8bca Fixes #5563 : Allow token chaining on DynamicForms submissions. 2015-09-07 11:57:19 +02:00
Thierry Fleury
75f3a618f0 Enhances TaxonomyField's token chaining. 2015-09-07 11:57:18 +02:00
Thierry Fleury
9947f3973e Add new Chain method for tokens 
The new method allows working with parameterized tokens.
 2015-09-07 11:57:17 +02:00
Lombiq
a685517118 Normalizing all catch (Exception ex) lines and adding exception fatality check where applicable, fixes #3949 2015-09-07 00:17:57 +02:00
Daniel Stolt
14482162fd Marked some tests as long-running. Fixes #5702. 2015-09-06 00:31:15 +02: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
Thierry Fleury
894e90f485 Use new ActionLink extension method. 2015-09-04 15:08:30 +02:00
Thierry Fleury
97bb52bbdd Add LinkExtensions 
Allows using IHtmlString as linkText
 2015-09-04 15:05:25 +02: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
mvarblow
e0fc576f9e Suppressed warning CS0436 in Orchard.Framework 
Daniel changed the Orchaard.Framework project to ignore the JetBrains.Annotations conflicts for debug builds several months back. See http://orchard.codeplex.com/workitem/21056 and 78901ba . However, the problem still exists for release builds. This pull request applies the same fix (ignoring the warning) to release builds.
 2015-09-03 16:07:06 -04:00