lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,718 Commits 93 Branches 33 Tags
8f2e9caa8f61e331cd590b242c6ea352d0c30bd2
Commit Graph

10718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros
76097acf54 Merge pull request #6375 from infofromca/fixwidgets 
[Fixes #6374] Use jQueryUI resource
 2016-02-10 17:15:39 -08:00
andy zheng
2a2e3d7920 fix jq widgets for 1.10 2016-02-10 19:56:27 -05:00
Lombiq
d925fd31dc Adding orphaned files to their respective csprojs. Fixes #6366 2016-02-10 23:43:47 +01:00
Lombiq
f3afc4110a Removing empty folders in several project files 2016-02-10 22:45:25 +01:00
Lombiq
5e17db3afd Removing unnecessary file copied to the Users module (see UserResolverSelector.cs) 2016-02-10 22:44:27 +01:00
Lombiq
e823738265 Removing residual files accidentally brought back during merge in Orchard.Indexing 2016-02-10 22:42:53 +01:00
Lombiq
d6035f6bb0 Removing residual file IdentifyDependenciesContext.cs from Orchard.ContentManagement.Handlers 2016-02-10 21:55:55 +01:00
jtkech
9e28fbe2a5 Update HttpContextBaseExtensions.cs 2016-02-10 05:10:40 +01:00
jtkech
920d577bb2 Update HttpContextAccessor.cs 2016-02-10 05:08:19 +01:00
Daniel Stolt
202234bf0b Refreshed all Gulp-compiled resource files. 2016-02-09 23:47:56 +01:00
Daniel Stolt
36f701625c Refactored the resource manifest for jQuery UI. 2016-02-09 23:47:22 +01:00
Sébastien Ros
dfaaf61f88 Merge pull request #6349 from infofromca/fix6343 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 09:00:00 -08:00
Sébastien Ros
1e0777f47f Merge pull request #6364 from neTp9c/FixFiltersForGetImageProfileUrl 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 08:59:24 -08:00
neTp9c
ca2605bb50 Add empty scope for localization string without scope 2016-02-09 14:57:20 +03:00
neTp9c
66f500e2d7 Treatment null value for params argument 2016-02-09 13:50:09 +03:00
jtkech
ab2b88676e Update MvcModule.cs 2016-02-09 02:07:50 +01:00
Lombiq
47a1dbaaa2 Adding the ability to have placeholders for content fields, fixes #5943 2016-02-08 18:01:03 +01:00
Daniel Stolt
51ad9fc792 Merge pull request #6356 from infofromca/fix6354 
#6354: delete one duplicate definition of script for jQueryUI for orchard 1.10
 2016-02-07 23:26:48 +01:00
andy zheng
4401fb1e7f delete one duplicate definition of script for jQueryUI 2016-02-07 07:42:47 -05:00
Daniel Stolt
a584b27c35 Changed to manual bootstrapping of LayoutEditor Angular app. Fixes #5722. 2016-02-06 23:54:40 +01:00
Daniel Stolt
1b02c5c03c Fixed errors in jQuery resource manifest. 2016-02-06 23:53:15 +01:00
andy zheng
8278901e22 fix #6343 2016-02-05 19:37:48 -05:00
Matthew Harris
c4b83093e8 [Fixes #6344] Remove unused place tag 2016-02-05 19:44:57 +00:00
jtkech
b126dc4495 Update ContextState.cs 2016-02-05 02:27:37 +01:00
jtkech
1248fcc826 Update MvcModule.cs 2016-02-05 01:07:54 +01:00
jtkech
854c4ef73c Update Index.cshtml 2016-02-05 00:08:35 +01:00
jtkech
0e3e7f0c90 Update OutputCacheFilter.cs 2016-02-05 00:04:20 +01:00
Sebastien Ros
c8ab7f187f Fixing jQuery UI resources 
#6329
 2016-02-04 13:43:07 -08:00
Sebastien Ros
0c6bcb52e9 [Fixes #6329] Fixing fonts file location in Orchard.Resources 2016-02-04 13:43:06 -08:00
Sebastien Ros
57fd0f6244 [Fixes #6328] Using FontAwesome from Orchard.Resources 2016-02-04 13:43:05 -08:00
Sebastien Ros
4cabab9c6d [Fixes #6327] Removing TaskLease dependency in JobsQueue 2016-02-04 13:43:04 -08:00
Sipke Schoorstra
96a4af5a68 Removed unneeded HTML file. 2016-02-04 21:28:27 +01:00
Kexy Biscuit
b142b9ff1f Update "Deploy to Azure" button link 2016-02-04 19:51:10 +08:00
Sebastien Ros
ae0e545a9f Ignoring deprecated packages for msdeploy package 2016-02-01 11:55:28 -08:00
Sebastien Ros
3630473e69 Removing roslyn compilation for now 2016-02-01 11:55:04 -08:00
Sebastien Ros
9916037d8e Updating version numbers 2016-02-01 10:13:05 -08:00
Sebastien Ros
b3b4b38229 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
	src/Orchard.Web/Web.config
 2016-02-01 10:12:06 -08:00
Sebastien Ros
c890f5b5c6 Updating version number 2016-02-01 10:07:18 -08:00
Sebastien Ros
52aade5411 Removing unused references 2016-02-01 10:03:13 -08:00
Sebastien Ros
a14b006d70 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard/ContentManagement/DefaultContentManager.cs
 2016-02-01 09:36:47 -08:00
Sebastien Ros
77f4382fe8 Merge branch '1.9.x' into 1.9.3 2016-02-01 09:33:22 -08:00
Sebastien Ros
1205f3ae5a Merge branch 'dev' into 1.10 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2016-02-01 09:33:02 -08:00
Sébastien Ros
787b5d89b3 Merge pull request #6324 from saurabhrajguru/issue/6306/codeplexreferences 
[Fixes #6306] Updated codeplex url with github url in modules
 2016-02-01 09:11:19 -08:00
saurabhrajguru
af1673ed9e Updated codeplex url with github url in modules 2016-02-01 12:57:13 +05:30
Sipke Schoorstra
59d20c3d40 Fixed an issue with rendering shapes from Orchard.exe. 
Fixes #6321
 2016-01-31 22:43:03 +01:00
Piotr Szmyd
52668d1beb [Fixes #6322] Supporting multiple scopes/contexts in .po file entries. 2016-01-31 18:22:33 +01:00
Sipke Schoorstra
b9fa87d5e2 Fixed an issue with a null BaseUrl during Setup from Orchard.exe. 
Fixes #6320
 2016-01-31 14:25:45 +01:00
Daniel Stolt
afc637452a Fixed the Log4net config release transformation. 2016-01-31 12:22:47 +01:00
Zoltán Lehóczky
84cbc31994 Merge pull request #6314 from OrchardCMS/issue/3537-alias-breadcrumb-linnk 
Implementing Alias Breadcrumb Link to be able to add dynamically gene…
 2016-01-29 17:58:06 +01:00
Lombiq
f44ddc623c Instead of an isBreadcrumb parameter we now use BreadcrumbMenuItemPart to distinguish breadcrumb-only menu items 2016-01-29 17:03:07 +01:00