Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implements ContentPicker localization options discussed in #7352 #7391

Merged
merged 6 commits into from
Nov 17, 2016
Merged

Implements ContentPicker localization options discussed in #7352 #7391

merged 6 commits into from
Nov 17, 2016

Commits on Nov 10, 2016

  1. Squashed commit of the following: 

    commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46
Author: matteo.piovanelli <[email protected]>
Date:   Thu Nov 10 12:02:09 2016 +0100

    Added notifications about what the localization methods for ContentPickerField will do or have done.

commit 04eb7074dcfef2c8beb65f0322821dc654902cfb
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 17:48:59 2016 +0100

    Added the TryTranslate option and its suboptions

commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc
Author: matteo.piovanelli <[email protected]>
Date:   Wed Nov 9 15:31:44 2016 +0100

    Added a new feature to the ContentPicker module.
    So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture

commit b90629d
Merge: 578b21b c486355
Author: matteo.piovanelli <[email protected]>
Date:   Tue Nov 8 09:37:30 2016 +0100

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x

commit 578b21b
Merge: 395976f 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:45:51 2016 +0100

    Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x

commit 3c53ffb
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Nov 4 13:43:38 2016 +0100

    - replaced Regex.Replace with String.Trim(char[]) as suggested
    - ran Orchard.Tokens.Tests: 66/66 passed

commit 395976f
Merge: 708ed79 a15557e
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:34:50 2016 +0200

    Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 708ed79
Merge: 5fe0b69 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:52 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x

commit 5fe0b69
Merge: 0daad70 e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 16:32:31 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x

commit e3a7059
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 15:22:48 2016 +0200

    - 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

commit f095dea
Merge: 7b09747 68acf26
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 28 12:37:55 2016 +0200

    Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext

commit a15557e
Merge: 0daad70 ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Thu Oct 27 17:10:53 2016 +0200

    Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x

commit 0daad70
Merge: 927d18b 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:07:58 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 7b09747
Author: HermesSbicego-Laser <[email protected]>
Date:   Thu Oct 27 09:05:17 2016 +0200

    inserted a better explanation on how to use the chains

commit 927d18b
Merge: f8cbc63 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 19:00:44 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 17ebdd2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:57:48 2016 +0200

    - typo

commit f8cbc63
Merge: 9f42664 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:53:11 2016 +0200

    Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x

commit 1b511b2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 26 18:50:35 2016 +0200

    - Implement what described in OrchardCMS#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.

commit ce8a61e
Author: matteo.piovanelli <[email protected]>
Date:   Wed Oct 26 11:46:24 2016 +0200

    Fixes OrchardCMS#7346

commit 9f42664
Merge: 60aa1cc f6cfe32
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:57 2016 +0200

    Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x

commit 60aa1cc
Merge: c1b1c4d 7a16cf5
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:20:28 2016 +0200

    Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x

commit c1b1c4d
Merge: bf2201c e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:19:54 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x

commit e50bd60
Author: HermesSbicego-Laser <[email protected]>
Date:   Tue Oct 25 09:18:24 2016 +0200

    - Formatted Code (Rebracer)

commit f6cfe32
Merge: 7a16cf5 bf2201c
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 24 09:24:57 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x
    Ho fatto pull della 1.10 remota di Orchard

commit bf2201c
Merge: 67af300 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 18:40:21 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

    # Conflicts:
    #	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs

commit 580b79c
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 67af300
Merge: d4d4a32 a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:56:13 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit a4c816b
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:55:38 2016 +0200

    - missing Attachments Key fix

commit d4d4a32
Merge: 297e586 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:40 2016 +0200

    Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

commit 2bb81ee
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 11:46:08 2016 +0200

    - Added attachments logic

commit 297e586
Merge: 54a1bdf 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:39:11 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 548b5d7
Author: HermesSbicego-Laser <[email protected]>
Date:   Fri Oct 21 09:37:07 2016 +0200

    - Method renamed
    - try catch removed

commit 54a1bdf
Merge: b7ee130 794b9b0
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:51:29 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 794b9b0
Merge: 1dcee8a 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:44:35 2016 +0200

    Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation

commit 1dcee8a
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - typo chaching > caching

    - added EventHandler in order to partecipate in cachekey generation

commit 350cbbd
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 17:40:58 2016 +0200

    - typo chaching > caching

commit b7ee130
Merge: c9e14f9 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:32:13 2016 +0200

    Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x

commit 58e59e2
Author: HermesSbicego-Laser <[email protected]>
Date:   Wed Oct 19 16:30:12 2016 +0200

    - added EventHandler in order to partecipate in cachekey generation

commit c9e14f9
Author: matteo.piovanelli <[email protected]>
Date:   Mon Oct 17 12:54:53 2016 +0200

    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
    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    6efa830 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2016

  1. Changed the view as reccomended by @sebastienros in his comments

    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    417c63b View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2016

  1. Added culture information to the contentpickerfield editor view

    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    eb9d256 View commit details
    Browse the repository at this point in the history

  2. Fixed a bug in the handler (!= instead of ==)

    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    ab9eb4e View commit details
    Browse the repository at this point in the history

  3. showing displaytext in warnings and notifications rather than content… 

    … item's id
    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    0673617 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Cleanup. I 

    ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly
    @MatteoPiovanelli-Laser
    MatteoPiovanelli-Laser committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    4287696 View commit details
    Browse the repository at this point in the history