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,479 Commits 94 Branches 33 Tags
c890f5b5c651646100f344e12ffbef5d8e0132bf
Commit Graph

222 Commits

Author SHA1 Message Date
Sebastien Ros
c890f5b5c6 Updating version number 2016-02-01 10:07:18 -08:00
Lombiq
5406b17601 Converting all files stored as CRLF in git to be stored as LF 
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
 2015-12-13 22:21:02 +01:00
Lombiq
15d27043d7 Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:00:36 +01:00
Sebastien Ros
101d61b808 Merge branch 'master' into 1.9.x 2015-10-15 15:00:14 -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
Erik Scofield
2620dc820d ~Fix resource include 
~Rename javascript resource from RecentContentTab to SelectableContentTab for use in Search content picker as well.
+Add Selectable to Search Content Picker
+Add Select All to Search Content Picker
 2015-10-06 23:27:30 -05:00
Sebastien Ros
9c88c7fcd1 Fixing draft indexation 2015-10-02 15:44:35 +02:00
Sebastien Ros
1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
Sebastien Ros
80b93e412a Supporting custom display type for search results 2015-09-09 15:44:53 -07:00
Sebastien Ros
a0d61c67b8 Refactoring Import methods 2015-08-28 17:06:34 -07:00
Sebastien Ros
c80f2d4baa Fixing Search settings export 2015-08-26 09:46:46 -07:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
mvarblow
fa7bf025b9 Update MediaItems.cshtml 2015-05-13 16:57:10 -04:00
mvarblow
f5862bd628 Update MediaController.cs 
Fix for issue https://github.com/OrchardCMS/Orchard/issues/5275.  The fix is to return the FolderPath element in the response to the media search request so that the folderPath check in the javascript code succeeds.
 2015-05-13 16:54:23 -04:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Sipke Schoorstra
66248a7005 #4957: Fixed search settings. 2015-04-17 00:46:39 +02:00
Daniel Stolt
0f7d385350 Made casing of Web.config file names consistent. 2015-03-04 02:33:18 +01:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Lombiq
c49130293e Adding null checks to search settings import 2015-02-05 17:39:29 +01:00
Nicholas Mayne
b2bd25f1af Merge 1.x 2014-09-23 13:21:31 +01:00
Sebastien Ros
84993f3a4e Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Updater/AliasHolderUpdater.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
 2014-09-18 10:53:40 -07:00
Nicholas Mayne
e802723a4c Change to culture of incoming request if culture is in the route data or in params 2014-09-17 22:01:13 +01:00
Sebastien Ros
52b0367cdf Defining default search fields in Search recipe 2014-08-22 16:46:31 -07:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
87ee6980e6 Adding Admin Search specific index settings 2014-07-30 10:29:06 -07:00
Sebastien Ros
d277c42093 Merge branch '1.8.x' into 1.x 2014-05-16 16:56:02 -07:00
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07:00
Sipke Schoorstra
54345ead5c Changed argument names to match the way they are interpreted by the default implementation. 
The term "skip" is generally interpreted as representing the number of records to skip.
However, the SearchService implementation interprets this value as the start page, not the number of records to skip.
We could have changed the implementation to match the interface, but doing it the other way around is safer.
 2014-05-16 13:46:02 +02:00
Stanley Goldman
594ba12303 #17687 Adding IdentityPart to SearchForm 
Work Item: 17687
 2014-05-10 19:32:21 +01:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
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