lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 19:34:40 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
7,661 Commits 84 Branches 32 Tags
db50a5aecbec4c4c738d4589b777a4f32c1a5a9b
Commit Graph

188 Commits

Author SHA1 Message Date
Sebastien Ros
db50a5aecb Merge branch '1.7.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
 2014-03-17 12:09:21 -07:00
Stanley Goldman
115b8d79b7 #20404: Exporting/Importing site settings through a driver, then simple types in standard fashion 
Work Item: 20404
 2014-03-17 11:59:45 -07:00
Stanley Goldman
b2be9705c6 #20404: Moving site settings export to individual drivers providing a legacy method 
Work Item: 20404
 2014-03-13 18:06:38 -07:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Erik Oppedijk
ef7318fa58 remove webpages:enabled from scripts and content folders 2013-12-04 11:55:57 -08:00
Erik Oppedijk
3061412961 Delete views/web.config and update webpages to 3.0 2013-12-04 11:55:54 -08:00
Erik Oppedijk
5805f0ad9b Repair intellisense, update references 2013-12-04 11:54:34 -08:00
Sebastien Ros
811fd6e297 Shifting SearchSettingsPart 2013-11-12 17:55:54 -08:00
Sebastien Ros
6c0b85ad74 Merge branch 'master' into 1.x 
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
 2013-11-11 18:11:53 -08:00
Sebastien Ros
7afb052e7c Updating version numbers 2013-11-08 16:53:03 -08:00
Sebastien Ros
f6f6a56c24 Merge branch 'feature/fw45' into 1.x 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config
 2013-10-11 16:40:44 -07:00
Sebastien Ros
d920b164e0 Implementing media search 2013-09-25 16:41:44 -07:00
Benedek Farkas
790cb94d5b #20033: Fixing that SearchService should filter based on CurrentCultre instead of SiteCulture 
Work Item: 20033
 2013-09-24 23:26:38 +02:00
jao28
179e1e4cb0 #20111: Unpublish off Admin Search Error 
Work Item: 20111
 2013-09-24 13:38:08 +02:00
Sipke Schoorstra
6085d8cb15 Implementing a consistent usage of 'text', 'text small', 'text medium' and 'text large'. 
Yes, it's the little things in life.
 2013-09-14 16:00:42 -07:00
Sebastien Ros
f0851bb5fb Updating version numbers 2013-09-10 14:08:05 -07:00
Erik Oppedijk
ad35f7d900 remove cast from dynamic to object for medium trust 2013-08-31 15:15:10 +02:00
nduarte
e2e9e2afa9 #20003 : Admin Search Paging Results Broken (Orchard 1.7) 
Work Item: 20003
 2013-08-30 13:46:30 +02:00
Erik Oppedijk
26c45498df Remove unused assemblybinding redirect (mvc 2 to 3 redirect) from views folder 2013-08-27 22:07:42 +02:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Erik Oppedijk
65eb63d29d Update all MVC references to 4.0 and Razor to 2.0 2013-08-20 10:39:13 +02:00
Erik Oppedijk
b49b65636f remove IIS6 settings 2013-08-15 17:14:39 -07:00
Zoltán Lehóczky
2b43a5ed81 #19915: Fixing search settings typo 
Work Item: 19915

--HG--
branch : 1.x
 2013-07-18 22:41:31 +02:00
Sebastien Ros
5abb9f38d0 #19849: Fixing search tab in navigation's content picker 
Work Item: 19849

--HG--
branch : 1.x
 2013-07-07 10:16:57 -07:00
Sebastien Ros
5de70a9b75 #19311: Adding missing StringMaxLength attribute 
Work Item: 19311

--HG--
branch : 1.x
 2013-07-06 10:54:43 -07:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
a8cb23054f Adding migration steps for Orchard.Indexing and Orchard.Search 
--HG--
branch : 1.x
 2013-03-09 12:12:32 -08:00
Sebastien Ros
08972b8cbb Incremental work on multiple indexes 
--HG--
branch : 1.x
extra : rebase_source : 39da1f112307ff02bf7a01ecabc95a43271d476c
 2013-03-05 11:13:33 -08:00
Sebastien Ros
09f8c56377 Fixing Content Picker when Search is the only tab 
--HG--
branch : 1.x
 2013-02-20 13:01:09 -08:00
Sebastien Ros
9bd01cf7e8 Fixing type in Search Tab settings 
--HG--
branch : 1.x
 2013-02-10 19:43:53 -08:00
Sebastien Ros
9673ea7aea Adding Content Picker filters 
--HG--
branch : 1.x
 2013-02-10 07:38:34 -08:00
Bertrand Le Roy
2a6937bfc2 Typo corrections, courtesy of Antoine Griffard 
--HG--
branch : 1.x
 2013-02-05 10:42:01 -08:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Zoltán Lehóczky
da3e3d4b40 #19098: Optimizing content item fetching in Search/AdminController 
Work Item: 19098

--HG--
branch : 1.x
 2012-10-09 22:06:37 +02:00
Sebastien Ros
cda84ffc46 #18944: Fixing paging in Content Picker 
Work Item: 18944

--HG--
branch : 1.x
 2012-09-20 18:11:46 -07:00
Sebastien Ros
a3e6916bdd #18917: Upgrading solution file to Visual Studio 11 
Work Item: 18917

--HG--
branch : 1.x
 2012-08-15 10:14:09 -07:00
Sebastien Ros
2bccdfdec6 #18907: Optimizing Search content picker 
Work Item: 18907

--HG--
branch : 1.x
 2012-08-14 16:25:55 -07:00
Sebastien Ros
372fafe550 Fixing Orchard.Search version and compatibility 2012-07-19 09:41:40 -07:00
Sebastien Ros
09e3d6d4c2 Fixing Search module dependencies 2012-07-09 17:59:24 -07:00
Sebastien Ros
88c0ae5d43 Cleaning SearchController's code 
--HG--
branch : 1.x
 2012-06-08 12:51:56 -07:00
piedone@pyrocenter.hu
75819e862c #18617: Speeding up search results list 
Work Item: 18617

--HG--
branch : 1.x
extra : transplant_source : Q%04%28g%BC%86%D1%B8q%7D%E1%FB%CF%097v%A0%A8%D0L
 2012-06-08 16:24:51 +02:00
Sebastien Ros
eb8d339e62 Adding Content Search in Admin 
--HG--
branch : 1.x
 2012-05-30 11:33:51 -07:00
Sebastien Ros
6b7d617be1 Integrating Content Picker 
--HG--
branch : 1.x
 2012-05-29 18:31:28 -07:00
Sebastien Ros
ab0b8b095d Updating version numbers 
--HG--
branch : 1.x
 2012-05-03 14:58:16 -07:00
Sebastien Ros
326c8df745 Removing security attributes conflicting with dynamic compilation. 
BuildManager.GetCompiledAssembly will generate an AssemblyInfo.cs file which
will get compiled with the project, but create a conflict as two SecurityRules
attributes can't be defined at the same time. For VS 11 Beta compatibility.

--HG--
branch : 1.x
 2012-04-23 12:30:01 -07:00
Sebastien Ros
6ed1b88f17 Replacing [SecurityTransparent] by [SecurityRules(SecurityRuleSet.Level2)] 
--HG--
branch : 1.x
extra : rebase_source : 87b17cd15d51603bc6f39f01c911b414aa6428cb
 2012-03-14 11:27:02 -07:00
Sebastien Ros
e5a5decf7b Updating version numbers 
--HG--
branch : 1.x
 2012-02-29 11:29:55 -08:00
Sebastien Ros
81eac32945 Adding static content client cache defaults 
--HG--
branch : 1.x
 2012-01-12 15:28:16 -08:00
Sebastien Ros
a1802afe3a Updating web.config files for Resharper compatibility 
--HG--
branch : 1.x
 2012-01-04 11:15:31 -08:00
Sebastien Ros
e74766d9e2 Exposing FilterCulture option in search settings 
--HG--
branch : 1.x
 2011-12-15 09:15:08 -08:00