lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,691 Commits 73 Branches 31 Tags 239 MiB
2a545d992a
Commit Graph

10691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
2a545d992a Merge branch '1.10.x' into dev 
Conflicts:
	ClickToBuildAzurePackage.cmd
	Orchard.proj
	src/Orchard.Azure/Orchard.Azure.sln
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
 2016-03-28 09:19:21 -07:00
Sébastien Ros
ba134bb868 Merge pull request #6660 from infofromca/warning 
Removing unused namespace usings
 2016-03-28 08:54:43 -07:00
Sébastien Ros
80f7661e43 Merge pull request #6661 from infofromca/fix6655 
Fixing some minified resource declarations

Fixes #6655
 2016-03-28 08:54:19 -07:00
Sébastien Ros
c2ba016abe Merge pull request #6662 from infofromca/fix6656 
Removing duplicated Newtonsoft.Json declaration

Fixes #6656
 2016-03-28 08:53:30 -07:00
Lombiq
a6f46d17cd Fixing references to NuGet package dlls (Orchard.Azure, Orchard.Azure.Tests, Orchard.Framework) 2016-03-26 16:16:32 +01:00
andy zheng
19954f1b4b deleted a duplicated Newtonsoft.Json declared 2016-03-25 20:08:37 -04:00
andy zheng
69b312362c fixed min and debug css menifest 2016-03-25 19:59:02 -04:00
andy zheng
464bdb07f6 fixed compile warning 2016-03-25 19:28:58 -04:00
Sébastien Ros
7e11509182 Merge pull request #6611 from OrchardCMS/issue/4569 
Block requests to tenant while it's being restarted
 2016-03-25 10:49:31 -07:00
Sébastien Ros
987ea2b005 Merge pull request #6652 from OrchardCMS/feature/nocloud 
Removed Azure cloud service support.
 2016-03-25 10:40:03 -07:00
Daniel Stolt
c6c667d180 Removed Azure cloud service support. 
Removed cloud service things from build and deployment scripts.
Removed Orchard.Azure.sln.
Removed Orchard.Azure.CloudService and Orchard.Azure.Web projects.
Removed Azure Diagnostics support.
Removed cloud service machine name provider.
Removed Azure Cache support.
Updated Orchard.Azure.Tests and moved into main solution.
Removed Orchard.Azure.Tests.sln.
 2016-03-25 17:20:51 +01:00
Lombiq
783d569434 Orchard.proj and ClickToBuildAzurePackage.cmd: Fixing references related to building the Azure solution. Fixes #6628 2016-03-25 15:31:39 +01:00
Lombiq
ede741b9df Orchard.proj and ClickToBuild.cmd: Adding additional parameter to build using a custom solution. Fixes #6627 2016-03-25 15:06:39 +01:00
Lombiq
9f4b842df2 Orchard.Azure.sln: syncing Deprecated modules with Orchard.sln. Fixes #6629 2016-03-25 11:22:46 +01:00
Sébastien Ros
5ecfcd861a Merge pull request #6646 from jtkech/patch-3 
[Fixes #6638] AliasHolderUpdater Refresh() is called 2 times
 2016-03-24 14:46:17 -07: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
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
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' 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 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