lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 02:44:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,976 Commits 84 Branches 32 Tags
f89dfbf715359b4cee2c75a57a4c23c16618dab2
Commit Graph

10976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d9e59eada6 Merge pull request #6617 from jtkech/patch-6 
Fixes Layout OnIndexing when using a snippet element
 2016-03-24 12:55:32 -07:00
Sébastien Ros
b1f0c4bc36 Merge pull request #6634 from SzymonSel/dev 
[Fixes #6410] Moved Notifier extention change to dev branch
 2016-03-24 12:47:28 -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
Szymon Seliga
694aeb5062 #6410 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files. 
Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs

Contained in branches: dev#gitext://gotobranch/dev
Contained in no tag
 2016-03-22 21:19:50 +01:00
Szymon Seliga
4cda6672f9 Revert "#6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files." 
This reverts commit dd37d8693c.
 2016-03-22 21:19:09 +01:00
Szymon Seliga
dd37d8693c #6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files. 
Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
 2016-03-22 21:16:39 +01:00
Lombiq
d556f701b8 Users: invalid id now returns HttpNotFound for all AdminController actions + formatting fixes 2016-03-22 19:34:23 +01:00
Lombiq
9fa1e13457 HostComponents.config: fixing reference to ClientHostAddressAccessor 2016-03-22 19:03:40 +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
b8924808ea Update DefaultDisplayManager.cs 2016-03-20 20:14:33 +01:00
jtkech
7bf836aeb7 Update Parts.ContentMenuItem.Edit.cshtml 2016-03-20 03:20:38 +01:00
Lombiq
3dc6e6523f Blocking requests to tenants being restarted, thus not allowing users to see temporary YSODs 2016-03-19 19:54:46 +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
Sébastien Ros
740039d6ef Merge pull request #6601 from jtkech/patch-16 
Fixes 1.10.x compilation errors
 2016-03-17 16:42:13 -07:00
jtkech
e30c86d0a5 Update TermAdminController.cs 2016-03-17 23:50:08 +01:00
jtkech
559985b29c Update DefaultOrchardHost.cs 2016-03-17 23:47:28 +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
Sebastien Ros
24691e8fb8 Merge branch 'master' into dev 2016-03-17 10:05:46 -07:00
Sebastien Ros
6dcbbc2d93 Merge branch '1.10' 1.10 2016-03-17 09:53:07 -07:00
Sebastien Ros
c4dd5a9e18 Updating Rebracer settings 2016-03-16 16:34:45 -07:00
Sebastien Ros
9a2c08d31e Fixing tenant load retry logic 2016-03-16 16:34:32 -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
b4c782a4ad Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-15 18:47:52 +01:00
Lombiq
36df2fe1a1 TheAdmin: updating description in Theme.txt 1.9.3 2016-03-15 18:46:17 +01:00
Sébastien Ros
dd326127ce Merge pull request #6582 from infofromca/typo 
Fixed a typo in DefaultOrchardShell.cs
 2016-03-14 15:32:35 -07:00
andy zheng
82c9baad18 fixed a typo in defaultorchardShell 2016-03-14 18:06:10 -04: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
0d9d8d6b2a Merge pull request #6573 from RoyalVeterinaryCollege/6572 
Issue #6572: Add only existing terms for the field.
 2016-03-14 20:32:49 +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
Sebastien Ros
3ea1b100d6 Excluding PDBs from deployment packages 2016-03-14 10:54:59 -07:00
Sebastien Ros
d4c03997f6 [Fixes #6577] Exclude nuget packages from artifacts 2016-03-14 10:24:11 -07: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
Sébastien Ros
32bf5ed6c8 Merge pull request #6569 from jtkech/patch-6 
[Fixes #6544] NRE with containable part & Orchard.Lists
 2016-03-11 09:28:55 -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
Sébastien Ros
5e6a1549ad Merge pull request #6567 from jtkech/patch-5 
Fixing multi-tenancy functional tests
 2016-03-10 14:06:10 -08:00
jtkech
447728df03 Update MultiTenancy.feature 2016-03-10 22:47:51 +01:00
jtkech
30f163bd39 Update MultiTenancy.feature.cs 2016-03-10 22:46:19 +01:00
Sébastien Ros
78bab529d2 Merge pull request #6566 from carlwoodhouse/1.9.x 
[Fixes #6523] Output cache route config
 2016-03-10 13:00:34 -08:00
Carl Woodhouse
31ed21b061 Output cache route config fixes #6523 2016-03-10 20:31:55 +00:00