lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,119 Commits 83 Branches 32 Tags
28643ae7b885850e69f247d1a76f2f2a096cf1bf
Commit Graph

9119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Marek Dzikiewicz
6636527006 Add unit tests for #4154 and #5402 2015-06-23 11:44:46 +02:00
Marek Dzikiewicz
aacf0b2476 Introduce ILocalizationStreamParser 
This moves the logic of parsing PO files from
DefaultLocalizedStringManager to a separate service, so that parsing
can be tested independently from resolving translations from loaded PO
files.
 2015-06-23 11:44:29 +02:00
Gustavo Tandeciarz
88ac0d2879 Assembly binding to azure storage 4.3.0 
Retargeting to 1.9.x - updated assembly binding from 3.1.0 to 4.3.0
 2015-06-22 18:55:35 -04:00
Sébastien Ros
ac305af963 Merge pull request #5406 from MpDzik/pr/media-import-loc 
MediaLibrary - Fix localization of Import button
 2015-06-22 15:45:46 -07:00
Sebastien Ros
78fb58f016 Fixing localization gender 2015-06-22 10:10:58 -07:00
Sebastien Ros
8481768b58 Fixing culture list encoding 2015-06-22 10:06:34 -07:00
Marek Dzikiewicz
50d65bc0b9 MediaLibrary - Fix localization of Import button 2015-06-21 17:42:54 +02:00
agriffard
4eb8d1d2ea Fix some typos #5405 2015-06-21 15:44:04 +02:00
Marek Dzikiewicz
104cf7d5f4 Fix handling localized strings with quotes 2015-06-20 22:42:33 +02:00
Daniel Stolt
220c1b591a Restored reset of markup content styling in layout editor. 2015-06-20 20:38:42 +03:00
Daniel Stolt
b06a4ecb73 #5403 Improved native clipboard support in layout editor. 2015-06-20 19:35:11 +03:00
Daniel Stolt
764db254da Made layout editor toolbox separately scrollable while in sticky mode. 2015-06-20 16:42:53 +03:00
Bertrand Le Roy
c1359f7a86 Add a heading element that renders as h1-h6 tags. 2015-06-19 18:57:45 -07:00
Sebastien Ros
51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
Sebastien Ros
2cd5af5193 Reverting IMembership usage in FormsAuthenticationService 2015-06-19 10:54:46 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sébastien Ros
3c3a6df6dd Merge pull request #5391 from paynecrl97/5390/delay_output_cache_key_creation 
Defers output cache key creation until we know we need it
 2015-06-19 09:35:10 -07:00
paynecrl97
c6e96867c7 Only executes itemDescriptor logic if Debug logging is enabled 2015-06-19 09:17:29 +01:00
Sebastien Ros
8d134ba0c5 Fixing html-encoding in WebSearch settings page 2015-06-18 16:47:38 -07:00
Sebastien Ros
9d5bc20666 Fixing unit tests 2015-06-18 14:19:44 -07:00