lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,072 Commits 83 Branches 32 Tags
07c539e74951b040d12a2c034dfe7e74e6f32909
Commit Graph

10072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sipke Schoorstra
fe43ef4912 Small UI improvement to Content / Content Definition export UI. 2015-09-12 19:25:55 +01:00
Sipke Schoorstra
5540e98079 Fixed MultiTenancy feature specflow tests. 2015-09-12 15:50:38 +01:00
Sipke Schoorstra
8ca6c3367a Fixed Pages specflow test. 
Note: this changes the specification from the hime page being accessible only via ~/ to being accessible via both ~/ as well as ~/my-page.
 2015-09-12 15:03:12 +01:00
Sipke Schoorstra
9e3d9c8557 Changed home alias and fixed blog feature specflow test. 
- The Home Alias change causes home page content items to be reachable via two URLS (e.g. ~/ and ~/my-blog), so accomodated the specflow test for that.
- Fixed a bug with HomeAlias where it would not find content items if their display route values contains keys other than "Id". Blogs uses "blogId", so the former implementation of just looking up the "Id" entry was too naive.
 2015-09-12 14:44:46 +01: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
Sipke Schoorstra
158069ef47 Formatted specflow files. 2015-09-11 19:46:09 +01:00
Sipke Schoorstra
ac8ee80b2a Fixed some more specflow tests. 2015-09-11 19:45:37 +01:00
Sipke Schoorstra
db6d1912a7 Fixed alias generation. 
The Specflow tests revealed a bug where a default pattern would be used instead of the configured one.
 2015-09-11 19:25:55 +01:00
Sipke Schoorstra
8b9189f750 Fixed Autoroute Specflow test. 2015-09-11 18:46:35 +01:00
Sipke Schoorstra
37c344842a Updated Host.config for Specflow tests. 2015-09-11 18:42:57 +01:00
Sipke Schoorstra
e86a1bd1b7 Simplified shell context creation. 2015-09-11 17:18:54 +01:00
Sipke Schoorstra
482dae3a20 Merge pull request #5770 from OrchardCMS/feature/tenantstateinitializing 
Changed the handling of the Initializing shell status.
 2015-09-11 12:16:20 +01: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
Sipke Schoorstra
4874b2d53d Merge remote-tracking branch 'origin/dev' into feature/tenantstateinitializing 2015-09-10 23:39:01 +01:00
Sipke Schoorstra
8308d66d66 Resetting shell state in case of an unexpected exception during setup. 2015-09-10 23:37:10 +01:00
Sipke Schoorstra
e97d54e600 Improved "tenant initializing" status description. 2015-09-10 23:20:33 +01:00
Sipke Schoorstra
9897f6ada5 Added "service unavailable" support for the currently requested shell. 2015-09-10 23:18:43 +01:00
Sipke Schoorstra
256b1313b2 Added control over standalone environment creation without affecting shell state. 
Setting the shell state to "Running" just to create the correct work context scope works, but in theory, requests could come in and be served from a "running" shell while the setup recipe is still being executed.
 2015-09-10 22:45:29 +01:00
Sipke Schoorstra
9c912b842b Merge pull request #5752 from OrchardCMS/feature/distributedlocking 
Refactored distributed locks to support existing installations.
 2015-09-10 21:55:16 +01:00
Sipke Schoorstra
b7aa00faf4 Merge remote-tracking branch 'origin/dev' into feature/distributedlocking 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/SetupService.cs
	src/Orchard/Tasks/Locking/Services/DistributedLockService.cs
 2015-09-10 21:50:46 +01: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
Sébastien Ros
bc6313fb38 Merge pull request #5771 from JRKelso/patch-1 
Updated StringExtension.cs - CamelFriendly method
 2015-09-10 10:34:36 -07:00
Ryan Kelso
ba35bc060f Update StringExtensions.cs 
Removed extraneous variable
 2015-09-10 13:13:00 -04:00
Ryan Kelso
57ad6190f8 Updated StringExtension.cs - CamelFriendly method 
Made it more obvious how CamelFriendly was choosing to enter spaces in a string

Done on behalf of Radio Systems Corporation
 2015-09-10 11:11:23 -04:00
Sipke Schoorstra
91b0dd5369 Changed the handling of the Initializing shell status. 
This improves the responsiveness of subsequent requests coming in dramatically.
 2015-09-10 12:11:46 +01:00
Sébastien Ros
c5d1f2d7e8 Merge pull request #5766 from qt1/IBN-Labs/possible-fix-for-rebuild-5754 
Possible fix for #5754
 2015-09-09 16:48:26 -07:00
qt1
c75e6a808d Order of projects change in sln - csprojs come before rebracer and gulp 2015-09-10 01:52:02 +03: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
b26690d747 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
 2015-09-08 17:19:58 -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
Sebastien Ros
06bf569774 Fixing compilation issue on CI 2015-09-08 16:05:13 -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
Sébastien Ros
a0ca1fca1c Merge pull request #5744 from OrchardCMS/sebastienros/datetimerelative 
Improving DateTimeRelative shape
 2015-09-08 15:46:01 -07:00
Sebastien Ros
691809cd85 [Fixes #5733] Update default Layout state settings 2015-09-08 15:40:28 -07:00