Permalink
Commits on Jul 1, 2014
  1. mod_survey: Return the (possibly generated) submission id, after insert

    (cherry picked from commit 578d7ff)
    arjan committed Jul 1, 2014
Commits on May 7, 2014
  1. mod_admin: Add option 'show_date' to 'latest resources' admin dashboa…

    …rd widget
    
    (cherry picked from commit c95eef5)
    arjan committed May 7, 2014
Commits on May 1, 2014
Commits on Apr 23, 2014
  1. Backport doc style change

    ArthurClemens committed Apr 23, 2014
  2. doc: Update sidebar of 0.9

    arjan committed Apr 23, 2014
Commits on Apr 18, 2014
  1. Created release 0.9.5.

    arjan committed Apr 18, 2014
  2. Add release notes for 0.9.5

    arjan committed Apr 18, 2014
Commits on Apr 10, 2014
  1. mod_mailinglist: Do not crash when recipientdetails filter encounters…

    … an empty body
    
    (cherry picked from commit 0b53165)
    arjan committed Apr 10, 2014
Commits on Apr 8, 2014
  1. core: fix SVG mime type mapping from ImageMagick identify.

    (cherry picked from commit 486b653)
    mworrell committed Apr 8, 2014
Commits on Mar 31, 2014
  1. doc: Explain all default fields in a resource

    (cherry picked from commit 2b68ecb)
    arjan committed Mar 31, 2014
  2. doc: Explain what a `query resource` is

    Fixes #693
    
    (cherry picked from commit 870ebc1)
    
    Conflicts:
    	doc/manuals/datamodel/search.rst
    arjan committed Mar 31, 2014
Commits on Mar 24, 2014
  1. base: fix NS_ERROR_XPC_BAD_CONVERT_JS on Firefox. Fixes #718

    (cherry picked from commit 03b71e3)
    
    Conflicts:
    	modules/mod_base/lib/js/apps/zotonic-1.0.js
    mworrell committed Mar 24, 2014
Commits on Mar 5, 2014
  1. doc: Update mod_twitter to show how to do Twitter login

    (cherry picked from commit 7429749)
    arjan committed Mar 5, 2014
  2. core: Show error message in admin when a module fails to start

    e.g. when it is missing any dependencies
    
    (cherry picked from commit 8f0b945)
    
    Conflicts:
    	src/support/z_module_manager.erl
    arjan committed Mar 5, 2014
Commits on Feb 13, 2014
  1. core: Update dispatch info on start and stop of a site.

    Fixes #714
    
    This seems to be the most simple solution. Downside is that on Zotonic
    startup the dispatch rules are reloaded several times (for each starting
    site).
    
    (cherry picked from commit e8ef40a)
    arjan committed Feb 13, 2014
Commits on Jan 25, 2014
  1. core: z_utils:json_escape now points to right function in z_json

    (cherry picked from commit ea1c37f)
    arjan committed Jan 25, 2014
Commits on Jan 20, 2014
  1. core: basesite skeleton: install mod_acl_adminonly before mod_authent…

    …ication
    
    Otherwise it won't work, because mod_authentication depends on an acl module.
    
    (cherry picked from commit 720b1ff)
    arjan committed Jan 20, 2014
Commits on Jan 14, 2014
  1. mod_admin_identity: fix identity insert race condition by moving emai…

    …l identity check into the #rsc_update event instead of the async #rsc_update_done event.
    
    (cherry picked from commit 6910a92)
    
    Conflicts:
    	modules/mod_admin_identity/mod_admin_identity.erl
    mworrell committed Jan 14, 2014
Commits on Dec 16, 2013
  1. doc: Clarify the doc page about custom pivots

    (cherry picked from commit bc08dce)
    arjan committed Dec 16, 2013
  2. mod_base: controller_page - make canonical redirect behavior configur…

    …able.
    
    (cherry picked from commit 7962ed5)
    arjan committed Dec 4, 2013
Commits on Dec 4, 2013
  1. mod_base: controller_page - check if page path equals the request path

    This change lets controller_page check if we need to be at a different
    URL when the page path of a resource is set.
    
    If set, we need to redirect there if the current request's path is not
    equal to the resource's path. This prevents duplicated content on
    multiple URLs.
    
    (cherry picked from commit 5cf5147)
    arjan committed Dec 4, 2013
Commits on Nov 27, 2013
  1. mod_survey: Add m_survey:get_questions/2 function

    For retrieving the question data as a proplist.
    
    (cherry picked from commit 0eb5600)
    arjan committed Nov 27, 2013
Commits on Nov 25, 2013
  1. mod_survey: in printable overview, use fallback to column name when n…

    …o column caption has been set.
    
    (cherry picked from commit 3b3cb32)
    arjan committed Nov 25, 2013
Commits on Nov 15, 2013
  1. New eiconv submodule

    arjan committed Nov 15, 2013
Commits on Nov 13, 2013
  1. core: Fix in Zotonic after removing access to the webmachine_request:…

    …send_response/2 function
    
    (cherry picked from commit 4b11b16)
    amiramix committed with arjan Jul 26, 2013
Commits on Nov 6, 2013
  1. z_stdlib: new submodule

    arjan committed Nov 6, 2013
Commits on Nov 5, 2013
Commits on Nov 4, 2013
  1. core: new state machine for maintaining websocket/comet push connecti…

    …ons.
    
    Perpetual comet loop which only polls if there is no active websocket connection.
    Websocket connection checks with a periodic ping/pong if the connection works.
    
    (cherry picked from commit 64181a5)
    
    Conflicts:
    	modules/mod_base/controllers/controller_websocket.erl
    	modules/mod_base/lib/js/apps/zotonic-1.0.js
    
    Also copied the websocket handlers from master, as the sender-pid is needed for the ping.
    mworrell committed Nov 4, 2013
  2. mod_base: use window.location.host for websocket stream, unless confi…

    …gured otherwise.
    
    Also add try/catch around websocket connect, to catch potential IE10 security exception.
    
    (cherry picked from commit 23301e4)
    
    Conflicts:
    	modules/mod_base/lib/js/apps/zotonic-1.0.js
    mworrell committed Nov 4, 2013
Commits on Nov 2, 2013
  1. mod_base: Match the websocket protocol on the WS handshake.

    This fixes websockets on mobile safari 5 for SSL websocket
    connections.
    (cherry picked from commit 3a037d1)
    arjan committed Nov 2, 2013
Commits on Oct 21, 2013
  1. core: for exif lookups, add LANG=en for sensible exif program output …

    …(not for win32 as shell var is used))
    
    (cherry picked from commit 1e19c6c)
    mworrell committed Oct 21, 2013
  2. core: use lower case extensions when guessing mime or file extension.

    (cherry picked from commit 4ae2967)
    mworrell committed Oct 21, 2013