Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

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

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

(cherry picked from commit c2853ae)
380deec
Arjan Scherpenisse arjan tiny_mce: Fixed the disappearing of inline images. Fixes issue #203.
Known TinyMCE issue. Should be addressed in tinymce project:
http://www.tinymce.com/develop/bugtracker_view.php?id=4558
(cherry picked from commit 988e597)
3f4f6a8
Commits on Sep 08, 2011
Arjan Scherpenisse arjan Tooltip Y position is now dependent on its height. Fixes issue #207
(cherry picked from commit 21dd694)
d4bbc59
Arjan Scherpenisse arjan Disregard stderr output from identify command. Fixes issue #206
(cherry picked from commit 6c59701)
13bf700
Arjan Scherpenisse arjan Make windows users happy when redirecting stderr.
(cherry picked from commit 368b21f)
0afe100
Arjan Scherpenisse arjan Added dutch month/day names to mod_l10n.
(cherry picked from commit d4105c4)
376c75f
Arjan Scherpenisse arjan Added dutch translation for mod_survey; small template tweaks. Fixes #…
…205

(cherry picked from commit c92925c)
1459624
Commits on Sep 12, 2011
Arjan Scherpenisse arjan z_datamodel: do not try to resolve 'undefined' in valid_for check
(cherry picked from commit b61d990)
7e5239c
Arjan Scherpenisse 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)
68265ef
Arjan Scherpenisse arjan Added date_start_year= and date_end_year= search filters to filter on…
… year of date start/end.

(cherry picked from commit 2ce4a42)
34ab87d
Commits on Sep 14, 2011
Arjan Scherpenisse arjan Fix infinite recursion in sub_month/3 filter.
(cherry picked from commit 36a9c79)
ac970f5
Arjan Scherpenisse 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)
c907743
Commits on Sep 19, 2011
Arjan Scherpenisse 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)
9cdecb4
Commits on Sep 21, 2011
Arjan Scherpenisse arjan Added application/x-font-woff for webfonts.
(cherry picked from commit b6996b1)
785d112
Commits on Sep 28, 2011
Arjan Scherpenisse arjan Re-added the option of test-sending a mailinglist page to a single ad…
…dress.

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

(cherry picked from commit eba00bc)
0b10e7d
Commits on Sep 30, 2011
Arjan Scherpenisse 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)
042e774
Commits on Oct 01, 2011
Arjan Scherpenisse 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)
a218dab
Arjan Scherpenisse arjan mod_backup: make sure we have an archive dir before archiving.
(cherry picked from commit d886544)
6c92b41
Commits on Oct 03, 2011
Arjan Scherpenisse arjan Added option email_bounce_override to override bounce email address.
Fixes #211. Thanks to Michael Schreckenbauer.
(cherry picked from commit a1f4521)
399e762
Commits on Oct 05, 2011
Arjan Scherpenisse arjan Allow id to be either number or unique name for resource_admin_edit.
Fixes #224
(cherry picked from commit 67e4744)
6a24b45
Arjan Scherpenisse arjan Export z_session_manager:get_session_id/1.
(cherry picked from commit df0333c)
aa302a4
Commits on Oct 06, 2011
Arjan Scherpenisse 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)
9c6540d
Arjan Scherpenisse arjan mod_survey: quick hack to put email validation on a field if you name…
… it 'email'.

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

(cherry picked from commit ca959aa)
4f1f89b
Commits on Oct 11, 2011
Arjan Scherpenisse 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.
3bce524
Commits on Oct 12, 2011
Arjan Scherpenisse arjan mod_mailinglist - fix include reference to mailing footer template.
(cherry picked from commit 043ba40)
bee429f
Arjan Scherpenisse arjan mod_mailinglist - attach documents to the mailing for each 'hasdocume…
…nt' edge instead of 'document'.

(cherry picked from commit 6499282)
3dbdf17
Arjan Scherpenisse 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)
546bd63
Commits on Oct 14, 2011
Arjan Scherpenisse arjan z_convert:to_json/1 now also accepts floating point numbers. 56b397c
Commits on Oct 18, 2011
Arjan Scherpenisse arjan Fix SQL error in z_installer.
Fixes #229
(cherry picked from commit 0a25ba0)
d55c2c2
Commits on Oct 22, 2011
Arjan Scherpenisse arjan Add distinctive icon for internal link in TinyMCE. Fixes #189
(cherry picked from commit 045c12f)
f3b5e8d
Commits on Oct 31, 2011
Arjan Scherpenisse arjan Removed m_identity:{get,set}_props which were unused and not working.
Fixes #249
(cherry picked from commit 6212cf8)
79767c0
Commits on Nov 06, 2011
Arjan Scherpenisse arjan Show language selector on admin media page. Fixes #253
(cherry picked from commit 03322e6)
e197cc7
Commits on Nov 19, 2011
Arjan Scherpenisse arjan mod_twitter: remove invalid {verbose, trace} option.
(cherry picked from commit 06b22f0)
0d79fae
Commits on Nov 23, 2011
Arjan Scherpenisse arjan lower/upper filters now try to convert their argument to a list if it…
…'s not.

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

Conflicts:

	src/models/m_rsc_update.erl
3b06aef
Arjan Scherpenisse arjan Created release 0.7.4. 1f1ad6d
Commits on Feb 08, 2012
Arjan Scherpenisse arjan Show error message when user tries to add the same edge twice.
Fixes #290
(cherry picked from commit bb092f6)
495b59a
Commits on Feb 16, 2012
Arjan Scherpenisse arjan oauth: Added allowed methods for access/request token uris.
(cherry picked from commit d3d427d)
efb7d52
Arjan Scherpenisse arjan OAuth: fix request/acces token with POST
(cherry picked from commit 99fabe9)
6efdda2
Arjan Scherpenisse arjan mod_oauth: do not assume GET
(cherry picked from commit 13f682d)
1df8c22
Arjan Scherpenisse arjan LiveValidation: use the same e-mail regexp as in the backend.
(cherry picked from commit d2e371a)
52d28f5
Commits on Mar 09, 2012
Arjan Scherpenisse 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)
2e3f084
Andreas Stenius kaos Fix dialog display issue when not using <html xmlns=...>(cherry picke…
…d from commit b942aae)
0626db0
Arjan Scherpenisse arjan mod_twitter: Fixed converting unicode -> utf-8 in body text of receiv…
…ed tweets.

(cherry picked from commit 061cfd3)

Conflicts:

	src/support/z_convert.erl
08654ee
Commits on Mar 11, 2012
Arjan Scherpenisse arjan Created release 0.7.5. 3df3281
Commits on Mar 14, 2012
Arjan Scherpenisse arjan mod_survey: Limit entry of "name" field to 32 chars.
Fixes #304
(cherry picked from commit a7f0262)

Conflicts:

	modules/mod_survey/actions/action_survey_dialog_survey_question.erl
d79cf94
Commits on Mar 22, 2012
Arjan Scherpenisse arjan Rsc pivot: fix case where sometimes pivot title would say 'undefined'…
… and refused to update.

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

(cherry picked from commit 26f3800)

Conflicts:

	modules/mod_admin/templates/_rsc_edge_media.tpl
d71354f