lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-24 18:25:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,977 Commits 84 Branches 32 Tags
77db3dd32c43d1942dfbd19fa1645d006bacb5fe
Commit Graph

10977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jagraz
ed13ac2802 Update localizations service to harvest only dictionaries for enabled themes. 
Fixes #6600
 2016-05-05 13:02:13 -07:00
Arjan Noordende
0ed5198cb3 Added scheme to OutputCacheKey to prevent SSL bypass 
Fixes #6850.
 2016-05-05 13:01:06 -07:00
Sergio Navarro
018a3faa2e Create target folder if not exist when moving media 
Fixes #6856
 2016-05-05 12:59:01 -07:00
Arjan Noordende
91488f31da Added SASS support to Gulpfile.js 
Fixes #6860
 2016-05-05 12:58:18 -07:00
Sergio Navarro
dfa22687b5 Fixed problem with case checking request headers in output cache 
Fixes #6863
 2016-05-05 12:57:13 -07:00
Sebastien Ros
06778eb584 Setting correct nuget path for Kudu 
Fixes #6810
 2016-05-05 12:46:48 -07:00
Sebastien Ros
951962f6d9 Fixing dynamic compilation issues 
Fixes #6858
 2016-05-05 12:40:15 -07:00
Lombiq
34bd78a487 Text in the token helper's columns are now wrapped, so longer token names or descriptions can be properly displayed. Fixes #3100. 2016-04-30 00:47:01 +02:00
Lombiq
9a8574efa3 Removing Containers ItemController, moving logic to driver, fixes #2724 2016-04-30 00:34:52 +02:00
Sipke Schoorstra
00fffe03d6 Changed layout editor toolbar icons. 2016-04-29 19:31:32 +02:00
Sipke Schoorstra
fe513532a5 Revert "Added Blockquote element (#6773)" 
This reverts commit 7d603684f0.
 2016-04-29 18:30:36 +02:00
Arjan Noordende
b292269f2b Fixed Specific url's in SecureSocketsLayer not redirected to https 
Fixes #5294
 2016-04-29 09:08:43 -07:00
Arjan Noordende
dcca575fc3 Implemented CdnSupportsSsl in Orchard UI Resources 
Fixes #6831
 2016-04-29 09:06:31 -07:00
Matthew Harris
b0393a0780 Add generic default theme.png 
Fixes #5672
 2016-04-28 13:03:33 -07:00
Sergio Navarro
6ec23919aa Element Bindings breaks after adding field to content type 
Fixes #6842
 2016-04-28 12:04:29 -07:00
Lombiq
77f3a031c5 Fixing that stylesheets having a protocol-relative URL caused exception when building shape alternate names 2016-04-28 01:55:36 +02:00
Sebastien Ros
2b3451cd13 Updating version numbers to 1.10.1 2016-04-26 10:12:18 -07:00
Arjan Noordende
e962410a72 AssemblyInfo build action Compile instead of Content with CodeGen update 
Fixes #5143
 2016-04-26 10:02:55 -07:00
jtkech
8c97c89414 Field default value as a proposed value on first edition when creating. 2016-04-26 09:50:02 -07:00
Hannan Azam Khan
b740bae395 External Media (oEmbed) Export/Import Issue 
Fixes #5417
 2016-04-26 09:18:41 -07:00
Sebastien Ros
ebd731e70a Merge branch '1.10.x' into dev 2016-04-21 10:26:06 -07:00
andy
c0d207f228 Fix potential NRE in lucene index 2016-04-21 09:06:07 -07:00
jtkech
43e1040661 Fixes distributed lock record creation issue if already exists. 
Fixes #6784
 2016-04-20 09:01:13 -07:00
Daniel Stolt
b8e138b2d5 Corrected Persian month name. Fixes #6800. 2016-04-19 17:01:34 +02:00
Kegan Maher
bf2e9970c1 Export the correct part property 
Fixes #6798
 2016-04-18 14:29:58 -07:00
jtkech
37436d86ed Fixing double submission fix 
Fixed #6788
 2016-04-18 09:21:33 -07:00
Daniel Stolt
9591fdfd1f Fixed duplicate export of LayoutData. 2016-04-18 11:24:32 +02:00
Sebastien Ros
8ebf58d27d Fixing multi-submission differently 
Take into account dynamic forms
Client validation
 2016-04-15 13:03:47 -07:00