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: 06996bb8deba
Choose a base ref
...
head repository: elkarte/Elkarte
compare: a6864a6503fc
Choose a head ref
  • 8 commits
  • 11 files changed
  • 1 contributor

Commits on May 30, 2013

  1. Revisited the template layers class adding more flexibility and few n… 

    …ew methods

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

  2. Small tweaks to the class to improve proprity handling (I hope) and s… 

    …ome change on how the class is initialized in some of the files

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

  3. Ooops 

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

  4. This should fix a couple of issues with the package manager 

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

  5. Missing global in class DbTable_* 

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

  6. Merge branch 'master' into template_layers_v2 

    Conflicts:
	sources/database/DbTable-mysql.php
    @emanuele45
    emanuele45 committed May 30, 2013
    Copy the full SHA
    9a1ae32 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2013

  1. Missing require_once when editing PM settings from the PM area (wrong… 

    … branch, I know)

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

  2. Merge pull request #481 from emanuele45/template_layers_v2 

    Template layers v2
    @emanuele45
    emanuele45 committed May 31, 2013
    Copy the full SHA
    a6864a6 View commit details
    Browse the repository at this point in the history