lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-20 10:45:29 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
10,824 Commits 84 Branches 32 Tags
578b21b75ec4ad0ac7ee0808fd254ea3ee4dfa8d
Commit Graph

10824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HermesSbicego-Laser
578b21b75e Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x 2016-11-04 13:45:51 +01:00
HermesSbicego-Laser
3c53ffb09a - replaced Regex.Replace with String.Trim(char[]) as suggested 
- ran Orchard.Tokens.Tests: 66/66 passed
 2016-11-04 13:43:38 +01:00
HermesSbicego-Laser
395976fa60 Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x 2016-10-28 16:34:50 +02:00
HermesSbicego-Laser
708ed79ccb Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x 2016-10-28 16:32:52 +02:00
HermesSbicego-Laser
5fe0b69c6b Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x 2016-10-28 16:32:31 +02:00
HermesSbicego-Laser
e3a7059edf - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email 2016-10-28 15:22:54 +02:00
HermesSbicego-Laser
f095dea5e5 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext 2016-10-28 12:37:55 +02:00
Another Developer
68acf2694d Fix Event Bus for null exception (#7360) 
EventsInterceptor fails when it tries to locate a generic method on an implementation with a return type. A null check has been added to avoid the exception.

Fixes #4718 
Dixes #4584
 2016-10-27 14:56:27 -07:00
jtkech
b160dc731d Allow the initial value of some fields to be tokenized (#6613) 
Fixes #6613 
Fixes #6237
 2016-10-27 13:15:47 -07:00
jtkech
d59f5b511b Update Module.txt (#6945) 2016-10-27 13:09:34 -07:00
Matteo Piovanelli
85326ead8c [Fixes #7346] Allowing cultures and layers to be selected in Widgets 
Fixes #7346
 2016-10-27 12:40:14 -07:00
Matthew Harris
d91aa41be3 [Fixes #7339] Orchard.Widgets - Refactor #7251 (#7342) 
Fixes #7339
 2016-10-27 12:24:30 -07:00
matteo.piovanelli
a15557e5f3 Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x 2016-10-27 17:10:58 +02:00
HermesSbicego-Laser
0daad70219 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x 2016-10-27 09:07:58 +02:00
HermesSbicego-Laser
7b09747fc9 inserted a better explanation on how to use the chains 2016-10-27 09:06:41 +02:00
HermesSbicego-Laser
927d18b1c2 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x 2016-10-26 19:00:44 +02:00
HermesSbicego-Laser
17ebdd2bfc - typo 2016-10-26 18:57:48 +02:00
HermesSbicego-Laser
f8cbc63fc0 Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x 2016-10-26 18:53:11 +02:00
HermesSbicego-Laser
1b511b2692 - Implement what described in #6688 
Supported Syntaxes for Request and Form tokens are:
1. QueryString:(param1) or Form:(param1)
2. QueryString:param1 or Form:param1
3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken

If you want to Chain TextTokens you have to use the 3rd syntax
the element (here param1) has been surrounded with brackets in order to preserve backward compatibility.
 2016-10-26 18:51:06 +02:00
matteo.piovanelli
ce8a61ed86 Fixes #7346 2016-10-26 11:46:49 +02:00
HermesSbicego-Laser
9f4266401a Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x 2016-10-25 09:20:57 +02:00
HermesSbicego-Laser
60aa1cc2f4 Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x 2016-10-25 09:20:28 +02:00
HermesSbicego-Laser
c1b1c4dc06 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x 2016-10-25 09:19:54 +02:00
HermesSbicego-Laser
e50bd607b7 - Formatted Code (Rebracer) 2016-10-25 09:18:24 +02:00
matteo.piovanelli
f6cfe324b1 Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x 
Ho fatto pull della 1.10 remota di Orchard
 2016-10-24 09:25:24 +02:00
HermesSbicego-Laser
bf2201c2a9 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
 2016-10-21 18:40:21 +02:00
HermesSbicego-Laser
580b79c24d - Added attachments logic 2016-10-21 18:22:48 +02:00
Matthew Harris
7a16cf527c [Fixes #7258] Orchard.Core - Tabbed groupby breaks priority (#7336) 
Fixes #7258
 2016-10-21 14:58:28 +01:00
HermesSbicego-Laser
67af300783 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x 2016-10-21 11:56:13 +02:00
HermesSbicego-Laser
a4c816b291 - missing Attachments Key fix 2016-10-21 11:55:38 +02:00
HermesSbicego-Laser
d4d4a322bc Merge branch 'feature/6196_SupportForAttachments' into 1.10.x 2016-10-21 11:46:40 +02:00
HermesSbicego-Laser
2bb81eef31 - Added attachments logic 2016-10-21 11:46:08 +02:00
HermesSbicego-Laser
297e586a19 Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x 2016-10-21 09:39:11 +02:00
HermesSbicego-Laser
548b5d7d8f - Method renamed 
- try catch removed
 2016-10-21 09:37:53 +02:00
Matthew Harris
fef68ad7ae Orchard.Roles GetRoles should defer execution (#7320) 
Fixes #7278
 2016-10-20 12:33:55 -07:00
Matthew Harris
4a5ed9790a [Fixes #7251, Fixes #1659] Orchard.Setup - Blog recipe doesn't create widgets correctly (#7324) 
Fixes #7251, Fixes #1659
 2016-10-20 12:30:47 -07:00
Matthew Harris
9be38010b0 [Fixes #7071] Orchard.Users - Users last login time is not correct (#7325) 
Fixes #7071
 2016-10-20 12:26:23 -07:00
Matthew Harris
30312ad6b0 [Fixes #7326] Orchard.Widgets - Fix typo in logger (#7327) 2016-10-20 12:25:33 -07:00
MatteoPiovanelli-Laser
429889b36e [Fixes #5811] Adding a VaryByRequestCookies property to the CacheSettingsPart 
Fixes #5811
 2016-10-20 12:24:47 -07:00
HermesSbicego-Laser
54a1bdf03a Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x 2016-10-19 17:51:29 +02:00
HermesSbicego-Laser
794b9b0252 Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation 2016-10-19 17:44:35 +02:00
HermesSbicego-Laser
1dcee8aae8 - typo chaching > caching 
- added EventHandler in order to partecipate in cachekey generation
 2016-10-19 17:43:47 +02:00
HermesSbicego-Laser
350cbbd183 - typo chaching > caching 2016-10-19 17:40:58 +02:00
HermesSbicego-Laser
b7ee130847 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x 2016-10-19 16:32:13 +02:00
HermesSbicego-Laser
58e59e2fca - added EventHandler in order to partecipate in cachekey generation 2016-10-19 16:30:49 +02:00
Sebastien Ros
59a9f0bf03 Fixing SQL exception during automatic migrations in PostgreSql 
Fixes #6783
Fixes #7323
 2016-10-17 14:34:37 -07:00
matteo.piovanelli
c9e14f9b82 Modified the OutputCache Module based on the enhancement proposed in Issue 5811, 
by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies
 2016-10-17 12:57:16 +02:00
Matthew Harris
bd222908d6 [Fixes #7318] Orchard.DesignerTools - Setting Id not needed anymore (#7319) 
Fixes #7318
 2016-10-13 21:59:41 +01:00
Matthew Harris
7c95b53807 [Fixes #7155] Orchard.Framework - GroupInfo generates routes with spaces (#7275) 
Fixes #7155
 2016-10-13 12:32:21 -07:00
Hannan Azam Khan
794f30af39 [Fixes 6759] Replace Media Item: Replacing an Image/OEmbed with new one (#7160) 
Fixes #6759
 2016-10-13 12:31:49 -07:00