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,417 Commits 94 Branches 33 Tags
83cae5f0a0d6a3000be2e52e2fcf8e80966005b4
Commit Graph

9417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
adeveloper
aaef6d8810 Adding a test case for DraftRequired version option building new version of the content 2015-07-01 14:31:31 -04:00
adeveloper
379ae61e34 Code clean up 
Removed the commented lines in method BuildNewVersion.
 2015-07-01 11:38:49 -04:00
Sébastien Ros
dbba4e2787 Merge pull request #5458 from dcinzona/patch-1 
Update web.config MVC bindings for Azure Cloud Service
 2015-07-01 07:46:39 -07:00
Sébastien Ros
27365a71d9 Merge pull request #5460 from dcinzona/patch-3 
Web.Config: Orchard Layouts Updating MVC reference to 5.2.3
 2015-07-01 07:46:20 -07:00
Sébastien Ros
6a5028b80a Merge pull request #5461 from dcinzona/patch-4 
Web.config - Dynamic Forms: MVC reference updated to 5.2.3
 2015-07-01 07:46:00 -07:00
Gustavo Tandeciarz
e021218b3c Updated bindings in azure cloud service web.config 
Updated bindings for system.web.http and system.net.http.formatting to 5.2.3
 2015-06-30 19:48:05 -04:00
Gustavo Tandeciarz
993e6a1e43 Web.config: MVC reference updated to 5.2.3 
Was still referencing 5.1.0.0
 2015-06-30 17:54:18 -04:00
Gustavo Tandeciarz
0318db4c53 Web.Config: Updating MVC reference to 5.2.3 
web.config was still referencing 5.1.0.0
 2015-06-30 17:53:13 -04:00
Sebastien Ros
7758eb66f2 Fixing build 2015-06-30 14:47:22 -07:00
Sebastien Ros
e7ceb732b1 Merge branch '1.9.x' into dev 2015-06-30 14:39:06 -07:00
Sebastien Ros
03a193b6c2 Fixing compilation 2015-06-30 14:38:12 -07:00
Gustavo Tandeciarz
38705580c8 Update web.config MVC bindings 
Updated from 5.2.0.0 to 5.2.3
 2015-06-30 14:48:02 -04:00
Sebastien Ros
1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sebastien Ros
6b0985a44e Merge branch 'master' into 1.9.x 2015-06-30 11:31:35 -07:00
Sebastien Ros
2c3973bfa0 Merge branch '1.9.1' 1.9.1 2015-06-30 11:30:37 -07:00
Jasmin Savard
28168c0550 Fixes #5457; Admin Culture Picker cookie not working on localhost 2015-06-30 13:09:19 -04:00
adeveloper
9d6937c792 DefaultContentManager.cs 
The new version should always be contentItemRecord.Versions.Max(x => x.Number) + 1; not latestVersion.Number + 1;

I have a scenario where user can delete the draft content. In this scenario, I set the published version to have Latest=true and the draft version to have Latest=false. Now if I have to create again a new draft out of the published content, I end up having two versions of the same content items with the same version number.
 2015-06-29 17:07:14 -04:00
Sipke Schoorstra
c3dffb79f5 #5378: Fixed content field elements placement for content picker field and media picker field. 2015-06-29 14:27:23 +03:00
Sipke Schoorstra
5b40567b6d #5407: Layout elements now evaluate tokens. 2015-06-29 14:01:58 +03:00
Sergio Navarro
0f48019321 Fixed bug addes on pull request 2015-06-28 01:11:06 +02:00
Sipke Schoorstra
583ff8951a Removed unused namespaces. 2015-06-27 19:49:23 +03:00
Sipke Schoorstra
5c688267fa #5420: Added stub CSS files for various activities to prevent 404 errors. 2015-06-27 18:47:06 +03:00
Sipke Schoorstra
2c496a36db #5437: Maintaining selected values after model validation error. 2015-06-27 18:31:08 +03:00
Nicholas Mayne
4967fa807b Fixing multi tenant content culture lookup - thanks to Mr Spits for the patch. 2015-06-27 15:36:13 +01:00
Sipke Schoorstra
18166bd274 Fixed KeyNotFoundException in AutoroutePart. 
This fixes the issue where the autoroute part fails after a clean Orchard setup.
 2015-06-27 13:38:44 +03:00
Sipke Schoorstra
23e525206b Merge branch 'dev' into feature/dashboard 2015-06-27 12:52:11 +03:00
Sipke Schoorstra
b1c782f560 Added permission checks. 2015-06-27 12:51:08 +03:00
yw80
51a364a184 Fix the items count in media library when modify the item size in css 
Item shape is square in the media library. If the item size in
orchard-medialibrary-admin.css modified for different width and height,
the count of items will be wrong.
 2015-06-27 17:43:51 +08:00
Nicholas Mayne
9dbf30cd10 Merge pull request #5441 from oldrev/pg-connstr-fix 
Fixed the sample of PostgreSQL's connection string
 2015-06-27 10:37:35 +01:00
Sipke Schoorstra
ca4fb40bdf Merge branch 'dev' into feature/dashboard 2015-06-27 12:12:01 +03:00
oldrev
315f271fcc Fixed the sample of PostgreSQL's connection string 2015-06-27 16:29:20 +08:00
Nicholas Mayne
c435a98670 Merge pull request #5435 from yw80/1.9.x 
Remove a excess @ in TaxonomyField.cshtml
 2015-06-26 09:07:23 +01:00
yw80
42dae3edf3 Remove a excess @ in TaxonomyField.cshtml 
I think this is just an oversight.
 2015-06-26 14:21:07 +08:00
Sergio Navarro
24ee246a34 Differentiator is ignored processing placement 
In placement files shapeType uses "__" intead of '-' char for declaring a differenciator. The point is second one is used only in template files as can be seen in documentation http://docs.orchardproject.net/Documentation/Accessing-and-rendering-shapes#NamingShapesandTemplates
However GetShapeType looks for '-' character ignoring placements for a ShapeType with a differentiator. This produces strange behaviors and a lot of headaches to users because when they set for example: <Place Fields_Common_Text__SeoTitle="/Header:0"/>  in a placement file it forces all Fields_Common_Text shapes within the same Match to be rendered at Header:0 area instead of only affecting those with the SeoTitle differentiator.
 2015-06-26 02:34:08 +02:00
Lombiq
4e7e274d85 CSS classes can now be specified for widgets, fixes #5387 2015-06-26 00:34:57 +02:00
Sergio Navarro
9966e13fa3 Removed FilterContext and extra read 2015-06-25 22:50:34 +02:00
Sébastien Ros
f3fc2b53ba Merge pull request #5429 from dalenewman/patch-2 
Fix moderator notification
 2015-06-25 13:20:16 -07:00
Sébastien Ros
1a9b7af4ac Merge pull request #5430 from jchenga/issues/5148-1.9.x 
[Fixes #5418] Lost Password not working with Anonymous Access Off
 2015-06-25 13:15:32 -07:00
Jack Cheng
0c7fd67dca [Fixes #5418] Lost Password not working with Anonymous Access Off 2015-06-25 12:57:09 -07:00
Dale Newman
6063ba31d0 Fix moderator notification 
`Orchard.Email.Services.SmtpMessageChannel.Process` expects a string for Recipients, not a string array. This results in an *Object reference not set to an instance of an object* exception and the moderator(s) do not get notified. Fixes #4928.
 2015-06-25 15:45:50 -04:00
Sébastien Ros
7bf2c702a1 Merge pull request #5427 from jersiovic/patch-2 
#5426 Projections don't order queries following Position field
 2015-06-25 12:41:42 -07:00
Sébastien Ros
61d432ba4c Merge pull request #5413 from dcinzona/patch-2 
Assembly binding to azure storage 4.3.0
 2015-06-25 12:23:20 -07:00
Sébastien Ros
7cdb9ecf53 Merge pull request #5404 from MpDzik/pr/localize-quote 
Fix handling localized strings with quotes
 2015-06-25 12:22:52 -07:00
Sébastien Ros
1aefd0fdbd Merge pull request #5267 from Skrypt/autoroute-patterns-localization 
Autoroute patterns localization
 2015-06-25 12:12:06 -07:00
Sergio Navarro
ae61c81575 #5426 Projections don't order queries following Position field 
Projections don't order queries following the Position field of each order in the query

Related issue https://github.com/OrchardCMS/Orchard/issues/5426
 2015-06-25 20:26:15 +02:00
Lombiq
31e3072328 Enabling SetupService to harvest recipes from themes too 2015-06-25 16:57:13 +02:00
Lombiq
e10ba8126a Fixing that ClientHostAddressAccessor failed in a background task 
This was the case e.g. when roles were modified in a background task with Audit Trail trying to record the event
 2015-06-25 00:35:21 +02:00
Lombiq
a7626b78f5 Fixing that instead of just widgets all content items were retrieved in some WidgetsService methods 2015-06-24 16:04:11 +02:00
Sergio Navarro
29042d10f2 Update ImageProfileManager.cs 
Image cache is empty after every reboot of the Orchard app. It makey Dynamic ImageProfiles reprocess images after every reboot. It has a big impact on performance because all the images that use dynamic profiles are reprocessed when they are requested after a reboot. When you open a page with a number of images disks usage increases drammatically and the apps answer very slow to other requests

This is related with this issue https://github.com/OrchardCMS/Orchard/issues/5061
 2015-06-23 23:05:17 +02:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00