Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Dec 07, 2010
Maas-Maarten Zeeman Added a signal model to use signal values in templates 68219f1
Commits on Dec 21, 2010
Maas-Maarten Zeeman Configurable from address for contact email 5ff9db9
Commits on Dec 24, 2010
@mworrell mworrell Fix for finding users, select only identity records with type 'userna…
Commits on Jan 04, 2011
@mworrell mworrell Show selected tab in location hash. Thanks to Joost Faber. b040ecb
@mworrell mworrell Fix for typo. a883e15
Commits on Jan 05, 2011
Maas-Maarten Zeeman Extended the lib tag with a 'use_absolute_url' option. c9d8577
@mworrell mworrell Added support for MS Office 2007 mime types. Extended mime type colum…
…n of medium table.
Commits on Jan 10, 2011
@mworrell mworrell Only mark the persistent store as dirty when a persistent value changes. a3bc779
Commits on Jan 11, 2011
@mworrell mworrell Better handling for undefined date_end values. With thanks to Michael…
… Connors.

This fixes issue #132.
@mworrell mworrell Fixes issue #130.
Patch for wrong camel-case content-type header on http put requests.
With thanks to hellamer.
Maas-Maarten Zeeman Typo 40cdd84
Commits on Jan 13, 2011
@mworrell mworrell Select language using the Accept-Language header. Store selected lang…
…uage in the persistent state.

Added extra session init/context foldl for initializing the correct language with a session.
@mworrell mworrell Fix for a problem where a postgres connection was not returned to the…
… pool in case of a sql error.

This refers to issue #129.
Commits on Jan 17, 2011
@mworrell mworrell Fix for a problem where files without a preview where not showing an …
Commits on Jan 18, 2011
@mworrell mworrell Added filesizeformat filter, similar to the Django filesizeformat fil…
@mworrell mworrell Accept non integer values for filesizeformat. 041ad8a
@mworrell mworrell Set the user's prefered language as the 'pref_language' property. Thi…
…s is also used when sending e-mails.
@mworrell mworrell This fixes issue #134.
Fix for sort order of months.  Thanks to Igor Goryachev
Commits on Jan 20, 2011
@arjan arjan mod_mailinglist: Added dutch translations and label tweaks. ccb3c19
Commits on Jan 21, 2011
@AtillaE AtillaE quickfix for status login bug 6bad613
Commits on Jan 24, 2011
@mworrell mworrell Added 'recipient_id' to some e-mails so that the e-mails are sent in …
…the correct language.
@mworrell mworrell Check result of application:start(zotonic) ea3aff7
@mworrell mworrell Set the preferred language of the new user to the current context lan…
@mworrell mworrell Allow z_context:get_persistent/2 to be called without a session. 9a05964
Commits on Jan 25, 2011
@AtillaE AtillaE new mochiweb version 558dc49
@AtillaE AtillaE mochiweb changes merged a5ec6ce
@AtillaE AtillaE fixed an DoS vulnerability in Mochiweb/SSL ae53abb
@mworrell mworrell Some extra pieces of MochiWeb, from the merge at rev 0f63267808f679d6…
@mworrell mworrell Added rebar to mochiweb d5e3b3e
@mworrell mworrell Allow #upload{} as a insert_file parameter. a4afe4c
Commits on Jan 27, 2011
@mworrell mworrell Simple delayed wire. Trigger actions when an element becomes visible. 1fea80e
Maas-Maarten Zeeman Prevent a lost z_context increment 7da3a96
Maas-Maarten Zeeman Cookie expire date format string now follows rfc2109 ce82e91
Commits on Feb 01, 2011
@mworrell mworrell Async notification support for pgsql c81f76d
@mworrell mworrell Build.cmd patch, adds gen_smtp ad83746
@mworrell mworrell Added Steve Strong as a contributor. Thank you for the pgsql and buil…
…d.cmd patches!
@mworrell mworrell New Google Analytics tracker code. With thanks to Richard Fergie. 9a31104
@mworrell mworrell Don't track the 'admin' user with Google Analytics. 355cbd1
@mworrell mworrell Fix for button click event falling through. Added to_id/1 pattern for…
… generic tuples.
@mworrell mworrell Change call to identify to not pipe stderr to /dev/null. For Windows …
…compatibility. With thanks to Steve Strong.
Commits on Feb 03, 2011
@mworrell mworrell Added a fallback option to the redirect when the browser history is e…
@mworrell mworrell Translate more #trans and date values in the output lists. 742e594
Commits on Feb 04, 2011
@mworrell mworrell Zotonic Unified Command Line Interface.
From pull request #5 on GitHub.
By Alain O'Dea and Lloyd R. Prentice
@mworrell mworrell Added Lloyd as an author/ copyright holder. 483b1fc
Commits on Feb 07, 2011
Atilla Erdodi Added flusing for most periodic internal messages (e.g. tick, poll) 7fcde6f
Atilla Erdodi Added flushing of poll messages to 'mod_emailer' 7c54e67
@mworrell mworrell Added .rar mime type. Fixed problem where 'identify' still showed som…
…e warnings.
Commits on Feb 08, 2011
@mworrell mworrell Fix for a problem where z_submitter was not sent when using 'post' fo…
…r a form.
Commits on Feb 10, 2011
@mworrell mworrell Immediate pivot of pivot title, also force to lower case for better s…
@mworrell mworrell Identity open office and broken msoffice files. 45c46b3
@mworrell mworrell Make .jpg the default jpeg extension. 832783e
@mworrell mworrell Better cache control for non-public images. Fix for content dispositi…
…on of chunked downloads.
@mworrell mworrell Set the language when continuing an existing session. 6ae7c8b
@mworrell mworrell Work in progress. a3123c3
@arjan arjan New filter: menu_trail
this filter generates a trail of all menu parents for the current
page. This can be used to generate a breadcrumb or to highlight which
part of the menu is selected.
@arjan arjan Merged 6911275
@arjan arjan mod_menu - support for multiple menu's per site.
You can now have more than one distinct menu. A menu has become a page
of type "page menu", and the menu can be edited on the regular edit
Commits on Feb 11, 2011
@arjan arjan menu_trail filter: add menu_id argument. bcdb1fc
@arjan arjan mod_menu - Remove the space in front of "current" class. bf1dcad
@mworrell mworrell Added support for custom target and template names. a8cf043
@mworrell mworrell Use mochiweb_socket, so ssl websockets can be supported. f68d61b
Commits on Feb 12, 2011
@arjan arjan mod_menu - Remove obsolete menu managing from z_datamodel functions. d305ec2
@arjan arjan merged 4a20df5
@arjan arjan Fixed reordering of edges by preventing double-nesting of db transact…
@arjan arjan Release 0.6.0 f2a0dbe
@arjan arjan Added tag release-0.6.0 for changeset 592ae443e322 038b9ed
@mworrell mworrell Show the 'voorvoegsel' field for nl, de languages. 6c91cc3
@mworrell mworrell Add identify/2 for #upload records. 2757ab8
@mworrell mworrell Small style fix for non-translation editing of the body. c02ce6c
@mworrell mworrell Added support for subscribing persons in the database to a mailinglist. 415458d
Commits on Feb 13, 2011
@arjan arjan Mailinglist - fix database updater c5852d6
Commits on Feb 14, 2011
@arjan arjan Fixed zotonic-stop command by using -name instead of -sname 39d4a48
@mworrell mworrell Make the '#' optional, added 'hash' parameter. 6636edd
@arjan arjan Services API tweaks
 - application/json = default content type
 - fix anonymous access in resource_api
 - fix OAuth access in resource_api
@arjan arjan merged 2de38bd
Commits on Feb 15, 2011
@mworrell mworrell Added flipchart mime type. ab24f9b
@mworrell mworrell Fixes for looking up flipchart, upper case extensions and mime icons. c99aa19
@mworrell mworrell Fix for getValue on an empty select element. 5b187c1
@mworrell mworrell Make pivoting dates more resilient against illegal dates. 722ec31
@mworrell mworrell Fix on last pivot fix. eb27153
@arjan arjan Made group_title_firstchar filter work with translatable content. 753e35e
Commits on Feb 16, 2011
@arjan arjan Fix up base/info service -- add translation lookup to administrator t…
Commits on Feb 17, 2011
@arjan arjan Small tweak to atom entries, better follow atom spec 835b308
@arjan arjan Remove link to atom_feed from mod_base's base template to remove depe…
…ndency on mod_atom_feed.
@mworrell mworrell Fetch the widget options from data-... attributes instead from in the…
… element's class. The class is still parsed for backwards compatibility.
@mworrell mworrell Move widget options to data-... attributes. 1c7a346
@mworrell mworrell merged 6224f23
@mworrell mworrell Remove newlines before parsing the widget options. b4c448d
@mworrell mworrell always call the widgetManager when inserting content. 2af222a
@mworrell mworrell Added 'visible' option, triggers the moreresults action on visible of…
… the element instead of on click.
@mworrell mworrell Added z_comet to the list of zotonic query args. 71f059f
@mworrell mworrell Do not start a session when there is no session. a75cc8a
Commits on Feb 18, 2011
@mworrell mworrell Make sure that labels are converted to strings. 6d821f2
@mworrell mworrell Intermediate revision to survey module. Better questions, fixes for e…
…ditor, result page.
@mworrell mworrell Added 'if' filter. 4bd3976
@mworrell mworrell Added missing mailinglist footer template. e16ccc6
@mworrell mworrell Changes in the acl_add_sql_check notification, now uses a record, inc…
…luding the search sql.

Added 'is_published' search option, values are true|false|all.
Commits on Feb 21, 2011
@mworrell mworrell Added visibility toggle to mod_comment. 0a7a5a5
@mworrell mworrell Added support for generic msoffice mime type returned by 'file' d791f4c
@mworrell mworrell Fix for resetting the textarea after committing the comment. 0b5f16d
@mworrell mworrell Clear textarea and input fields after a comment has been posted. 4587f25
@mworrell mworrell Added randomize filter, shuffles a list. 66b4eaa
Commits on Feb 22, 2011
@mworrell mworrell Added 'matching' type of question and results view for select in 'nar…
@mworrell mworrell Wired the 'postback_notify' event directly into the postback/websocke…
…ts resources. This makes javascript triggered postbacks more flexible and simpler.
@mworrell mworrell Allow data_xxxx attributes, which map to html5 'data-xxxx' attributes. c80912c
@mworrell mworrell Added 'do_slideshow' widget. Needs a data-slideshow with the id of th…
…e elements to be shown in a slideshow dialog.
@mworrell mworrell Added cursor property for do_slideshow elements. 04e2098
@mworrell mworrell Fix for validator, empty string should pass the format validation. 4d452c0
@mworrell mworrell Fix for black background when previewing transparent images as jpeg. abe8eb8
Commits on Feb 25, 2011
@arjan arjan Fix lib tag for including multiple files directly from the toplevel '…
…lib' folder.

Fixes issue 143
@arjan arjan Release depcache locks immediately after exception in z:memo().
Fixes issue 136
@arjan arjan Use translation lookup in internal link action.
Fixes issue 133
Commits on Feb 26, 2011
@arjan arjan Make dispatch rule reloading more stable.
When reloading dispatch rules, crash when there is a syntax error, and
keep the old dispatch rules in this case.

Also show a warning to the user in the admin, and do it only once when
hitting the "reload modules" button, not twice.

Fixes issue 117
@arjan arjan Make zotonic-1.0.js compatible with jQuery 1.5 9e92f16
Commits on Feb 28, 2011
@mworrell mworrell Added form reset action. Fix for submit/reset of 'closest' form. Fix …
…for IE problem with inputoverlay.
@mworrell mworrell Added missing do_slideshow parts. e2c006c
@mworrell mworrell Let do_inputoverlay also work for textareas a5af5d0
@mworrell mworrell Removed debug dde71ea
@mworrell mworrell Fixes for submit/reset actions. 9a597a2
@mworrell mworrell Fixes for notify postbacks. 0de3580
Commits on Mar 01, 2011
@mworrell mworrell Added 'propagate' option to event action (wire scomp). This prevents …
…canceling the event after being handled.

Fix for inputoverlay not being called on form reset.
@mworrell mworrell Added created column to overview. 92e92a9
@mworrell mworrell New pot files 9566a3e
Commits on Mar 02, 2011
@arjan arjan Make z_utils:url_decode/1 work and add unit tests.
This fixes issue 151
Commits on Mar 03, 2011
@mworrell mworrell Better embedding of images. Now fetches the image using the rights of…
… the sender. Also initialises the random number generator for the inline image cids.
@mworrell mworrell Removed content disposition of 'inline' images. 5f99beb
@mworrell mworrell Add X-Attachment-Id to embedded images. 09395d0
@mworrell mworrell Added plain text alternative to sent e-mails. Based on markdown text …
…of the html.
Commits on Mar 04, 2011
@mworrell mworrell Added 'acl' option, similar to the acl option of the resource_template. 185ecd8
@mworrell mworrell Better feedback when a validation fails on form submit.
Fix for order that validations are applied, is now the order as specified in the template.
@mworrell mworrell Added 'is_public' and 'ongoing' query terms. 1865177
@mworrell mworrell Added z_template:render/2 to render a #render{} record. b823b3e
@mworrell mworrell Added poll, including poll templates. A poll should have a start/end …
…date, used for displaying.
Commits on Mar 05, 2011
@arjan arjan z_media_tag: Ensure that the generated URL is a binary, even if it's …
Commits on Mar 06, 2011
@arjan arjan Fix for editing content which used to be multilingual but is no longe…
…r multilingual.

Do not consider the "languages" prop when checking which languages are
given, but extract the language from the prop keys (e.g. from
@arjan arjan backport changeset 05a5254b6c92 - Fix for embedded media not showing up 5a4a5d5
@arjan arjan Fix translation statistics for modules in places other than modules/ 19d6f60
@arjan arjan Fix month/day name capitalization: dutch does not do capitalization. 4f9e6bb
@arjan arjan Backport to release-0.6.x from r1823: Fix TinyMCE double initializati…
…on for the rsc-body.
Commits on Mar 07, 2011
@mworrell mworrell More subtle error message when form does not validate. fba5c2b
@mworrell mworrell Fix for a problem where the substr of translated binaries was taken. d32288c
@mworrell mworrell Fix for binary format string. 5affa00
@mworrell mworrell Fix for binary results from translations. 97a4bf2
@mworrell mworrell Made do_listfilter more generic. 6cc0bb1
@mworrell mworrell Make erlydtl_dateformat a binary. Correct handling of binaries or lis…
…ts for day/month representations. Re-enable test set.
@mworrell mworrell Allow institutions to have an username/password. 57ee425
@mworrell mworrell Show date range for surveys. Always show poll results. 0946157
@mworrell mworrell Added license. 6c12911
Commits on Mar 08, 2011
@mworrell mworrell merged 8c88354
@mworrell mworrell Let the 'remeber me' be valid for 10 years or so instead of two weeks. 4f45dcb
@mworrell mworrell Fix for max_age of persist cookie 26b3822
@mworrell mworrell Also rename rememberme labels here. ed8d6b7
@mworrell mworrell new translations and pot files. 9dea6bc
Commits on Mar 10, 2011
@mworrell mworrell Updated modernizr, fixes hanging bug in Chrome. d4cb0f0
@arjan arjan Backport to release-0.6.x from r1858: Fix unnecessary sharpen in loss…
…less (PNG) images.
@arjan arjan Backported fix for issue 158 to 0.6 (twitter images) 66c6360
@mworrell mworrell Added survey result download in CSV (tab delimited) format. f2662a7
@mworrell mworrell merged 2adce69
Commits on Mar 11, 2011
@mworrell mworrell Allow to specify 'propagate' with the wire scomp 4c720d7
@mworrell mworrell Added download link to survey results. Also changed tab delimited res…
…ults file to comma delimited file.
@mworrell mworrell Hide results when user is not allowed to see the results. db69908
@mworrell mworrell Fix for editing multilingual content with or without mod_translation. 7949b39
Commits on Mar 15, 2011
@mworrell mworrell Added possibility to have 'undefined' array values. 7a8c8ea
@mworrell mworrell Fix for arrays with only one element. 6520f50
@mworrell mworrell Log an error when we run into a compile error. d5a5e80
Commits on Mar 16, 2011
@mworrell mworrell Added license text. 29976ee
@mworrell mworrell Simple expression evaluator, makes use of the erlydtl parser and runt…
@mworrell mworrell Added conditional jumps on page breaks. Added missing license texts. 383cb61
@mworrell mworrell Added fix for 'file' utility identification error on mpeg files. 2c98899
Commits on Mar 17, 2011
@arjan arjan Fix solr searching because z_convert:to_isotime now returns a binary. 6823018
Commits on Mar 18, 2011
@mworrell mworrell Added l10n module for further localization. Currently implements a li…
…st of languages by iso code with translations.
@mworrell mworrell Added a 'whereis' api to z_module_manager to find the pid of a runnin…
…g module.
@mworrell mworrell Fix for mod_l10n description. 599817f
Commits on Mar 22, 2011
@mworrell mworrell Fixes for pivoting country names. Expands iso code to country names i…
…n languages as defined in the page. Only use the english postgresql indexing to prevent problems when searching in other languages.
@mworrell mworrell Map upper case iso to lower case for pivoting. 8ae105a
Commits on Mar 24, 2011
@arjan arjan Backport to release-0.6.x from r1915: Allow for recursive file lookup…
…s in z_module_indexer:scan_subdir/4
@mworrell mworrell merged bc7700d
@arjan arjan Fix menu fetching on 0.6; update docs 1baed13
@arjan arjan merged 4b27c9c
@arjan arjan Remove string reversal from mod_logging which was previously needed.
Fixes issue 153
Commits on Mar 28, 2011
@mworrell mworrell Workaround for validations of elements that are removed. Needs better…
… solution.
Commits on Mar 29, 2011
@mworrell mworrell Fixes for dynamic changes in LiveValidation checked forms. Keep the a…
…dministration of LiveValidation objects in the data() of the form elements. So that you can dynamically add/remove elements without the LiveValidationForm object getting out of sync.
Commits on Apr 05, 2011
@arjan arjan Fixed essential typo in mailinglist module. 8d78344
Commits on Apr 07, 2011
@arjan arjan Backport to release-0.6.x from r1938: Only use gzip encoding for mime…
… types that actually benefit from it.
@mworrell mworrell Prevent retry loop when providing an illegal page id 5ce7b7f
Commits on Apr 11, 2011
@arjan arjan Backport to release-0.6.x from r1942: Compile the Zotonic behaviours …
…before the other source files.
Commits on Apr 12, 2011
@mworrell mworrell Move the init of non-gen_server modules to the dummy module process i…
…nstead of the module manager's process.
@mworrell mworrell Added user_from_page/1 and user_from_session/1 to derive the user id …
…from a page or session pid.
@mworrell mworrell Fix for a problem where the 'appear' was called on the enclosing cont…
…ainer for insert_top/bottom instead of the inserted html fragment.
@mworrell mworrell Part of previous commit to fetch user_id from page pid. dd4a421
@mworrell mworrell Added do_popupwindow widget to open a link in a popup window. 5bbd358
@mworrell mworrell Replace textual smiley codes with images. 0e146fa
@mworrell mworrell Added copyright/license. 4165c26
@mworrell mworrell Supervisor for named processes, based on Erlang's supervisor.erl 1761d3a
@mworrell mworrell Added firefox smiley. 5f9be4e
@mworrell mworrell Fix for a problem where widgetManager is only called for the first el…
…ement in the jquery context.
@mworrell mworrell Fix for popupwindow namespace. 1cfcc30
Commits on Apr 21, 2011
@mworrell mworrell Fixes for window name on IE, and fixes for correcting size of popup a…
…fter opening window.
@mworrell mworrell Delayed size correction, Chrome returns 0 when the window is just ope…
Commits on Apr 23, 2011
@AtillaE AtillaE Activity Streams 5c20a97
Commits on Apr 25, 2011
@helllamer helllamer jquery actions insert_before, after, replace cc3dfbd
Commits on Apr 26, 2011
@mworrell mworrell Added support for anchors and tables to markdown translators. 0f9b710
@mworrell mworrell Added no_html option to html2markdown filter. 56714f0
@mworrell mworrell Make it possible to pass additional variables to the rendered result …
@mworrell mworrell Use the no_html option when translating html to plain text. f7fba49
@mworrell mworrell Fix for z_render:set_value/3 cdce279
@mworrell mworrell Allow property names as string values. ce8617c
Commits on May 09, 2011
@mworrell mworrell Added cc to email record. 2f48381
@mworrell mworrell Added support for Cc 54410ea
@mworrell mworrell let os_escape of undefined return [] 073a25c
@mworrell mworrell Fix translation table references when pivoting resources. 1a812d5
@mworrell mworrell Added 'full' option for popup windows. 575d749
Commits on May 10, 2011
@mworrell mworrell Added live updating do_timesince. Added z_translate function, uses a …
…lookup object to find translations. Fixed local/utc time problem in 'U' date format. Fixed copyright name in smiley.
@mworrell mworrell Fix for site/hostname mixup. 4743325
Commits on May 12, 2011
@mworrell mworrell Fix for opening a window in 'full screen' size. caa968c
@mworrell mworrell Echo q.username so that we can have direct link to the password remin…
…der when we know the username.
Commits on May 13, 2011
@mworrell mworrell Added version to activity record. 5df8b54
@mworrell mworrell Added missing survey_results resource. 51998dc
@mworrell mworrell Added notifications on edge insert/delete. Incomplete but good enough. 6e3538a
Commits on May 16, 2011
@mworrell mworrell Made session timeout configurable, use site.session_expire_1 and site…
Commits on May 17, 2011
@mworrell mworrell Added upgrade handler. 0cec3d4
@mworrell mworrell Fixes issue 177.
Don't create a new table when loading the translations, instead sync translations into the existing table.
@mworrell mworrell Automatically cleanup temporary files when the request process is sto…
@AtillaE AtillaE added notification for comments 65ea40c
Commits on May 19, 2011
@mworrell mworrell Allow more than one do_ widget per element. 4ad16b0
@mworrell mworrell Fix for resizing images embedded in e-mails. 11e56cc
Commits on May 20, 2011
@mworrell mworrell Added Google Analytics _trackEvent do_gaq_track 3baf960
Commits on May 24, 2011
@mworrell mworrell Added m.comment.get for a comment_id 70b73de
@mworrell mworrell Added reload of pages on logon or logoff - first part of smarter sess…
…ion management and open pages.
@mworrell mworrell Let the reload action take into account the continuation page of a lo…
…gon screen.
Commits on Jun 09, 2011
@mworrell mworrell Merging 0.7 email additions to help with site transitions from 0.6 to…
… 0.7
@mworrell mworrell Added to_flatlist/1 8648bff
@mworrell mworrell Making the code compatible with 0.6 and 0.7 df05622
Commits on Jun 15, 2011
@arjan arjan Backport to release-0.6.x from r2070: Fix mailinglist upload button f…
…or changed #upload{} record.
Commits on Jun 17, 2011
@mworrell mworrell Added 'attachments' field to email record, for easing upgrading 0.6 s…
…ites to 0.7.
@mworrell mworrell merged 25ee3b5
Commits on Jun 18, 2011
@arjan arjan Backport to release-0.6.x from r2080: Fixed a bug in mod_acl_simple_r…
…oles which caused a NULL violation when setting visible_for.
Commits on Jun 23, 2011
@mworrell mworrell Added newer jquery and jquery ui to fix drag problems in IE9 76cdd87
@arjan arjan Backport to release-0.6.x from r2098: fieldreplace: Removed toggle cl…
…ass from click handler, because change handler is also triggered.
Commits on Jun 24, 2011
@mworrell mworrell Remove <style> tags when converting html to markdown. eecb20c
Commits on Jul 06, 2011
@arjan arjan Added tag release-0.6.1 for changeset eeece92b6861 8663613
@arjan arjan Removed tag release-0.6.1 e95868a
@arjan arjan Updated version number. 5af514b
@arjan arjan Added tag release-0.6.1 for changeset 15ce73c3f0d4 2c9cd01
@arjan arjan Removed tag release-0.6.1 f2e7c79
@arjan arjan updated 778b1f5
@arjan arjan Removed tag release-0.6.1 0978a21
@arjan arjan Added tag release-0.6.1 for changeset 3f2e48289642 dc2913f
@arjan arjan Removed tag release-0.6.1 5a9a248
@arjan arjan Final preparation for 0.6.1 0b95aab