lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,821 Commits 94 Branches 33 Tags
395976fa60828e574563416d8e060ba23c628672
Commit Graph
28 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
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
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