lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,479 Commits 84 Branches 32 Tags
a806ac74875778016c397b11ff6b07755a1b77d3
Commit Graph

294 Commits

Author SHA1 Message Date
Matthew Harris
a806ac7487 fix display glitch in admin packaging/gallery/modules 2016-02-19 01:56:33 +00:00
armanforghani
9da248871f Updated feed URL for Orchard gallery. 
Fixes #6289
 2016-01-22 01:35:43 +03:30
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
Sebastien Ros
1724be5c72 Bumping version number 2015-09-23 17:23:54 -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
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
Sebastien Ros
5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08: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
Jack Cheng
0a8779178b #20820 : Orchard.Packages: PackagingCommands class lives in the wrong feature 
Work Item: 20820
 2015-02-14 14:39:58 +00:00
Lombiq
10c0baabf4 Implementing proper package uninstall process with features being disabled and uninstalled, then the package being removed. 2015-01-27 18:33:09 +01:00
Lombiq
7e355a65c2 Refactoring PackagingServicesController, adding UninstallModule action. 2015-01-18 19:15:10 +01:00
Lombiq
dc9f54312b Renaming leftover field in PackageManager 2015-01-18 00:47:58 +01:00
Nicholas Mayne
c9c3f89d0f Fixing Type 2014-08-29 13:46:54 +01:00
Nicholas Mayne
c7c9f8e233 Merge branch '1.x' into feature/localizationchanges 2014-08-27 21:43:11 +01: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
Nicholas Mayne
023c312b41 RTL CSS changes 2014-08-12 12:59:35 +01:00
Sebastien Ros
13f91bb8c1 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Web.config
 2014-07-31 17:44:16 -07:00
Dale Newman
ae6030214d Add missing place-holder {0} for Packaging error message. 2014-07-20 14:08:35 +02:00
Lombiq
a884048709 Orchard.Packaging: fixing typo in Views/Gallery/Themes.cshtml 2014-06-24 12:23:44 +02:00
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07: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
Daniel Dabrowski
69ce0d1de4 #20549: Fixed. Installed files from package have same last write time. 2014-03-11 15:06:02 -07:00
Daniel Stolt
2dea8ace03 Integrating jQuery Calendars and jQuery Calendars Datepicker to enable client-side support for non-gregorian calendars. Integrating jQuery Time Entry to replace jQuery UI TimePicker. Renaming IDateTimeLocalization to IDateTimeFormatProvider and providing two implementations (one using the localization process and one using the already localized strings made available by CultureInfo). Removed duplicated date time editor code from ArchiveLater, PublishLater, Fields and CommonPart, and replaced with new reusable DateTimeEditor editor template. 2014-03-04 16:57:16 -08:00
Zoltán Lehóczky
3d45e8953f Cleaning up dependencies in GalleryUpdatesController 2014-02-14 00:36:44 +01: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
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
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
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
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
977fa88ef3 #19168: Fixing Razor compilation in package update views 
Work Item: 19168

--HG--
branch : 1.x
 2012-10-22 14:59:48 -07:00
Sebastien Ros
81ed251b80 Updating version numbers 
--HG--
branch : 1.x
 2012-10-18 12:49:52 -07:00
Sebastien Ros
815a5cc759 #18962: Fixing syntax error in Gallery view 
Work Item: 18962

--HG--
branch : 1.x
 2012-09-04 21:42:58 -07:00
Sebastien Ros
f79444d9ec Fixing Razor2 compilation 
--HG--
branch : 1.x
 2012-08-15 17:40:19 -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
ab0b8b095d Updating version numbers 
--HG--
branch : 1.x
 2012-05-03 14:58:16 -07:00