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

added goToRevisionEvent hook, regexp support for pre and post values in ep.json - WONT MERGE #3408

Closed
wants to merge 46 commits into from
Closed

added goToRevisionEvent hook, regexp support for pre and post values in ep.json - WONT MERGE #3408

wants to merge 46 commits into from

Commits on Oct 19, 2017

  1. fix to #2486

    @ilmartyrk
    ilmartyrk committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    69bf32c View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2017

  1. fix to #2486

    @ilmartyrk
    ilmartyrk committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    c36a326 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. updated html export, run hooks also with lists

    @ilmartyrk
    ilmartyrk committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    724b1d7 View commit details
    Browse the repository at this point in the history

  2. exportHTML update

    @ilmartyrk
    ilmartyrk committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    5469ce8 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. ExportHtml.js update

    @ilmartyrk
    ilmartyrk committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    76f211b View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. added tiblus ep_prefs_different_cookie_for_different_protocol

    @ilmartyrk
    ilmartyrk committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    3040050 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2018

  1. ueberDB2 update

    @ilmartyrk
    ilmartyrk committed Mar 26, 2018
    Configuration menu
    Copy the full SHA
    cf82177 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Merge with upstream develop.

    @tiblu
    tiblu committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    6f2466b View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. Upgrade Ueberdb2 to 0.3.7 to fix #3348

    @tiblu
    tiblu committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    a4819b2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into develop

    @tiblu
    tiblu committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    a67aaa8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into develop

    @tiblu
    tiblu committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    20428bb View commit details
    Browse the repository at this point in the history

  4. Upgrade Ueberdb2 to 0.3.7 to fix #3348

    @tiblu
    tiblu committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    64a2e5b View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Export lists fix + code linting and readability update

    @ilmartyrk
    ilmartyrk committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    b4ad7cf View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. html lists export fix

    @ilmartyrk
    ilmartyrk committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    8502c04 View commit details
    Browse the repository at this point in the history

  2. D

    @ilmartyrk
    ilmartyrk committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    517b249 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. export html to original structure

    @ilmartyrk
    ilmartyrk committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    d6fa065 View commit details
    Browse the repository at this point in the history

  2. upgrade to 1.6.5

    @ilmartyrk
    ilmartyrk committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    7cc7bb1 View commit details
    Browse the repository at this point in the history

  3. upgrade to 1.6.5

    @ilmartyrk
    ilmartyrk committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    8d27f3c View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. sync with ether/etherpad-lite

    @ilmartyrk
    ilmartyrk committed May 2, 2018
    Configuration menu
    Copy the full SHA
    c9863f8 View commit details
    Browse the repository at this point in the history

  2. html export fix

    @ilmartyrk
    ilmartyrk committed May 2, 2018
    Configuration menu
    Copy the full SHA
    55ecf31 View commit details
    Browse the repository at this point in the history

  3. hook callAll to aCallAll

    @ilmartyrk
    ilmartyrk committed May 2, 2018
    Configuration menu
    Copy the full SHA
    6684f9b View commit details
    Browse the repository at this point in the history

  4. line parsing fix

    @ilmartyrk
    ilmartyrk committed May 2, 2018
    Configuration menu
    Copy the full SHA
    47e20a2 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. prevLine/nextLine check fix

    @ilmartyrk
    ilmartyrk committed May 14, 2018
    Configuration menu
    Copy the full SHA
    016497d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2018

  1. List indent fix

    @ilmartyrk
    ilmartyrk committed May 21, 2018
    Configuration menu
    Copy the full SHA
    3c66425 View commit details
    Browse the repository at this point in the history

  2. merge with develop branch

    @ilmartyrk
    ilmartyrk committed May 21, 2018
    Configuration menu
    Copy the full SHA
    4feccff View commit details
    Browse the repository at this point in the history

  3. merge with ether/etherpad-lite develop branch

    @ilmartyrk
    ilmartyrk committed May 21, 2018
    Configuration menu
    Copy the full SHA
    a96aa88 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3268 from citizenos/develop 

     getLineHTMLForExport - Fixes #2486 but breaks plugins
    @JohnMcLear
    JohnMcLear authored May 21, 2018
    Configuration menu
    Copy the full SHA
    fe08d2a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Localisation updates from https://translatewiki.net.

    @translatewiki
    translatewiki committed May 31, 2018
    Configuration menu
    Copy the full SHA
    d42393d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. added goToRevisionEvent hook

    @ilmartyrk
    ilmartyrk committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    5fc0c3e View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Localisation updates from https://translatewiki.net.

    @translatewiki
    translatewiki committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    3362c68 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Localisation updates from https://translatewiki.net.

    @translatewiki
    translatewiki committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    dfd45f0 View commit details
    Browse the repository at this point in the history

  2. use regexp in ep.json pre and post values

    @ilmartyrk
    ilmartyrk committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    0414f74 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of git://github.com/ether/etherpad-lite into d… 

    …evelop
    @ilmartyrk
    ilmartyrk committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    30ad6f0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'html_export_fix' into develop

    @ilmartyrk
    ilmartyrk committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    80f02c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. resolve conflicts between plugins

    @ilmartyrk
    ilmartyrk committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    f94d969 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. Localisation updates from https://translatewiki.net.

    @translatewiki
    translatewiki committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    599b1f4 View commit details
    Browse the repository at this point in the history

  2. Fix FR dateformat 

    FYI, the dateformat in translatewiki is correct.
    @ldidry @muxator
    ldidry authored and muxator committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    f35d345 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2018

  1. Use keydown instead of keypress on Firefox.

    @mantaroh @muxator
    mantaroh authored and muxator committed Jul 1, 2018
    Configuration menu
    Copy the full SHA
    2be873e View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. Localisation updates from https://translatewiki.net.

    @translatewiki
    translatewiki committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    380889b View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. add new icons to font

    @ilmartyrk
    ilmartyrk committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    0fc2843 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of git://github.com/ether/etherpad-lite into d… 

    …evelop
    @ilmartyrk
    ilmartyrk committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    c5a9afb View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. htmlExport test update

    @ilmartyrk
    ilmartyrk committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    d04d0f9 View commit details
    Browse the repository at this point in the history

  2. updated htmlExport test

    @ilmartyrk
    ilmartyrk committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    944ccea View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. Merge branch 'develop' of git://github.com/ether/etherpad-lite into d… 

    …evelop
    @ilmartyrk
    ilmartyrk committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    eb69a00 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. Merge branch 'develop' of git://github.com/ether/etherpad-lite into d… 

    …evelop
    @ilmartyrk
    ilmartyrk committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    9cc2eb9 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. getHtml test update

    @ilmartyrk
    ilmartyrk committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    06cf3ff View commit details
    Browse the repository at this point in the history