Permalink
Switch branches/tags
Commits on Nov 26, 2015
  1. Merge pull request #1 from lorea/c4p0-patch

    Create lorea-dev1.12
    c4p0 committed Nov 26, 2015
  2. Create lorea-dev1.12

    c4p0 committed Nov 26, 2015
Commits on Jan 22, 2014
  1. Merge branch 'release/1.8.1'

    sembrestels committed Jan 22, 2014
  2. Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

    1.8.18
    
    Conflicts:
    	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
    	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
    sembrestels committed Jan 22, 2014
Commits on Jan 12, 2014
  1. Fixed save action.

    sembrestels committed Jan 12, 2014
  2. Bumped version 1.8.1.1

    sembrestels committed Jan 12, 2014
  3. Merge branch 'release/1.8.1'

    sembrestels committed Jan 12, 2014
  4. Bumped version 1.8.1

    sembrestels committed Jan 12, 2014
  5. little refactoring

    c4p0 committed Jan 12, 2014
  6. fix identation

    c4p0 committed Jan 12, 2014
  7. review code from hellekin comments

    c4p0 committed Jan 12, 2014
  8. Prepare for 1.8.18 release

    mrclay committed Jan 12, 2014
Commits on Jan 7, 2014
  1. Merge pull request #6311 from mrclay/6309_fix

    Fixes #6309: Fixes notify_user() broken by 63db31c
    juho-jaakkola committed Jan 7, 2014
Commits on Jan 1, 2014
  1. Merged in libxml18 (pull request #8)

    Disable loading external entities during XML parsing
    Srokap committed Jan 1, 2014
  2. Merged in csrf_fix (pull request #7)

    Added function for escaping query strings and fixed several XSRF vulnerabilities.
    Srokap committed Jan 1, 2014
  3. Preparing 1.8.17 release

    Srokap committed Jan 1, 2014
Commits on Dec 28, 2013
  1. Added missing @deprecated tags

    Srokap committed Dec 28, 2013
Commits on Dec 23, 2013
  1. Merge pull request #6251 from jeabakker/3143-memcache-entity-cache-on…

    …-login
    
    
    fixes #3143 login part
    beck24 committed Dec 23, 2013
Commits on Dec 15, 2013
Commits on Dec 11, 2013
  1. Merge pull request #6274 from juho-jaakkola/limited_groups

    Makes sure all group pages respect the limited_groups setting
    mrclay committed Dec 11, 2013
Commits on Dec 9, 2013
  1. Code style fixes for recent PR

    mrclay committed Dec 9, 2013
Commits on Dec 8, 2013
  1. Merge pull request #6250 from edfactor/patch-1

    Makes sure plugin settings functions return arrays
    mrclay committed Dec 8, 2013
Commits on Dec 2, 2013
  1. fixes #3143 login part

    jeabakker committed Dec 2, 2013