lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-08 00:14:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,860 Commits 79 Branches 31 Tags
feature/canopy
Commit Graph

10860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Stolt
74baa39fac Merge 'dev' into feature/canopy. 2016-07-03 13:14:45 +02:00
Daniel Stolt
1166163623 Merge remote-tracking branch 'origin/dev' into dev 2016-07-03 13:08:32 +02:00
Daniel Stolt
8ff3ec0ee2 Fixed bug with missing source maps in SASS transpilation. 2016-07-03 12:59:52 +02:00
Lombiq
e01e1ada2d Merge branch '1.10.x' into dev 
Conflicts:
	README.md
 2016-06-29 22:59:52 +02:00
Lombiq
74011e659b README: updating 1.10.1 release description 2016-06-29 22:57:47 +02:00
Lombiq
7aa6371ec1 README: updating released versions, adding links to releases, fixing Azure deploy link 2016-06-29 22:44:07 +02:00
Lombiq
c004545eeb Updating README from the dev branch 2016-06-29 22:36:08 +02:00
Lombiq
31f07a44e4 The TinyMce toolbar is now always visible in the editor, even if scrolled down, fixes #5769 2016-06-28 23:48:50 +02:00
Lombiq
13f3473868 Some grammar fixes (I hope) in NavigationAliasProvider 2016-06-28 17:03:04 +02:00
Dale Newman
48eeafe5ca Adding SiteName to New Account Subject (#6935) 
* Add SiteName to New Account Subject

When you run more than one Orchard CMS site, and you have to moderate the logins, it's nice to know which site a new account was created on.

* Update MembershipService.cs

Fixes #6935
 2016-06-23 21:14:36 +02:00
Sipke Schoorstra
83f02b26b6 Merge branch '1.10.x' into dev 2016-06-17 23:24:01 +02:00
Sipke Schoorstra
0a06a788b2 Renamed private method in NavigationHelper. 2016-06-16 21:55:07 +02:00
Alex Petryakov
a5ac956b6a Fixes a selected path issue 
This fixes an issue where the selected path is being looked for by comparing string-based urls. It now selects the most nested url.

#6899
 2016-06-16 21:52:51 +02:00
Lombiq
3e2b5d5b82 Upgrading FluentNHibernate so it's sync with other assemblies to prevent exceptions when running tests. Fixes #6933. 2016-06-16 19:01:07 +02:00
Sebastien Ros
a8d4440c2e Encoding error messages for custom forms widgets. 2016-06-14 11:06:33 -07:00
Lombiq
af35f1387c Orchard.Framework.csproj: Fixing file inclusion syntax by removing unnecessary properties 2016-06-13 16:11:22 +02:00
Lombiq
161a2e3204 Fixing a typo in the Module.txt of Orchard.Warmup 2016-06-11 16:26:34 +02:00
Antoine Griffard
ed290180e9 Change ASP.NET VNext to ASP.NET Core. 2016-06-06 17:40:33 +02:00
Lombiq
50c8a2631d Adding "/m" switch to MSBuild in ClickToBuild.cmd and Deploy.cmd. Fixes #6936. 
It allows running independent project builds in parallel by using more than one cores.

Signed-off-by: Benedek Farkas <benedek.farkas@lombiq.com>
 2016-06-05 21:07:40 +02:00
Daniel Stolt
6a8a763f0d Merge branch '1.10.x' into dev. 2016-06-05 20:51:03 +02:00
Daniel Stolt
fbe5945ea6 Ignore DST in time zone conversion for time-only DateTime fields. Fixes #6731. 2016-06-05 20:45:10 +02:00
Daniel Stolt
03bac9222b Fixed Enter keyboard shortcut for layout elements that are not of type "Content". Fixes #5749. 2016-06-05 18:58:17 +02:00
Thierry Fleury
87a394854d Content cloning and translation 
Fixes #5535, #5089, #4983, #4970, #4538, #5031
 2016-05-27 09:44:26 -07:00
Matthew Harris
897687e4b3 Extend snippet manifest format 2016-05-27 09:08:03 -07:00
jtkech
147b4fd05b PE tasks list init and start background timer after PE tasks. 
Fixes #6742
 2016-05-26 12:58:31 -07:00
Brian Roskamp
a90bdde699 Add ReSharper support to the Razor view engine 
Fixes #6815
 2016-05-26 12:56:23 -07:00
Jasmin Savard
6198a9d4fb Adding warning notification if Redis configuration string is not set 2016-05-26 12:51:59 -07:00
jtkech
b7414e6f42 Fix Comments and Audit Trail issue 
Fixes #6733
 2016-05-26 12:51:12 -07:00
Matthew Harris
0f155827fd Layout editor br tags 
Fixes #5825
 2016-05-26 12:41:13 -07:00
Matthew Harris
bcd66f39d1 Setup recipe description mismatch 
Fixes #6811
 2016-05-26 12:39:46 -07:00
Sipke Schoorstra
7eaaf0d83f Revert "Changed 'prefix' into 'suffix'." 
This reverts commit 4bd5e60ca9.

Reason for "prefix" being correct: The URL consists of four parts, [scheme][host][path][query].
The prefix is added inside one of those parts, i.e. the [path] part, so it belongs to that part.
Since the value is added to the beginning of that part, it's a prefix.
 2016-05-24 22:26:01 +02:00
andy
86b4ff4e65 Deleted unnecessary reference on JobsQueue 2016-05-19 12:33:43 -07:00
Matthew Harris
3cb63d80af Fix missing translations 
Fixes #6877
 2016-05-19 12:26:34 -07:00
Another Developer
82a827cd51 Canceling db transaction on WebAPI exceptions 
Fixes #6868
 2016-05-19 12:16:08 -07:00
Jack Cheng
e90f114a8b Error importing media - uses indexOf instead of contains 
Fixes #6894
 2016-05-19 09:06:29 -07:00
Ivan Shakhov
85f0794cf8 fix path to Orchard.WarmUp - valuable for linux users (#6907) 2016-05-19 13:32:10 +01:00
Matthew Harris
86ee6332ae Implement 2nd missing sass pipeline 
Fixes #6905
 2016-05-18 16:36:00 -07:00
Sipke Schoorstra
4bd5e60ca9 Changed 'prefix' into 'suffix'. 2016-05-18 14:36:24 +02:00
Lombiq
8fadee4a49 Removing long orphaned backup module manifest file from Orchard.MultiTenancy 2016-05-17 21:08:30 +02:00
Daniel Stolt
14e7bb69ec Merge branch '1.10.x' into dev. 2016-05-17 16:52:55 +02:00
Daniel Stolt
9e57d016df Fixed incorrect reference in Orchard.Resources.csproj. 2016-05-17 16:48:18 +02:00
Daniel Stolt
e477328c39 Fixed admin 404 due to incorrectly named resource "jquery-colorbox.css". 2016-05-17 16:45:35 +02:00
Another Developer
ac039a1dcd Fix for profile image creation failing with absolute uri 
Fixes #6869
 2016-05-12 12:30:19 -07:00
Sebastien Ros
eb71d1ced7 Merge branch '1.10.x' into dev 2016-05-11 12:25:48 -07:00
Sebastien Ros
5ef753ef2d Merge branch 'master' into 1.10.x 2016-05-11 12:25:15 -07:00
Sebastien Ros
a629ce0f4b Merge tag '1.10.1' 1.10.1 2016-05-11 12:23:08 -07:00
Sebastien Ros
c8a4def111 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Package.json
 2016-05-05 17:45:57 -07:00
Sebastien Ros
280de4e6fc Merge remote-tracking branch 'origin/1.10.1' into 1.10.x 2016-05-05 17:39:32 -07:00
Matthew Harris
c251665dfe Add 10 digit precision support to sass 
Fixes #6865
 2016-05-05 15:03:54 -07:00
Sebastien Ros
d21538eb54 Forcing Nuget restore on Kudu 2016-05-05 13:05:35 -07:00