Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 30, 2012
  1. @arjan

    Fixed typo in TinyMCE. See #286

    arjan authored
Commits on Jan 28, 2012
  1. @arjan
  2. @arjan

    Replaced TinyMCE with latest version. Fixed zmedia plugin.

    arjan authored
    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.
Commits on Jan 26, 2012
  1. @arjan

    Merge pull request #285 from AlainODea/master

    arjan authored
    Enhance PostgreSQL Security
  2. @AlainODea

    Enhance PostgreSQL security

    AlainODea authored
    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
Commits on Jan 25, 2012
  1. @arjan

    Added gen_smtp as a submodule.

    arjan authored
    (cherry picked from commit 4ed795c)
    
    Conflicts:
    
    	.gitmodules
  2. @arjan

    Removed gen_smtp in preparation of it being a submodule

    arjan authored
    (cherry picked from commit ef2ad0a)
  3. @mworrell @arjan

    Allow _ and $ as part of the callback identifier.

    mworrell authored arjan committed
    (cherry picked from commit e750c19)
  4. @mworrell @arjan

    unplopped

    mworrell authored arjan committed
    (cherry picked from commit fd8f68b)
  5. @mworrell @arjan

    Added support for jsop callbacks

    mworrell authored arjan committed
    (cherry picked from commit 5932b7d)
  6. @arjan

    Added support for validation error message on radio elements.

    arjan authored
    (cherry picked from commit a74679e)
  7. @arjan

    Added .empty file for extensions dir

    arjan authored
    (cherry picked from commit b76dfac)
  8. @mworrell @arjan

    Added smtp_bounce_email_override in the example config.

    mworrell authored arjan committed
    (cherry picked from commit 82b0133)
  9. @mworrell @arjan

    Added default values for relay options. Added option smtp_bounce_emai…

    mworrell authored arjan committed
    …l_override to override the VERP for all sites.
    
    (cherry picked from commit a4e6e1d)
  10. @mworrell @arjan

    Fixed typo in config name.

    mworrell authored arjan committed
    (cherry picked from commit 556c513)
  11. @mworrell @arjan

    Fixed noreply typo. Added get/2, which is get/1 with default value.

    mworrell authored arjan committed
    (cherry picked from commit 2270746)
  12. @arjan

    Support for "extensions"; system-wide extra user-defined gen_servers.

    arjan authored
    The extensions are always started in the instance, one gen_server per instance.
    (cherry picked from commit b33d58f)
  13. @mworrell @arjan

    Added config keys site.html_elt_extra and site.html_attr_extra to all…

    mworrell authored arjan committed
    …ow for extra site specific html attributes or elements.
    
    (cherry picked from commit 9c39d0c)
  14. @mworrell @arjan

    Allow 'class' attrs.

    mworrell authored arjan committed
    (cherry picked from commit 37df8bb)
  15. @mworrell @arjan

    Added 'valid_elements' to be more in line with the html sanitizer.

    mworrell authored arjan committed
    (cherry picked from commit eae64fd)
  16. @mworrell @arjan

    Added <nav>, <header>, <section> and <article> to the whitelist.

    mworrell authored arjan committed
    (cherry picked from commit aa1aef5)
  17. @arjan

    resource_api: do not start session when not needed.

    arjan authored
    (cherry picked from commit e47caca)
    
    Conflicts:
    
    	modules/mod_base/resources/resource_api.erl
  18. @arjan

    Add 'no session' dispatch rule option to prevent starting a session o…

    arjan authored
    …n a page.
    
    (cherry picked from commit 7a7395a)
    
    Conflicts:
    
    	modules/mod_base/dispatch/dispatch
    	modules/mod_base/resources/resource_api.erl
  19. @arjan

    z_convert added ip_to_long/1 and long_to_ip/1.

    arjan authored
    (cherry picked from commit e3ffdec)
  20. @arjan

    Prettified the zotonic status commandline script

    arjan authored
    (cherry picked from commit 6c13c18)
  21. @arjan

    Start sites dispatcher *after* sites manager so we can directly colle…

    arjan authored
    …ct dispatch rules in dispatcher's init/1.
    
    (cherry picked from commit 15e8114)
  22. @arjan

    When postgres exists normally, dont print info report.

    arjan authored
    (cherry picked from commit c265bed)
  23. @arjan

    Fix calls to z_sites_dispatcher:update_dispatchinfo/0

    arjan authored
    (cherry picked from commit 240b601)
  24. @arjan

    Refactored the collecting of dispatch rules.

    arjan authored
    z_sites_dispatcher now, after startup, collects its rules again after
    2 seconds (in case it has crashed)
    (cherry picked from commit 2e632eb)
  25. @arjan

    Fixed crash in inotify server of mod_development.

    arjan authored
    (cherry picked from commit 53fa81d)
  26. @arjan
  27. @arjan

    Added support for updating Zotonic and sites over Git in zotonic_stat…

    arjan authored
    …us site.
    
    (cherry picked from commit feae5e6)
    
    Conflicts:
    
    	priv/sites/zotonic_status/modules/mod_zotonic_status_vcs/mod_zotonic_status_vcs.erl
  28. @arjan

    Gave a fresh new look to zotonic_status, similar to Zotonic.com.

    arjan authored
    The default page no longer shows a list of sites because that confuses
    most people. Instead it displays an explanation message and a login
    box (the password of which can now be remembered with a pw manager).
    (cherry picked from commit fbaac30)
Commits on Jan 21, 2012
  1. @arjan

    Bugfixes in m_edge:replace/4.

    arjan authored
    - flush cache of subject and objects
    - do not crash when new objects is empty list
  2. @arjan
Something went wrong with that request. Please try again.