Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
Commits on Nov 30, 2010
@mworrell mworrell Set version to 0.6.0 594ec32
Commits on Dec 01, 2010
@mworrell mworrell Fix for 'double-dot' in e-mails when using postfix. Als encode the $.…
… characters using quoted-printable.
a870845
Commits on Dec 02, 2010
@mworrell mworrell Use the updated mail config, not the previous one. 5d9be05
@mworrell mworrell Use the context of mod_emailer to mark as sent, instead of the contex…
…t of the message. Fix for when a site's name is changed.
469b816
@AtillaE AtillaE ssl option added to some dispatch rules 252205e
@AtillaE AtillaE patch merged back d9d5f54
@AtillaE AtillaE overload protection added to z_logger + bugfixes ffcae53
@AtillaE AtillaE typo fixes in the sample config file 91b0c30
@mworrell mworrell Fix for format_price filter. Show thousands when no cents. 5ed8d4b
@mworrell mworrell Make video embed code editable. ce88ce5
Commits on Dec 03, 2010
@mworrell mworrell Fix for webmachine to prevent it using chunked transfer encoding with…
… HTTP/1.0.
4123181
@mworrell mworrell support {stream, TotalSize, StreamFun} body result for range-capable …
…streams (import from github a60c707ad6db5a9fa95e)
0ea7ad2
@mworrell mworrell Add infinity timeout to gen_server calls (github 4b0b551e8a77c779b99f) 8d9be7d
@mworrell mworrell Partial merge of github 458c8c41fda681221601: Allow multiple IP/port …
…bindings
733b18e
@mworrell mworrell Added Arjan and Ben. (github f8a2ef2c62bc61a76aab) 7ca1c78
@mworrell mworrell properly extract peername from all rfc1918 addrs (github c88c3080c415…
…a8466c6a and 7336af2f74ac9fcea696)
767fc6f
@mworrell mworrell change H7 to match on any if-match, not just * (github 7634d0ab510fe8…
…36cc2f)
2bc68e1
@mworrell mworrell also split chunk header on semicolon just in case a client is using c…
…hunk extensions (github 4b7c6c1d472af7634276)

conditionally skip the \r\n at the end of a chunk (github 82508b7b9cb2468ba416)
e9f053b
@mworrell mworrell Upped Webmachine version nr to reflect compatible version. f2a3ce4
@mworrell mworrell Added mod_signal. Thanks to Maas-Maarten Zeeman. c3693d7
Commits on Dec 07, 2010
@mworrell mworrell Added tick_1s and other period notifications. 1d896f2
Maas-Maarten Zeeman Added a signal model to use signal values in templates 68219f1
Commits on Dec 08, 2010
@arjan arjan mailinglist subject template tweaks b1dd404
@arjan arjan mod_mailinglist: Fix 2 labels in template fa59695
@arjan arjan Do not send a mail to the user when deleting a recipient from a
mailinglist from within the admin.
00ccdc8
@arjan arjan mod_mailinglist: fix mailinglist recipients sidebar. 863a123
Commits on Dec 09, 2010
@mworrell mworrell added optional length parameter to 'first' filter 167c3cf
Commits on Dec 12, 2010
@mworrell mworrell Added longer (than default) startup timeouts. 7a41e1c
@mworrell mworrell Added action_trigger_event, to trigger a named wire. db5544e
@mworrell mworrell Added the filters min, max and minmax. a3ef41a
Commits on Dec 13, 2010
@mworrell mworrell Added is_admin/1 to check if the admin user or a sudo has been done. 7198d37
@mworrell mworrell Allow the admin to update the creator_id of a rsc. b8ede32
Commits on Dec 14, 2010
@mworrell mworrell Fix username display in password reminder e-mail. 4effe8b
@mworrell mworrell Set the installed form action to #pb-installed, removing the confusin…
…g error about the 'pb:' protocol. Force forms with the class 'z_cookie_form' to post instead of using ajax calls.
035e7ab
@mworrell mworrell Fix for e-mail override, escape the '@' in the original e-mail address. ba3b619
@mworrell mworrell Other escape of override for exim 0c0cb8b
Commits on Dec 15, 2010
@mworrell mworrell Fix for filtering chars below 32 in z_string:line/1 b81ddac
@mworrell mworrell New pot file. de7dcbd
Commits on Dec 16, 2010
Maas-Maarten Zeeman Update mochiweb_html to latest version from mochi/mochiweb github rep…
…ository
0db5cf4
@mworrell mworrell When validating, allow spaces around email addresses. Trim some value…
…s before saving them in the db.
ac357ea
@mworrell mworrell Added option to set a noindex for a complete site. 623be91
@mworrell mworrell Fix for naming the ok/cancel buttons in the confirm dialog. 5f402db
@mworrell mworrell Fix for a problem where a new site could not be installed. eec71b9
Commits on Dec 20, 2010
@mworrell mworrell Added 'class' options to dialog_open, adds an extra class to the dialog. 9ffcf5a
Commits on Dec 21, 2010
@mworrell mworrell Allow admin to set creator_id of a resource. Show creator in admin ed…
…it screen.
43c5883
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…
…me_pw'
40f1ad3
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.
e2b35c0
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.
90fbede
@mworrell mworrell Fixes issue #130.
Patch for wrong camel-case content-type header on http put requests.
With thanks to hellamer.
177e8de
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.
cc5aa0e
@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.
4b8939f
Commits on Jan 17, 2011
@mworrell mworrell Fix for a problem where files without a preview where not showing an …
…icon.
0f428bd
Commits on Jan 18, 2011
@mworrell mworrell Added filesizeformat filter, similar to the Django filesizeformat fil…
…ter.
55e1972
@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.
a23df3a
@mworrell mworrell This fixes issue #134.
Fix for sort order of months.  Thanks to Igor Goryachev
ff9d6b1
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.
9d7d868
@mworrell mworrell Check result of application:start(zotonic) ea3aff7
@mworrell mworrell Set the preferred language of the new user to the current context lan…
…guage.
2865f43
@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…
…9264c415177f0bde44593f27
184e125
@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!
a2ab9f0
@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.
b1890ed
@mworrell mworrell Change call to identify to not pipe stderr to /dev/null. For Windows …
…compatibility. With thanks to Steve Strong.
ed60fdc
Commits on Feb 03, 2011
@mworrell mworrell Added a fallback option to the redirect when the browser history is e…
…mpty.
12e2b6b
@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
d11bd09
@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.
ae0674c
Commits on Feb 08, 2011
@mworrell mworrell Fix for a problem where z_submitter was not sent when using 'post' fo…
…r a form.
c7d3863
Commits on Feb 10, 2011
@mworrell mworrell Immediate pivot of pivot title, also force to lower case for better s…
…orting.
a704495
@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.
d287d95
@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.
1e9c967
@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
interface.
ad19979
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…
…ion.
cc14eb8
@arjan arjan Release 0.6.0 f2a0dbe