Commits on Mar 15, 2013
  1. @arjan

    Increase projectx page len

    arjan committed Mar 15, 2013
Commits on Mar 14, 2013
  1. @arjan

    fix entity decoding as utf8

    arjan committed Mar 14, 2013
  2. @mworrell
  3. @mworrell

    core: psql: better error message for insert/delete

    (cherry picked from commit b76e04a)
    (cherry picked from commit a57017e)
    mworrell committed Mar 1, 2013
Commits on Mar 5, 2013
  1. @arjan

    core: New z_html

    arjan committed Mar 5, 2013
Commits on Feb 1, 2013
  1. @mworrell
  2. @mworrell
Commits on Mar 8, 2012
  1. @mworrell

    Fix for creating config values with empty 'value'. Also fix for delet…

    …ing configs (now only the is_gone flag is set, which kept the config in the config list.
    mworrell committed Mar 8, 2012
Commits on Feb 16, 2012
  1. @mworrell
  2. @mworrell
  3. @mworrell

    Added papiamento and papiamentu

    mworrell committed Feb 16, 2012
  4. @mworrell
Commits on Feb 8, 2012
  1. @kaos

    Pull in lager using git:// rather than https.

    All other submodules use the git protocol.
    Also, on my MacBook Pro, it complained about https being disabled in libcurl... (!?)
    kaos committed Feb 8, 2012
Commits on Feb 2, 2012
  1. @arjan

    Merge branch 'master' into zynamo

    Conflicts:
    	.gitmodules
    	src/scripts/zotonic-debug
    	src/zotonic.erl
    arjan committed Feb 2, 2012
  2. @arjan
  3. @arjan

    Added lager as logging framework

    arjan committed Jan 30, 2012
  4. @kaos
  5. @arjan
Commits on Jan 30, 2012
  1. @arjan

    Fixed typo in TinyMCE. See #286

    arjan committed Jan 30, 2012
Commits on Jan 28, 2012
  1. @arjan
  2. @arjan

    Replaced TinyMCE with latest version. Fixed zmedia plugin.

    Fixes #286
    
    Squashed commit of the following:
    
    commit d5916e7759d46480c9af8639932409ec7eee3976
    Author: Arjan Scherpenisse <arjan@scherpenisse.net>
    Date:   Sat Jan 28 10:59:25 2012 +0100
    
        Remove console.log
    
    commit 4be5c7102d1e0edc1b20304d9eefb89111965b9f
    Author: Arjan Scherpenisse <arjan@scherpenisse.net>
    Date:   Sat Jan 28 10:55:41 2012 +0100
    
        Replaced TinyMCE with latest version. Fixed zmedia plugin.
    arjan committed Jan 28, 2012
Commits on Jan 26, 2012
  1. @arjan

    Merge pull request #285 from AlainODea/master

    Enhance PostgreSQL Security
    arjan committed Jan 26, 2012
  2. @AlainODea

    Enhance PostgreSQL security

    Provide more secure defaults for Host Based Access (pg_hba.conf).
    
     - Use ident in lieu of trust for shell access
    
     - Use md5 in lieu of trust for epgsql access
    AlainODea committed Jan 25, 2012
Commits on Jan 25, 2012
  1. @arjan
  2. @arjan

    Merge remote-tracking branch 'orgin/master' into zynamo

    Conflicts:
    	.gitmodules
    	modules/mod_base/dispatch/dispatch
    	modules/mod_base/resources/resource_api.erl
    	priv/sites/zotonic_status/dispatch/dispatch
    	priv/sites/zotonic_status/lib/css/zp-project.css
    	priv/sites/zotonic_status/modules/mod_zotonic_status_vcs/mod_zotonic_status_vcs.erl
    	priv/sites/zotonic_status/templates/_menu.tpl
    	priv/sites/zotonic_status/templates/base.tpl
    	priv/sites/zotonic_status/templates/stats.tpl
    	src/zotonic_sup.erl
    arjan committed Jan 25, 2012
  3. @arjan

    Added gen_smtp as a submodule.

    (cherry picked from commit 4ed795c)
    
    Conflicts:
    
    	.gitmodules
    arjan committed Dec 21, 2011
  4. @arjan

    Removed gen_smtp in preparation of it being a submodule

    (cherry picked from commit ef2ad0a)
    arjan committed Dec 21, 2011
  5. @mworrell @arjan

    Allow _ and $ as part of the callback identifier.

    (cherry picked from commit e750c19)
    mworrell committed with arjan Jan 11, 2012
  6. @mworrell @arjan

    unplopped

    (cherry picked from commit fd8f68b)
    mworrell committed with arjan Jan 9, 2012
  7. @mworrell @arjan

    Added support for jsop callbacks

    (cherry picked from commit 5932b7d)
    mworrell committed with arjan Jan 9, 2012
  8. @arjan

    Added support for validation error message on radio elements.

    (cherry picked from commit a74679e)
    arjan committed Jan 6, 2012
  9. @arjan

    Added .empty file for extensions dir

    (cherry picked from commit b76dfac)
    arjan committed Jan 4, 2012
  10. @mworrell @arjan

    Added smtp_bounce_email_override in the example config.

    (cherry picked from commit 82b0133)
    mworrell committed with arjan Jan 4, 2012
  11. @mworrell @arjan

    Added default values for relay options. Added option smtp_bounce_emai…

    …l_override to override the VERP for all sites.
    
    (cherry picked from commit a4e6e1d)
    mworrell committed with arjan Jan 4, 2012
  12. @mworrell @arjan

    Fixed typo in config name.

    (cherry picked from commit 556c513)
    mworrell committed with arjan Jan 4, 2012