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: norv/elkarte
base: 6d02457a5ebc
Choose a base ref
...
head repository: norv/elkarte
compare: 1262bfd1730c
Choose a head ref
  • 10 commits
  • 31 files changed
  • 3 contributors

Commits on Mar 24, 2013

  1. ! More things that html5 would not like, mostly width/height on image… 

    …s for this batch

this is a continuation of the work stared in commit elkarte@59ccb83
! minor updates to ssi examples

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

  2. ! similar html5 prep updates to install and upgrad 

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

Commits on Mar 25, 2013

  1. ! missed the attribute 

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

  2. ! revert to basic way for the editor, the inline style function is no… 

    …t working

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

  3. ! missed a : ... maybe the third time is a charm :P 

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

  4. ! update the calendar template border-spacing 

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

  5. Merge branch 'master' of https://github.com/elkarte/Elkarte into them… 

    …eUpdatesII

Conflicts:
	themes/default/ManageMembergroups.template.php
	themes/default/ModerationCenter.template.php

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

Commits on Mar 26, 2013

  1. Merge pull request elkarte#266 from Spuds/themeUpdatesII 

    Continuation of html5 prep work
    @norv
    norv committed Mar 26, 2013
    Copy the full SHA
    0999951 View commit details
    Browse the repository at this point in the history

  2. You shouldn't trust me with javascript! :P Fixed the drafts in quick … 

    …reply with full editor disabled

Signed-off-by: emanuele <emanuele45@gmail.com>
    @emanuele45
    emanuele45 committed Mar 26, 2013
    Copy the full SHA
    7865701 View commit details
    Browse the repository at this point in the history

  3. Merge pull request elkarte#273 from emanuele45/quick_fix 

    You shouldn't trust me with javascript! :P Fixed the drafts in quick rep...
    @norv
    norv committed Mar 26, 2013
    Copy the full SHA
    1262bfd View commit details
    Browse the repository at this point in the history