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
10,779 Commits 94 Branches 33 Tags
580b79c24db2da9b7d97039b4fd6db03412fb5c6
Commit Graph

5923 Commits

Author SHA1 Message Date
Sébastien Ros
07b6a44426 Merge pull request #6618 from jtkech/num-field 
Removing required attribute if default value is set (NumericField)
 2016-03-29 08:54:40 -07:00
Sébastien Ros
bdde332b49 Merge pull request #6619 from jtkech/other-fields 
Removing required attribute if default value set (input + link + date fields)

Fixes #6550
 2016-03-28 18:32:14 -07:00
Sébastien Ros
bfcc304a26 Merge pull request #6626 from jtkech/more-fields 
Removing required attribute for default enum and boolean fields

Fixes #6550
 2016-03-28 17:17:55 -07:00
andy zheng
69b312362c fixed min and debug css menifest 2016-03-25 19:59:02 -04:00
Thierry Fleury
de8c084c53 Replace IsNullOrWhiteSpace with IsNullOrEmpty. 2016-03-25 08:32:52 +01:00
jtkech
2d294fe421 Squash 2016-03-25 04:13:41 +01:00
jtkech
f2ec191259 Squash 2016-03-25 04:03:03 +01:00
jtkech
c1107b37bd Squash 2016-03-25 03:42:33 +01:00
jtkech
b9aaa90ec8 Squash 2016-03-25 03:29:19 +01:00
jtkech
ee223f3641 Squash 2016-03-24 23:54:40 +01:00
jtkech
dc192bf9cb AliasHolderUpdater Refresh() is called 2 times 2016-03-24 22:07:56 +01:00
Sébastien Ros
336cda8c34 Merge pull request #6604 from infofromca/timerNull 
Fixed Timer activity throws NRE

Fixes 6240
Fixes 6445
 2016-03-24 13:06:10 -07:00
Sébastien Ros
f660c101cc Merge pull request #6605 from jtkech/patch-2 
Checkboxes issues in form elements editors

Fixes #6302
Fixes #6527
 2016-03-24 13:04:56 -07:00
Sébastien Ros
1f768c8768 Merge pull request #6609 from yw80/1.10.x 
Delete the CamelFriendly function call to DisplayName.
 2016-03-24 13:01:01 -07:00
Sébastien Ros
9736f12bcc Merge pull request #6614 from jtkech/patch-3 
[Fixes #6542] Content picker multi-selection issue
 2016-03-24 12:56:29 -07:00
Sébastien Ros
8f3eadb2ae Merge pull request #6637 from jbuck79/master 
Fixing jQuery-UI resources
 2016-03-24 12:46:27 -07:00
Thierry Fleury
724afd53e0 Fixes #6644 : Codegen don't creates Themes/Modules in right Solution directory 2016-03-24 20:37:45 +01:00
Thierry Fleury
9a1d047154 Rename uri to uriBuilder 2016-03-23 14:36:36 +01:00
Thierry Fleury
74a5672f90 Fixes #6639 : Azure Media Storage don't recognizes its own URLs 
Compares url to default endpoint hostname and public hostname.
 2016-03-23 12:38:33 +01:00
Thierry Fleury
8b66c9530f Return clean PublicUrl without port number when default is used. 2016-03-23 12:31:24 +01:00
Lombiq
d556f701b8 Users: invalid id now returns HttpNotFound for all AdminController actions + formatting fixes 2016-03-22 19:34:23 +01:00
Jimmy Buck
ded813225a Include jQuery-UI in the solution and fix typo in the resource declaration for the jQueryTimeEntry script. 2016-03-21 16:09:44 -05:00
jtkech
7bf836aeb7 Update Parts.ContentMenuItem.Edit.cshtml 2016-03-20 03:20:38 +01:00
yw80
c85709ffef Delete the CamelFriendly function call to DisplayName. 
The CamelFriendly function is designed for Technical Name. The DisplayName needs to be displayed as it is.
 2016-03-20 00:01:17 +08:00
andy zheng
de9e91e5d6 fixed Timer activity throws null error exception for 1.10.x 2016-03-19 00:31:54 -04:00
jtkech
0df2f3ab57 Update FormsElementDriver.cs 2016-03-19 03:41:24 +01:00
jtkech
e30c86d0a5 Update TermAdminController.cs 2016-03-17 23:50:08 +01:00
Sebastien Ros
d39485abf2 Merge branch '1.9.x' into 1.10.x 
Conflicts:
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Rebracer.xml
 2016-03-17 10:18:46 -07:00
Lombiq
ea45c4f825 Autoroute: fixing T-string syntax in AutoroutePartHandler and updating its text 2016-03-15 19:02:51 +01:00
Benedek Farkas
35ab4117ef Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 20:33:24 +01:00
Benedek Farkas
4a0230d88c Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 19:17:54 +01:00
Lombiq
356e8230ab Taxonomies: fixing that the term admin index page should sort terms. Fixes #6548 2016-03-14 19:17:03 +01:00
Sébastien Ros
2273d38a7f Merge pull request #6568 from OrchardCMS/sebros/etag 
Adding correct ETag support
 2016-03-11 10:46:38 -08:00
Sebastien Ros
181db18355 Adding correct ETag support 2016-03-11 10:45:57 -08:00
Jeff
244cb6c6f4 Issue #6572: Add only existing terms for the field. 2016-03-11 11:49:31 +00:00
jtkech
af7da7963e Update List.cshtml 2016-03-10 23:28:08 +01:00
jtkech
3b7a54f10d Update Shapes.cs 2016-03-10 23:26:25 +01:00
Carl Woodhouse
31ed21b061 Output cache route config fixes #6523 2016-03-10 20:31:55 +00:00
Lombiq
cbd2ae71e1 Media Library: Removing the forced reinitialization of Recent on page load. Fixes #6490 2016-03-09 18:39:46 +01:00
jtkech
cf5ada1d4b Update TextFieldDriver.cs 2016-03-09 01:49:13 +01:00
Sebastien Ros
1def97d9ce [Fixes #6397] Allowing the default tenant settings to be edited 2016-03-08 14:47:46 -08:00
andy zheng
a92ef7c4de Fixes 2 little issues in dev around the TextField default values 2016-03-06 21:58:38 -05: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
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
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