Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: elkarte/Elkarte
base: 0b50483a2b2e
Choose a base ref
...
head repository: elkarte/Elkarte
compare: af87026211db
Choose a head ref
  • 11 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 22, 2013

  1. ! Update/create draft autosaver as sceditor plugin 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    28d252e View commit details
    Browse the repository at this point in the history

  2. ! update / simplify existing draft.js to only support the non editor … 

    …quick reply

Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    b1a7877 View commit details
    Browse the repository at this point in the history

  3. ! update the functions to use the new plugin 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    7a13088 View commit details
    Browse the repository at this point in the history

  4. ! template updates to support the new draft autosavers 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    454e62a View commit details
    Browse the repository at this point in the history

  5. ! this one is not html5 ;) 

    Signed-off-by:Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    3ce5b2f View commit details
    Browse the repository at this point in the history

  6. ! Add in the license/cpr before this one ends up in another package w… 

    …ith the header stripped :P

Signed-off-by:Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed Apr 22, 2013
    Copy the full SHA
    6ad2be1 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. Merge branch 'master' of https://github.com/elkarte/Elkarte into draf… 

    …tsJS

Conflicts:
	themes/CurveClassic/Display.template.php
	themes/CurveClassic/GenericControls.template.php
	themes/default/Display.template.php

Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed May 30, 2013
    Copy the full SHA
    e823ade View commit details
    Browse the repository at this point in the history

Commits on May 31, 2013

  1. ! don't load the plugin if its not needed 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed May 31, 2013
    Copy the full SHA
    b098fff View commit details
    Browse the repository at this point in the history

  2. ! missing global ... where did that go :P 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed May 31, 2013
    Copy the full SHA
    985c36b View commit details
    Browse the repository at this point in the history

  3. ! cleanup 

    Signed-off-by: Spuds <spuds@spudsdesign.com>
    @Spuds
    Spuds committed May 31, 2013
    Copy the full SHA
    d8a985b View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2013

  1. Merge pull request #483 from Spuds/draftsJS 

    Update drafts JS to operate as a editor plugin
    @norv
    norv committed Jun 4, 2013
    Copy the full SHA
    af87026 View commit details
    Browse the repository at this point in the history