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 2 Packages Projects Releases Wiki Activity
9,048 Commits 94 Branches 33 Tags
51a364a1846cb41d7d4ea9baae633817ef794bc1
Commit Graph

9048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
yw80
42dae3edf3 Remove a excess @ in TaxonomyField.cshtml 
I think this is just an oversight.
 2015-06-26 14:21:07 +08: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
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
Sébastien Ros
1fcf7c86d0 Merge pull request #5371 from gcsuk/1.9.x 
Improved Recipe Journal Logging Detail
 2015-06-18 12:39:05 -07:00
Sébastien Ros
bca643bf1f Merge pull request #5292 from Hazzamanic/1.9.x 
fixing placementeditor try/catch block
 2015-06-18 12:28:00 -07:00
Sebastien Ros
f276501923 Merge branch 'sebros/authcookie' into 1.9.x 2015-06-18 10:31:57 -07:00
Sebastien Ros
76408da930 #5315: Adding new settings to configure SSL cookies 
- Creating ISslSettingsProvider to define whether cookies can only be sent over SSL or not
- Implementing DefaultSslSettingsProvider based on Sites.config and web.config
making it configurable per tenant or for the whole site
- Implementing SecureSocketsLayerSettingsProvider in Orchard.SecureSocketsLayerSettingsProvider

Fixes 5315
 2015-06-17 18:06:47 -07:00
Skrypt
43497c8093 Closes #5389; Admin Culture Picker wrong cookie domain. 2015-06-17 20:02:04 -04:00
paynecrl97
f13c9d47c7 Adds more detail to itemDescriptor 2015-06-17 16:05:53 +01:00
paynecrl97
1a8b17d04e Defers output cache key creation until we know we need it 2015-06-17 14:02:05 +01:00
Sebastien Ros
20c5b494cd By default, html-encode translation parameters 
Also ensure that any existing parameter is not double-encoded by
removing .Text when used as a translation parameter.
 2015-06-16 16:50:45 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Sebastien Ros
aa2e2cf1d0 Ignoring VS 2015 settings files 2015-06-16 11:16:35 -07:00
Bertrand Le Roy
8eea9a6771 Add missing reference to media library from image editor web config so that views compile properly. 2015-06-15 12:42:50 -07:00
Lombiq
1d445c5438 Fixing that Custom Forms didn't display a submit button text if there was none configured 
The button text not being configured can happen on an 1.8 to 1.9 upgrade for example.
 2015-06-15 00:07:01 +02:00
Lombiq
6aabc4d9f9 Fixing that the Audit Trail Recycle Bin caused YSOD if a content item didn't have a display text (like Comments) 2015-06-14 23:18:25 +02:00
Bertrand Le Roy
14172fec51 Fix compilation issue on dynamic forms admin views that use namespaces from layouts. 2015-06-13 16:42:09 -07:00
Sipke Schoorstra
9e88d16273 Added missing null check to Projection element driver's export method. 2015-06-13 19:11:25 +03:00
Lombiq
66af4a8cdf Adding null check for query string parameters in AuditTrail to prevent possible YSOD 2015-06-13 01:02:16 +02:00
Sipke Schoorstra
9466d91438 #5379: Improved LayoutPartDriver to safely handle recursive layout rendering. 
This prevents a SO exception when you for example have a Projection element that renders content including the content item rendering that Projection element.
 2015-06-12 13:28:53 +03:00
Bertrand Le Roy
e3a9758331 Add a break element that renders the hr tag. 2015-06-11 20:47:37 -07:00
Bertrand Le Roy
564eeacf04 Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x 2015-06-11 10:03:57 -07:00
Daniel Stolt
83429f4000 Restoring commit: Render fieldset as a fieldset in the editor canvas (by Bertrand Le Roy). 2015-06-11 16:11:30 +03:00