Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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.
base fork: zotonic/zotonic
...
head fork: zotonic/zotonic
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Apr 11, 2012
@arjan arjan Updated version number f583057
@arjan arjan Make sure Zotonic is built before starting 585bb59
@arjan arjan edoc update. Fixed AUTHORS to correspond with current github committers.
(cherry picked from commit ecc4949)
2825b95
Commits on Apr 12, 2012
@mworrell mworrell Fixed a problem when editing a newly added menu. This was already fix…
…ed in the new-admin-design branch.
426a707
Commits on Apr 14, 2012
@arjan arjan Fixed the "make docs" command in the Makefile
(cherry picked from commit 7c548cc)
e53c246
Commits on Apr 24, 2012
@arjan arjan Fix 2 typos.
Thanks Kim Shrier.
00e9422
@arjan arjan mod_mailinglist - depend on mod_logging.
(cherry picked from commit 65b0509)
2bad56b
Commits on Apr 26, 2012
@arjan arjan mod_mailinglist - address recipients by name in welcome/confirm/goodb…
…ye messages.
e14e24c
@arjan arjan mod_mailinglist: new filter to add recipient details to links in mails. 7130e4f
@mworrell mworrell Fixed typo in attr name ('check' instead of 'checked') 30613cc
Commits on Apr 28, 2012
@arjan arjan mod_backup: Prefix backup files with the site's name.
(cherry picked from commit 53cee4e)
62b787d
Commits on May 02, 2012
@mworrell mworrell Fix cache key of page. Issue #313 c0417b0
@arjan arjan Dynamically calculate the ebin dirs when compiling .erl, to ensure de…
…ps/ ebin dir existence.
0246f10
@mworrell mworrell Added travis-ci config from master. e28adee
Commits on May 03, 2012
@arjan arjan Fix wording of SEO webmaster tools configuration. Fixes #310. dbcec0a
@arjan arjan Merge remote-tracking branch 'origin/release-0.8.x' into release-0.8.x f782463
Commits on May 08, 2012
@arjan arjan Added optional argument to show_media filter which specifies the used…
… template for media items.

(cherry picked from commit ab4d8e7)
458978c
@arjan arjan z_email_server: Force quoted-printable encoding on HTML and Text part…
…s in emails.

The autodetection that mimemail.erl does sometimes fails on HTML
parts, causing them to be 7bit encoded, which causes long lines, which
causes bounces at some email servers.

Fixes #326
(cherry picked from commit 9b976bf)
9bcc818
Commits on May 09, 2012
@arjan arjan Show e-mail addresses that have been entered in the survey in an easy…
… copy-pastable dialog.
f9779ec
@arjan arjan mod_survey: Added easily-printable output. 868fadf
Commits on May 14, 2012
@arjan arjan Fix access to printable list. c2a89a4
Commits on May 15, 2012
@arjan arjan Sort the printable list on name_surname by default. Sort argument fro…
…m the query string is also supported.
be07208
@arjan arjan mod_survey: Use lowercase when sorting printable list 9062cbc
@mmzeeman mmzeeman The session id was not stored when a new session was created. Hopeful…
…ly this fixes #327.
8d95dbe
Commits on May 16, 2012
@mmzeeman mmzeeman Fix for mochiweb:to_html bug with singleton tags. Fixes issue #328 f7c5b03
@mmzeeman mmzeeman Make language dependent URL rewriting configurable. Fixes #315 10e59ee
Commits on Jun 13, 2012
@arjan arjan Backport fixes to Twitter filter to 0.8. 4f2e654
Commits on Jun 26, 2012
@mworrell mworrell Added some css to display survey questions. 0a47401
@mworrell mworrell Better likert display 498fa75
@mworrell mworrell Better matching display d51e9c1
@mworrell mworrell Better longanswer display 13677c8
Commits on Jul 10, 2012
@arjan arjan Fix blog skel indentation. Fixes #329 7603ac6
@arjan arjan Merge remote-tracking branch 'origin/release-0.8.x' into release-0.8.x 6dba971
Commits on Jul 28, 2012
@thatpythonguy thatpythonguy Removed websocket response header to conform to the latest proposed w…
…ebsocket protocol standard (see http://tools.ietf.org/html/rfc6455#section-4.2.2, December 2011)
ce01f70
Commits on Jul 30, 2012
@arjan arjan Merge pull request #376 from thatpythonguy/release-0.8.x
Websockets - Sec-Websocket-Protocol header is only allowed when the client provides it in the challenge.
2de0f40
Commits on Aug 02, 2012
@mmzeeman mmzeeman Fix for logoff option. Fiexes #382 526d1ec
Commits on Aug 11, 2012
@arjan arjan Created release 0.8.1. 5661acb
Commits on Aug 17, 2012
@arjan arjan Full text search: use the default postgres tsearch catalogs.
(cherry picked from commit 27cd803)
ceb0be0
@arjan arjan Add new webzmachine commit for Firefox Websockets fix.
(cherry picked from commit 8399c0c)

Conflicts:

	deps/webzmachine
eb74bc5
Commits on Sep 19, 2012
@mworrell mworrell Fix vulnerability in the random number and id generation. Fixes #369 ff5218d
Commits on Sep 26, 2012
@wielonib wielonib fix multipart form data parsing: add new data at the end of previous …
…data

(cherry picked from commit ad70829)
818574c
Commits on Oct 22, 2012
@mworrell mworrell Fix mixup of tr/pl iso codes. With thanks to Kunthar. ce0f435
Commits on Oct 25, 2012
@arjan arjan mod_import_wordpress: Support schema 1.2; fix XMerl unicode behaviour.
(cherry picked from commit f6f9fb9)
59f0228
Commits on Oct 29, 2012
@mworrell mworrell Allow searching on texts like 'id:1234' to find a specific id.
(cherry picked from commit bbf2bb9)
9a2892e
@mworrell mworrell Allow query_id to be a page with 'haspart' objects. Don't throw excep…
…tions on mismatch of categories (this allows a query to be inserted before the referred categories are inserted)

(cherry picked from commit f5c3d3b)
5b0b29c
@mworrell mworrell Only make queries with the 'is_query_live' flag a live query. Also so…
…me extra updates to m_rsc_update for later REST API work.

Fixes #344
(cherry picked from commit 3a51c40)

Conflicts:
	src/models/m_rsc_update.erl
1b8f5e6
@mworrell mworrell Also merge the sort terms from 'query_id' includes.
(cherry picked from commit 334992a)
ffd2a08
@mworrell mworrell Add 'publication_before/after' search terms. Fixes issue #361
(cherry picked from commit cd01991)
46d1be7
@mworrell mworrell Fix query for haspart of a collection.
(cherry picked from commit f72727f)
ae0ae4e
Commits on Oct 30, 2012
@arjan arjan Add release notes for 0.8.2
(cherry picked from commit 2890c25)
60ea2da
@arjan arjan Created release 0.8.2. 5902f05