Skip to content

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.
Commits on Jul 28, 2011
@arjan arjan Added tag release-0.7.0 for changeset f8160d005a86 2929f07
@arjan arjan Backport to release-0.7.x from r2233: Doc fixes and fixed wrapping of…
… homepage links.
Commits on Aug 01, 2011
@arjan arjan Backport to release-0.7.x from r2237: Added resource_menu_admin_menu …
…again which was removed by accident.
@arjan arjan Backport to release-0.7.x from r2239: mod_menu: Removed debug statement. 18d7371
Commits on Aug 02, 2011
@arjan arjan Backport to release-0.7.x from r2241: Reworked the way mod_logging no…
…tifies the log pages; it now uses
Commits on Aug 03, 2011
@arjan arjan Backport to release-0.7.x from r2247: Fixed quality=xx parameter to {…
…% image %}.
@arjan arjan Backport to release-0.7.x from r2249: Added mod_signal to the default…
… list of installed modules.
@arjan arjan Created release 0.7.1. 8260e54
@arjan arjan Added tag release-0.7.1 for changeset 90795510b775 41566d8
@arjan arjan Backport to 0.7.x from r2253: Greatly iproved the mailinglist feedback. 9f2d30b
@arjan arjan Backport to 0.7.x from r2255: Added support for varying overview list…
…s in the admin on category.
Commits on Aug 04, 2011
@arjan arjan Backport to 0.7.x from r2257: Added administration of worker processe…
…s to email server.
Commits on Aug 10, 2011
@arjan arjan Backport to 0.7.x from r2265: mod_facebook: make 'scope' parameter co…
@arjan arjan Backport to 0.7.x from r2267: On win32, mime type returned as applica…
…tion/octet for all files.
Commits on Aug 12, 2011
@arjan arjan Backport to 0.7.x from r2269: Added spanish translation and install t…
…he spanish language by default and enable it.
@arjan arjan Backport to 0.7.x from r2271: Added a file with the translators per l…
Commits on Aug 14, 2011
@arjan arjan Backport: Scan all erlang files in the modules for translatable strings. eaf22cd
Commits on Aug 15, 2011
@arjan arjan Backport to 0.7.x from r2280: Added missing file db5282d
@arjan arjan Backport to 0.7.x from r2282: Added 2 new translation template files. 7f32e34
Commits on Aug 18, 2011
@arjan arjan Backport to 0.7.x from r2291: mod_survey: made questions configurably…
… required or not.
Commits on Sep 05, 2011
@arjan arjan Backport to 0.7.x from r2314: Add check in zotonic-addsite to see if …
…the given site name is valid.
Commits on Sep 06, 2011
@AlainODea AlainODea Ignore compile output and runtime generated files
 - Convert .hgignore to .gitignore

 - Add rules to skip temporary site files used for upload and preview
(cherry picked from commit 5c2e8f9)
Commits on Sep 07, 2011
@arjan arjan mod_mailinglist - updated translations, removed references to mod_ema…

(cherry picked from commit aad24bc)
@arjan arjan mod_mailinglist - Fixed using the configured address in mailinglist r…
…sc as the "from" address.

(cherry picked from commit c2853ae)
@arjan arjan tiny_mce: Fixed the disappearing of inline images. Fixes issue #203.
Known TinyMCE issue. Should be addressed in tinymce project:
(cherry picked from commit 988e597)
Commits on Sep 08, 2011
@arjan arjan Tooltip Y position is now dependent on its height. Fixes issue #207
(cherry picked from commit 21dd694)
@arjan arjan Disregard stderr output from identify command. Fixes issue #206
(cherry picked from commit 6c59701)
@arjan arjan Make windows users happy when redirecting stderr.
(cherry picked from commit 368b21f)
@arjan arjan Added dutch month/day names to mod_l10n.
(cherry picked from commit d4105c4)
@arjan arjan Added dutch translation for mod_survey; small template tweaks. Fixes #…

(cherry picked from commit c92925c)
Commits on Sep 12, 2011
@arjan arjan z_datamodel: do not try to resolve 'undefined' in valid_for check
(cherry picked from commit b61d990)
@arjan arjan Generalized group_title_firstchar filter into group_firstchar.
It can now filter on any given rsc property, e.g. name_surname for
lists of persons. The assumption is that the input rsc list is already
sorted on the property.
(cherry picked from commit dc608a8)
@arjan arjan Added date_start_year= and date_end_year= search filters to filter on…
… year of date start/end.

(cherry picked from commit 2ce4a42)
Commits on Sep 14, 2011
@arjan arjan Fix infinite recursion in sub_month/3 filter.
(cherry picked from commit 36a9c79)
@arjan arjan mod_import_csv: Added import button to admin status page.
Also replaced custom date conversion with standard z_convert calls,
and added support for importing date_{start,end} as dates.
(cherry picked from commit 55cbdc5)
Commits on Sep 19, 2011
@arjan arjan m_rsc_update emptied the pivot_date_* fields when date_ fields where …
…not part of the update.

This fix also repivots the date fields on every pivot, not only on real updates.
(cherry picked from commit 8efa2a6)
Commits on Sep 21, 2011
@arjan arjan Added application/x-font-woff for webfonts.
(cherry picked from commit b6996b1)
Commits on Sep 28, 2011
@arjan arjan Re-added the option of test-sending a mailinglist page to a single ad…

This time it does not use a separate template but uses the mailinglist
template and the test mailinglist.
(cherry picked from commit 70f6866)
Commits on Sep 29, 2011
@arjan arjan Removed already_sent check from mod_mailinglist, which is not needed …
…since the new interface.

(cherry picked from commit eba00bc)
Commits on Sep 30, 2011
@arjan arjan Allow modules to override admin TinyMCE options which were originally…
… set in admin-common.js

This is done by all-cat-including a template which should contain javascript.
(cherry picked from commit 3d79c3a)
Commits on Oct 01, 2011
@arjan arjan Addressed the issues in the backup module. Fixes #220
Admin backup page now shows if the backup is configured correctly,
e.g. if it can find the commands needed to perform the backup.
(cherry picked from commit db078cf)
@arjan arjan mod_backup: make sure we have an archive dir before archiving.
(cherry picked from commit d886544)
Commits on Oct 03, 2011
@arjan arjan Added option email_bounce_override to override bounce email address.
Fixes #211. Thanks to Michael Schreckenbauer.
(cherry picked from commit a1f4521)
Commits on Oct 05, 2011
@arjan arjan Allow id to be either number or unique name for resource_admin_edit.
Fixes #224
(cherry picked from commit 67e4744)
@arjan arjan Export z_session_manager:get_session_id/1.
(cherry picked from commit df0333c)
Commits on Oct 06, 2011
@arjan arjan z_html: do not escape/strip HTML when a property name ends in _html.
This is in addition to the two hardcoded property names 'body' and 'body_extra'.
(cherry picked from commit b8bc9b9)
@arjan arjan mod_survey: quick hack to put email validation on a field if you name…
… it 'email'.

(cherry picked from commit e752745)
Commits on Oct 07, 2011
@arjan arjan z_html:escape_props/1 - Make selecting escape function more safe.
(cherry picked from commit 43312bb)
Commits on Oct 08, 2011
@arjan arjan Fixed picture rotation detection by tweaking the parser of the output…
… of "exif -m -t Rotation".

(cherry picked from commit ca959aa)
Commits on Oct 11, 2011
@arjan arjan mod_mailinglist - added bounce handling dialog.
Bouncing addresses are now conveniently shown in the mailing status
page, with the option to re-enable them, edit the address, and send
the mails again to those bounced addresses.

Added new boolean flag is_bounced to mailinglist_recipient table.
Commits on Oct 12, 2011
@arjan arjan mod_mailinglist - fix include reference to mailing footer template.
(cherry picked from commit 043ba40)
@arjan arjan mod_mailinglist - attach documents to the mailing for each 'hasdocume…
…nt' edge instead of 'document'.

(cherry picked from commit 6499282)
@arjan arjan Fixed z_utils:tempfile() to respect OS environment variables.
And z_tempfile:new/0 now uses z_utils:tempfile/0.
(cherry picked from commit e4e476d)
Commits on Oct 14, 2011
@arjan arjan z_convert:to_json/1 now also accepts floating point numbers. 56b397c
Commits on Oct 18, 2011
@arjan arjan Fix SQL error in z_installer.
Fixes #229
(cherry picked from commit 0a25ba0)
Commits on Oct 22, 2011
@arjan arjan Add distinctive icon for internal link in TinyMCE. Fixes #189
(cherry picked from commit 045c12f)
Commits on Oct 31, 2011
@arjan arjan Removed m_identity:{get,set}_props which were unused and not working.
Fixes #249
(cherry picked from commit 6212cf8)
Commits on Nov 06, 2011
@arjan arjan Show language selector on admin media page. Fixes #253
(cherry picked from commit 03322e6)
Commits on Nov 19, 2011
@arjan arjan mod_twitter: remove invalid {verbose, trace} option.
(cherry picked from commit 06b22f0)
Commits on Nov 23, 2011
@arjan arjan lower/upper filters now try to convert their argument to a list if it…
…'s not.

(cherry picked from commit 0104443)
Commits on Dec 11, 2011
@arjan arjan Created release 0.7.3. 4a79ef2
@arjan arjan Created release 0.7.2. 7e69cf5
Commits on Dec 14, 2011
@arjan arjan Fixed mod_mailinglist compilation error on 0.7.x branch. cc8ad1a
@arjan arjan Created release 0.7.3. 0adb84b
Commits on Dec 29, 2011
@arjan arjan mod_twitter - use https for streaming API.
(cherry picked from commit 5cb1639)
Commits on Jan 10, 2012
@mworrell mworrell Fix for pivoting with a new resource.
(cherry picked from commit d8291be)


@arjan arjan Created release 0.7.4. 1f1ad6d
Commits on Feb 08, 2012
@arjan arjan Show error message when user tries to add the same edge twice.
Fixes #290
(cherry picked from commit bb092f6)
Commits on Feb 16, 2012
@arjan arjan oauth: Added allowed methods for access/request token uris.
(cherry picked from commit d3d427d)
@arjan arjan OAuth: fix request/acces token with POST
(cherry picked from commit 99fabe9)
@arjan arjan mod_oauth: do not assume GET
(cherry picked from commit 13f682d)
@arjan arjan LiveValidation: use the same e-mail regexp as in the backend.
(cherry picked from commit d2e371a)
Commits on Mar 09, 2012
@arjan arjan mod_import_wordpress tweaks
- Fix paragraphs in body text
- Better feedback on crash
- Add support for version 1.1
(cherry picked from commit 29c8f06)
@kaos kaos Fix dialog display issue when not using <html xmlns=...>(cherry picke…
…d from commit b942aae)
@arjan arjan mod_twitter: Fixed converting unicode -> utf-8 in body text of receiv…
…ed tweets.

(cherry picked from commit 061cfd3)


Commits on Mar 11, 2012
@arjan arjan Created release 0.7.5. 3df3281
Commits on Mar 14, 2012
@arjan arjan mod_survey: Limit entry of "name" field to 32 chars.
Fixes #304
(cherry picked from commit a7f0262)


Commits on Mar 22, 2012
@arjan arjan Rsc pivot: fix case where sometimes pivot title would say 'undefined'…
… and refused to update.

(cherry picked from commit 32be7ef)
@arjan arjan Admin: remove tooltip from media attachment to fix dragging images to…
… the right.

(cherry picked from commit 26f3800)