lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,091 Commits 84 Branches 32 Tags
eee341696d7491b796328419e531056dd13c5239
Commit Graph

8149 Commits

Author SHA1 Message Date
andy zheng
a92ef7c4de Fixes 2 little issues in dev around the TextField default values 2016-03-06 21:58:38 -05:00
Sipke Schoorstra
cb0fe9da31 Merge remote-tracking branch 'origin/1.10' into dev 2016-03-06 18:19:19 +01:00
Sébastien Ros
26e2fe9977 Merge pull request #6419 from rtpHarry/fix-6272 
[Fixes #6272] Improve wording for comparisons
 2016-03-03 12:41:25 -08:00
Sébastien Ros
b1c606becc Merge pull request #6426 from rtpHarry/terms-mentions-taxonomies 
Fix wrong permission check and incorrect use of taxonomies phrase
 2016-03-03 12:37:27 -08:00
Sébastien Ros
8b8cf0b7e6 Merge pull request #6427 from rtpHarry/module-list-flexbox 
[Fixes #5907] Convert modules admin page to use css flexbox
 2016-03-03 12:36:36 -08:00
Sébastien Ros
7effab96a0 Merge pull request #6429 from rtpHarry/fix-5706 
[Fixes #5706] Force order on Properties, Validation, Bindings
 2016-03-03 12:33:38 -08:00
Another Developer
008edc46ef Incorrect data being returned for nonexistent primitive datatypes 
default(T) returns non null value for primitive datatypes, this causes CachingExtensions.Get<T> never to call the factory method.
 2016-03-03 09:27:20 -05:00
Sipke Schoorstra
3690968646 Fixed Dynamic Forms Bindings issue. Fixes #6470 
ModelBinding failed due to the "null" key being specified. Instead, the type name of the model should be specified as the key (which happens by default when no key is specified). Not sure how this worked before, since this code has been there from the beginning, and file histories don;t show an obvious change. Perhaps due to the upgrade to newer ASP.NET MVC?
 2016-03-02 23:51:22 +01:00
Lombiq
6c93bf4d69 Merge remote-tracking branch 'origin/1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
 2016-03-01 22:02:06 +01:00
jtkech
9a8a215a98 Update Web.config 2016-02-29 22:06:27 +01:00
jtkech
2351978275 Update Web.config 2016-02-29 22:02:49 +01:00
andy zheng
026acc4aa9 fixed one of URL prefix and Host should be required 2016-02-28 13:30:11 -05:00
Lombiq
f0dd64d5c9 Fixing typo in an Azure Media Services template 2016-02-26 22:20:00 +01:00
Sébastien Ros
ad6a2b96e5 Merge pull request #6428 from rtpHarry/fix-packaging-display-glitch 
Fixing display glitch in admin packaging/gallery/modules
 2016-02-25 13:06:44 -08:00
Sébastien Ros
773882603f Merge pull request #6455 from dcinzona/patch-5 
[Fixes #6454] Sets the height of the media library correctly
 2016-02-25 13:03:25 -08:00
Sébastien Ros
e8af37de95 Merge pull request #6469 from dcinzona/activities-css 
[Fixes #6467] Adding missing user activity css stub
 2016-02-25 12:29:03 -08:00
gustavo.tandeciarz@nflplayers.com
a1d2ba8f51 Adding missing user activity css stub 2016-02-24 13:42:59 -05:00
Lombiq
e32455ff28 Media Library: Fixing that recent items were not displayed for users with ManageOwnMedia permission. Fixes #6446 2016-02-24 00:36:57 +01:00
Lombiq
b983787d0d Media Library: Fixing NRE when renaming folder while having ManageMediaContent permission 2016-02-24 00:11:24 +01:00
Sébastien Ros
614bf779f7 Merge pull request #6456 from ryanmagoon/dev 
[Fixes #6330] Using website url for core modules
 2016-02-23 14:47:29 -08:00
Lombiq
c09ffd85c4 Indexing: Fixing Migrations when upgrading from migration version 2 (1.9.2). Fixes #6382 2016-02-23 22:39:13 +01:00
Lombiq
6cd28be1a0 MediaLibrary: Fixing invalid HTML in OEmbed template 2016-02-23 22:28:41 +01:00
Gustavo Tandeciarz
4b8d11c1ed Fixes broken icons introduced into the media library by upgrading FontAwesome 2016-02-23 22:26:15 +01:00
Sébastien Ros
1d0a8cfc78 Merge pull request #6441 from dcinzona/patch-2 
[Fixes #6440] Last Login and Created Date
 2016-02-23 12:41:34 -08:00
Ryan Magoon
e887411f16 fix for #6330 
Changed extension manifests to use “orchardproject.net” as the Website
 2016-02-23 13:44:59 -05:00
Gustavo Tandeciarz
f4a9ef3bc1 Sets the height of the media library correctly 
Sets the height of the media library container to the height of the content (with padding)
 2016-02-22 16:03:16 -05:00
Gustavo Tandeciarz
790a92f66b Fixes broken icons introduced into the media library by upgrading FontAwesome 2016-02-22 15:29:33 -05:00
Daniel Stolt
ea7404a6ef Merge branch '1.10' 2016-02-22 13:59:36 +01:00
Daniel Stolt
cb06c7576c Merge pull request #6443 from dcinzona/Fixes-6411-Codegen-1.10 
[Fixes #6411]  Theme code generation produces an 'out-of-date' project
 2016-02-22 13:56:56 +01:00
Daniel Stolt
c788dd61a2 Merge pull request #6437 from OrchardCMS/issue/snippets 
Improved snippets harvester.
 2016-02-22 13:56:17 +01:00
Gustavo Tandeciarz
f8f02bb9ef Updated space formatting in line with #6072 2016-02-21 19:48:31 -05:00
Gustavo Tandeciarz
9666ba1292 [Fixes #6411] Theme code generation produces an 'out-of-date' project 2016-02-21 03:22:38 -05:00
Gustavo Tandeciarz
4ba75cc9db [Fixes #6440] Last Login and Created Date 
Fixes issue #6440.  Only display last login or created date for users when there is a value to display
 2016-02-20 15:06:56 -05:00
Sipke Schoorstra
1e2d919b02 Improved snippets harvester. 
Fixes #6432
 2016-02-20 17:44:31 +01:00
Daniel Stolt
da766ad7e2 Disabled unsafe css-nano transforms and rebuilt resources. 2016-02-20 01:14:14 +01:00
Daniel Stolt
6664e75570 Refactored and fixed issues with calendar picker. Fixes #6416 #6338 #6080. 2016-02-20 01:14:14 +01:00
Daniel Stolt
28425b0a53 Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-20 01:13:13 +01:00
Daniel Stolt
8897947ba7 Corrected NuGet reference hint paths from Azure to normal solution folder. Fixes #6403. 2016-02-20 01:13:13 +01:00
Matthew Harris
a8d4b18f72 fixes #5708 - change ui layer to display Mandatory checkbox as required 2016-02-19 22:44:52 +00:00
Daniel Stolt
804161f511 Refactored and fixed issues with calendar picker. Fixes #6416 #6338 #6080. 2016-02-19 23:36:53 +01:00
Daniel Stolt
3f6fc4899e Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-19 22:49:15 +01:00
Daniel Stolt
cc0593497e Corrected NuGet reference hint paths from Azure to normal solution folder. Fixes #6403. 2016-02-19 20:49:55 +01:00
Lombiq
2d9a5e04d7 Fixing that titles of Custom Forms forms were double-encoded 2016-02-19 18:18:20 +01:00
Gustavo Tandeciarz
a0b66bc3b5 [Fixes #6430] Removes Imageset for Orchard.Alias UI 
This removes the broken file reference generated by the Orchard.Alias UI feature.
 2016-02-19 08:16:29 -05:00
Sipke Schoorstra
a1e5102fa9 Minor blueprints cleanup. 2016-02-19 13:56:02 +01:00
Sipke Schoorstra
cc470d6e83 Merge pull request #6138 from neTp9c/issue/6137 
Import and Export of element blueprints don't invoke events for their base elements.
 2016-02-19 13:43:37 +01:00
Matthew Harris
1907e57902 fixes #5706 - standardize order on Properties, Validation, Bindings 2016-02-19 02:27:23 +00:00
Matthew Harris
a806ac7487 fix display glitch in admin packaging/gallery/modules 2016-02-19 01:56:33 +00:00
Sébastien Ros
47072f91ae Merge pull request #6425 from rtpHarry/widget-ruleengine-typo 
Fix typo in Orchard.Widgets.RuleEngine.cs
 2016-02-18 17:50:45 -08:00
Matthew Harris
bbe4110053 fix typo in typo fix 2016-02-19 01:43:55 +00:00