Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 16, 2012
  1. Marc Worrell
Commits on Feb 2, 2012
  1. Arjan Scherpenisse

    Merge branch 'master' into zynamo

    arjan authored
    Conflicts:
    	.gitmodules
    	src/scripts/zotonic-debug
    	src/zotonic.erl
  2. Arjan Scherpenisse
  3. Andreas Stenius
  4. Arjan Scherpenisse
Commits on Jan 30, 2012
  1. Arjan Scherpenisse

    Fixed typo in TinyMCE. See #286

    arjan authored
Commits on Jan 28, 2012
  1. Arjan Scherpenisse

    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 25, 2012
  1. Arjan Scherpenisse

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

    arjan authored
    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
  2. Marc Worrell Arjan Scherpenisse

    Allow _ and $ as part of the callback identifier.

    mworrell authored arjan committed
    (cherry picked from commit e750c19)
  3. Marc Worrell Arjan Scherpenisse

    unplopped

    mworrell authored arjan committed
    (cherry picked from commit fd8f68b)
  4. Marc Worrell Arjan Scherpenisse

    Added support for jsop callbacks

    mworrell authored arjan committed
    (cherry picked from commit 5932b7d)
  5. Arjan Scherpenisse

    Added support for validation error message on radio elements.

    arjan authored
    (cherry picked from commit a74679e)
  6. Marc Worrell Arjan Scherpenisse

    Allow 'class' attrs.

    mworrell authored arjan committed
    (cherry picked from commit 37df8bb)
  7. Marc Worrell Arjan Scherpenisse

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

    mworrell authored arjan committed
    (cherry picked from commit eae64fd)
  8. Arjan Scherpenisse

    resource_api: do not start session when not needed.

    arjan authored
    (cherry picked from commit e47caca)
    
    Conflicts:
    
    	modules/mod_base/resources/resource_api.erl
  9. Arjan Scherpenisse

    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
  10. Arjan Scherpenisse

    Fix calls to z_sites_dispatcher:update_dispatchinfo/0

    arjan authored
    (cherry picked from commit 240b601)
  11. Arjan Scherpenisse

    Fixed crash in inotify server of mod_development.

    arjan authored
    (cherry picked from commit 53fa81d)
Commits on Jan 19, 2012
  1. Maas-Maarten Zeeman

    Also refactored postback_notify. The refactor is backward compatible …

    mmzeeman authored
    …for postbacks, but not for notifications. The notification now also contains the trigger and target ids of the elements. This can lead to crashes in code which did not use records for notifications.
  2. Maas-Maarten Zeeman

    Oops trigger should be form

    mmzeeman authored
  3. Maas-Maarten Zeeman
  4. Maas-Maarten Zeeman
  5. Maas-Maarten Zeeman

    Backward compatible refactor. Moved submit and postback to records in…

    mmzeeman authored
    … order to make things more clear and remove the _TriggerId, _TargetId (or was it vice versa?) code. Todo are drag, drop, postback_notify and sort events.
Commits on Jan 18, 2012
  1. Added a range filter to easily generate lists with integers. Syntax: …

    Maas authored
    …18|range:70 -> [18, 19, .., 70] or 2012|range:1900:'-1' -> [2012, 2011, .., 1900]
Commits on Jan 16, 2012
  1. Marc Worrell
Commits on Jan 11, 2012
  1. Arjan Scherpenisse
  2. Arjan Scherpenisse
  3. Arjan Scherpenisse
  4. Taavi Talvik
  5. Arjan Scherpenisse

    Twitter and Facebook modules now also use #logon_ready_page observe p…

    arjan authored
    …attern after successful logon.
  6. Taavi Talvik
  7. Marc Worrell
  8. Taavi Talvik

    More Estonian translations.

    taavi013 authored
  9. Taavi Talvik

    Add Estonian translations

    taavi013 authored
Commits on Jan 10, 2012
  1. Arjan Scherpenisse

    mod_oauth: more refactoring; API services defined in site modules now…

    arjan authored
    … also work.
    
    They did not have the mod_ prefix so required some more fiddling.
Something went wrong with that request. Please try again.