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
This comparison is big! We're only showing the most recent 250 commits
Commits on Feb 19, 2015
@mworrell mworrell core: extra utf8 sanitization of received email's subject, text, html…
… and from.

(cherry picked from commit 010da08)
ecb05e3
Commits on Feb 20, 2015
@arjan arjan mod_search: Add 'finished' search filter + documentation
(cherry picked from commit 0b0e952)
3be8c6b
@arjan arjan core: Fix edocs build 21347da
@arjan arjan mod_search: Add {finished} search method
(cherry picked from commit 362733ef473a7f8448694047cd8375fd05715037)
1cf99b7
@arjan arjan doc: Clarify that finished/upcoming filters don't perform sorting
(cherry picked from commit c9ec0a479f89a495821a69305d12e2f4bdbcd1e8)
8f343cd
@arjan arjan doc: Fix sphinx configuration
(cherry picked from commit 9e81ccc)

Conflicts:
	doc/conf.py
e7965f2
@arjan arjan Add release notes for 0.12.4
(cherry picked from commit 7cf594c)
c3a15aa
Commits on Feb 25, 2015
@mworrell mworrell mod_content_groups: new module to categorize content into groups for …
…the access control.

Added to mod_menu: hierarchical sorter and hierarchies for content in a category.
5b3bdad
Commits on Feb 26, 2015
@CyBeRoni CyBeRoni Allow configuration of db creation and installation 5fd5b1b
Commits on Mar 03, 2015
@CyBeRoni CyBeRoni Add commented dbinstall/dbcreate options + explanation 7abdaee
@CyBeRoni CyBeRoni Add warning message that db won't be created or installed f4ff7dc
@imagency imagency Rename modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tinymce/langs …
…to modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tinymce/langs/ru.js
6d08010
@imagency imagency Update ru.js e318953
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tin…
…ymce/plugins/codemirror/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tinymce/plugins/codemirror/langs/ru.js
f302628
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tin…
…ymce/plugins/zlink/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tinymce/plugins/zlink/langs/ru.js
e062f4b
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tin…
…ymce/plugins/zmedia/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.1.6/tinymce/plugins/zmedia/langs/ru.js
f7b0e05
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/ti…
…nymce/plugins/codemirror to modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/tinymce/plugins/codemirror/ru.js
2085ab6
@imagency imagency Delete ru.js 87568e5
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/ti…
…nymce/plugins/codemirror/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/tinymce/plugins/codemirror/langs/ru.js
17f16b5
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/ti…
…nymce/plugins/zlink/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/tinymce/plugins/zlink/langs/ru.js
5a1e6d7
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/ti…
…nymce/plugins/zmedia/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/tinymce/plugins/zmedia/langs/ru.js
5201180
@imagency imagency Update and rename modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/ti…
…nymce/langs to modules/mod_editor_tinymce/lib/js/tinymce-4.0.26/tinymce/langs/ru.js
4c54c98
@imagency imagency Update _admin_tinymce_overrides_js.tpl f527e9c
@mmzeeman mmzeeman core: Do a session_context fold to get the right values in the contex…
…t. Fixes language problem in websockets.
1614537
Commits on Mar 04, 2015
@mworrell mworrell m_hierarchy: merge m_menu_hierarchy and m_category into m_hierarchy. …
…m_category now interfaces to m_hierarchy.

The category table is now replaced with a more generic hierarchy table. The category model puts it tree into that table using the '' name.
The model interface of m_category is cleaned up and all code is refactored.
Categories are now numbered with 'holes' between them. These holes prevent extensive pivot_category_nr renumbering if categories are moved.
6fb34ea
@mworrell mworrell Merge pull request #922 from imagency/master
TinyMCE russian translation additions
7fc5d65
@mworrell mworrell Merge pull request #921 from CyBeRoni/configure-dbcreation
Allow configuration of db creation and installation
475e533
@mmzeeman mmzeeman core: Make acceptor_pool_size configurable. Fixes #923 b22ba91
@arjan arjan mod_survey: Month names in dutch are lower case
(cherry picked from commit 5b18837)
2d8cca5
Commits on Mar 05, 2015
@arjan arjan mod_content_groups: Put in 'structure' admin menu; fix dutch wording 94ec026
@arjan arjan core: Remove category information from rsc export ec33f6a
@arjan arjan mod_content_groups: Put content group category in 'meta' 18ea01d
@arjan arjan mod_content_groups: Add .nl translation strings 84046ab
@arjan arjan mod_acl_user_group: Initial version 46dcc8b
@mmzeeman mmzeeman core: change default number of acceptors to 75. 8331419
Commits on Mar 06, 2015
@arjan arjan mod_search: Allow filtering resources on content group 7c93e33
Commits on Mar 08, 2015
@ArthurClemens ArthurClemens mod_artwork: add Material Design icons 999b613
Commits on Mar 09, 2015
@arjan arjan Add acl rule model 0b82a11
@mworrell mworrell core: added support for 'is_dependent' flag.
Setting this flag will automatically delete the resource after an edge to that resource is disconnected and no other connections to the resource exist. The resource is deleted 20 seconds after the edge-delete is handled.
c23d9f1
@arjan arjan Add ACL rule editor for module and rsc rules
Also add publish/revert buttons
788c8a8
Commits on Mar 24, 2015
@mworrell mworrell core: set longer timeout for renumber_pivot_task query.
(cherry picked from commit c515907)

Conflicts:
	src/models/m_category.erl
53f5a0b
@mworrell mworrell core: check if rsc existed before adding a rsc_gone entry.
(cherry picked from commit 9741457)
3aa2847
@arjan arjan mod_survey: Add 'allow_missing' request parameter
(cherry picked from commit 18b3de6a262bbf3fbe17668586e7bbb86620f6d0)
a413e3c
Commits on Mar 25, 2015
@arjan arjan mod_admin: Place upload form in a block, allowing it to be easier ove…
…rruled
84be572
Commits on Mar 26, 2015
@mmzeeman mmzeeman mod_acl_simple_roles: Fix to prevent blanking out all acl settings wh…
…en role rsc is changed.
292f80b
Commits on Mar 27, 2015
@mworrell mworrell mod_admin_identity: correct the button class on the identity verifica…
…tion page.

(cherry picked from commit 62f645d)
2f1ffae
@mworrell mworrell mod_mailinglist: more efficient query for polling scheduled mailings.
(cherry picked from commit 18bb8f1)
aa7e0e7
@mworrell mworrell mod_mqtt: allow 'live' wiring postbacks to mqtt topics, depending on …
…the presence of an element-id.

(cherry picked from commit c8bf441)

Conflicts:
	src/support/z_transport.erl
19454c4
@mworrell mworrell mod_email_status: new module to track email recipient status. Changes…
… to the email bounce, sent and failure notifications.

(cherry picked from commit b74f96d)
24f36ac
@mworrell mworrell docs: fix length of header underline. 8ed694a
@mworrell mworrell docs: add mod_email_status placeholders. a55d521
Commits on Mar 30, 2015
@mworrell mworrell mod_email_status: fix problem with re-installing the model.
(cherry picked from commit de4ad5c)
5a2eb78
@mworrell mworrell mod_email_status: handle non-binary error status values.
(cherry picked from commit 604c947)
a44b885
Commits on Apr 01, 2015
@ddeboer ddeboer Fix page block links de12951
@arjan arjan mod_admin: (CSS) file input buttons have varying heights on different…
… OSs
260a52d
Commits on Apr 03, 2015
@mworrell mworrell mow_acl_user_groups: first working version. To do: docs and test inte…
…rface.
94a8a9c
@mworrell mworrell Merge branch 'master' into acl-content-groups ffbe533
@mworrell mworrell mod_menu: breack cyclic dependency [mod_acl_user_groups,mod_authentic…
…ation,mod_admin,mod_menu,mod_content_groups]
633c54f
@mworrell mworrell Merge pull request #933 from driebit/fix-page-block-links
Fix page block links
67a0a1c
@mworrell mworrell Merge branch 'master' into acl-content-groups e340d51
Commits on Apr 04, 2015
@CyBeRoni CyBeRoni Allow to override pidfile location with env var 3e69aec
@mworrell mworrell Merge pull request #936 from CyBeRoni/override-pidfile
Allow to override pidfile location with env var
0223d0e
Commits on Apr 07, 2015
@mworrell mworrell mod_base: remove 'render-update' observer, leave template rendering t…
…o modules for more control

(cherry picked from commit 000423f)
8bdb64b
@mworrell mworrell mod_l10n: add some extra country-name to country-code mappings.
(cherry picked from commit 145e139)
e9f1a72
@mworrell mworrell mod_l10n: fix iso lookup of Serbia and Montenegro
(cherry picked from commit a05e7e3)
3e88d3f
Commits on Apr 08, 2015
@mworrell mworrell core: add log message when adding rsc.is_dependent and rsc.content_gr…
…oup_id.
416750b
@mworrell mworrell core: add is_meta/2 function to test if a category is a meta category…
…, needed for determining the default content group in m_rsc:get/2
513609d
@mworrell mworrell mod_content_groups: use the m_category:is_meta/2 to determine the def…
…ault content group.
d5890e0
@mworrell mworrell mod_content_groups: convert tabs to spaces. fbe3301
@mworrell mworrell mod_acl_user_groups: fix search restriction if user can't see any con…
…tent groups.
3104b54
@mworrell mworrell core: fix progressbar for form posts with body.
(cherry picked from commit 05f631a)
89caa53
Commits on Apr 09, 2015
@mworrell mworrell mod_content_groups: fix adding content_group_id for #rsc_get{} on an …
…non-existing resource.
91263b2
Commits on Apr 11, 2015
@mworrell mworrell mod_base: added the action update_iframe
(cherry picked from commit 38ece18)
faa5840
@mworrell mworrell mod_email_status: add status dialog and simple templates to see the s…
…tatus of an email address.

(cherry picked from commit 2d61cd1)
0799491
@mworrell mworrell mod_base: missing part of the update_iframe addition
(cherry picked from commit 9801415)
e53f80d
@mworrell mworrell Merge branch 'master' into acl-content-groups 61f44c2
Commits on Apr 13, 2015
@mworrell mworrell mod_base: cross-platform fix for update_iframe
(cherry picked from commit 1c45352)
2025b8c
@mworrell mworrell Merge branch 'master' into acl-content-groups 385d7cc
@mworrell mworrell mod_survey: add is_autostart option. Fix some minor template errors.
(cherry picked from commit 5f9a854)
e6ec910
@mworrell mworrell core: use 'optional' includes for blocks.
Also fix a problem where 'optional include' did not work with dynamically named templates.

(cherry picked from commit 3491fc4)
6f2bb7a
@mworrell mworrell mod_survey: use the 'optional' include for the templates.
(cherry picked from commit ee91018)
512b131
@mworrell mworrell core: normalize the name of the z_update_iframe JS function with its …
…Erlang equivalent.

(cherry picked from commit 00cd248)
a64a99e
Commits on Apr 14, 2015
@mworrell mworrell mod_import_csv: Force convert to utf8 of the top row. Add test for ';…
…' as a column separator.

(cherry picked from commit 32cf868)
7099e53
@mworrell mworrell core: fix 'next' page number for queries returning a #search_result{}.
(cherry picked from commit 0c46a5c)
f165df0
@mworrell mworrell Merge branch 'master' into acl-content-groups bcc72cb
@mworrell mworrell mod_admin: use search query 'admin_overview_query' for the overview p…
…age if it is defined.

(cherry picked from commit bb18923)
d6354be
@mworrell mworrell Merge branch 'master' into acl-content-groups
Conflicts:
	modules/mod_admin/templates/admin_overview.tpl
2d24a40
@mworrell mworrell mod_admin: add admin_content_query, also displayed in the content menu.
(cherry picked from commit 2c372ba)

Conflicts:
	modules/mod_admin/templates/admin_overview.tpl
3d80650
@mworrell mworrell Merge branch 'master' into acl-content-groups
Conflicts:
	modules/mod_admin/templates/admin_overview.tpl
3a74830
@mworrell mworrell mod_admin: enable 'all pages' button if a qquery is defined.
(cherry picked from commit ed62a52)
5c39169
@mworrell mworrell Merge branch 'master' into acl-content-groups 81c87b8
Commits on Apr 15, 2015
@mworrell mworrell core: ensure that the compiled template's name equals the one found v…
…ia an (optional) catinclude. Issue #938

(cherry picked from commit 13e240b)
1f768a7
@mworrell mworrell Merge branch 'master' into acl-content-groups 0fe4d23
@ArthurClemens ArthurClemens Fix log in verb 8b0d9c2
@ArthurClemens ArthurClemens mod_bootstrap: update update script f09a63b
@ArthurClemens ArthurClemens mod_bootstrap: fix sourceMappingURL replacement 96c2972
@ArthurClemens ArthurClemens mod_bootstrap: update to v3.3.4 15d092e
Commits on Apr 16, 2015
@mworrell mworrell mod_content_groups: 17.x compatibility for string with unicode charac…
…ter (breaks 15.x)
4fe2d09
Commits on Apr 21, 2015
@mworrell mworrell mod_survey: fix crash on prep_answer if question name is not unique
(cherry picked from commit 51e91fa)
a031477
Commits on Apr 22, 2015
@mworrell mworrell core: fix sql query in category delete. 400a372
@mworrell mworrell core: fix sql query in category delete.
(cherry picked from commit 400a372)
a57d647
@mworrell mworrell Merge branch 'master' into acl-content-groups 81fb56e
@mworrell mworrell mod_acl_user_groups/mod_content_groups: ensure the hierarchy if the c…
…ontent/user groups are changed.
b6e1e0e
@mworrell mworrell mod_admin: in tree-list, show the category in gray. 8d54176
@mworrell mworrell mod_admin: in tree-list, show the category in gray.
(cherry picked from commit 8d54176)
5984e31
@mworrell mworrell core: escape filenames using a single quot. Fixes #924 738d6ad
Commits on Apr 23, 2015
@mworrell mworrell core: shortcut for lib file lookup without filters (don't check the f…
…ile store)
9be2609
@mworrell mworrell core: shortcut for lib file lookup without filters (don't check the f…
…ile store)
10b498b
@mworrell mworrell core: add mod_mqtt to the default installed modules (as it is a depen…
…dency of mod_admin).
3dc6867
@mworrell mworrell core: add mod_mqtt to the default installed modules (as it is a depen…
…dency of mod_admin).

(cherry picked from commit 3dc6867)
44f3e17
Commits on Apr 28, 2015
@mworrell mworrell core: fix m_category/2 lookup. Thanks to Alvaro Pagliari. a30c773
@mworrell mworrell core: fix m_category/2 lookup. Thanks to Alvaro Pagliari.
(cherry picked from commit a30c773)
13c06e7
Commits on May 03, 2015
@AlainODea AlainODea Fix#891
 - Directly source zotonic_setup in each command script
ae438d6
Commits on May 04, 2015
@mworrell mworrell Merge pull request #946 from AlainODea/BUGFIX_issue891
Fix#891
d5661c6
Commits on May 12, 2015
@arjan arjan build: Bump Travis OTP version 954e16b
Commits on May 13, 2015
@mworrell mworrell core: fix problem where a gmail autoreply was classified as a bounce.…
… Fix tracking of some email errors. Started collecting email test data.
f905b8e
@mworrell mworrell mod_email_status: change info message about previous problems. c8ae86b
@mworrell mworrell mod_admin: pass all strings from the new-rsc dialog form. Fixes #948 a49282c
@mworrell mworrell mod_acl_user_groups: when changing category/content-group, show the m…
…eta category if the id is a meta or the current user is 1 (the admin)
90c3d16
@mworrell mworrell Merge branch 'master' into acl-content-groups a7229fd
@mworrell mworrell zotonic_status: use default 'post' method for the logon form to preve…
…nt showing the password if there is a js error.
2324ce3
@mworrell mworrell zotonic_status: use default 'post' method for the logon form to preve…
…nt showing the password if there is a js error.

(cherry picked from commit 2324ce3)
6cb50c0
Commits on May 14, 2015
@mworrell mworrell mod_linkedin: adaptations for LinkedIn API changes.
(cherry picked from commit 644db3e)

Conflicts:
	modules/mod_linkedin/templates/_admin_authentication_service.tpl

(cherry picked from commit ca486aa)
fcff80c
@mworrell mworrell mod_linkedin: fix for picture-url.
(cherry picked from commit 6aaee0f)
4cff951
@mworrell mworrell mod_search: fix a problem where a 'hassubject=[...]' query term was i…
…ncorrectly parsed. Fixes #950
2d84ae5
@mworrell mworrell mod_search: fix a problem where a 'hassubject=[...]' query term was i…
…ncorrectly parsed. Fixes #950

(cherry picked from commit 2d84ae5)

Conflicts:
	modules/mod_search/support/search_query.erl
4b1bf01
@mworrell mworrell mod_survey: change the thank you text, remove the 'Be sure to come ba…
…ck for other surveys' text.

(cherry picked from commit 46dbf28)

Conflicts:
	modules/mod_survey/translations/tr.po

(cherry picked from commit cf5a1f9)
884234c
Commits on May 15, 2015
@arjan arjan m_hierarchy: Add parents/3 function 1e54f78
@arjan arjan mod_acl_user_groups: Make ACL rules overview more usable 2eaffb1
@mworrell mworrell mod_search: add cat_exact query argument.
(cherry picked from commit 7160c95)
270563f
@mworrell mworrell mod_base: fix html_escape function in zotonic-1.0.js
(cherry picked from commit 9022f43)
2cb2901
@mworrell mworrell mod_admin_identity: on the users page, only show those with an userna…
…me_pw entry. Issue #747

(cherry picked from commit 4d4417b)
4e1cd4f
@mworrell mworrell mod_admin_identity: show 'email status' buttons if mod_email_status i…
…s enabled.

(cherry picked from commit 367b000)
88e131a
Commits on May 18, 2015
@mworrell mworrell mod_search: add 2nd ordering on -publication_start to featured search.
(cherry picked from commit 95ddc87)
e42fc78
@mworrell mworrell mod_search: fix search_query for 'hasobject=123'. Fixes #953
(cherry picked from commit 7e50f0d)
8fdf3ca
@mworrell mworrell Merge branch 'master' into acl-content-groups
Conflicts:
	modules/mod_search/support/search_query.erl
277902c
Commits on May 19, 2015
@arjan arjan Add edit basics dialog for user with tab to set user groups + options 41e1067
@arjan arjan Let search box work on users page d03463a
@arjan arjan Search placeholder text 5062188
@arjan arjan Users overview: show all persons/institutions or only those with acco…
…unts
8905c5d
@arjan arjan Create import/export function for rules 57cea9b
Commits on May 20, 2015
@arjan arjan Fix compilation error in ACL rule export controller bb8976e
@arjan arjan mod_development: Don't let sass create a source mapping 905bf67
@arjan arjan mod_development: Don't let sass create a source mapping
(cherry picked from commit 905bf67)
b54474a
Commits on May 22, 2015
@mworrell mworrell core: do not create atoms from rsc names in catinclude.
(cherry picked from commit 50e521d)
c756495
@mworrell mworrell core: add tick_10m and tick_6h notifications
(cherry picked from commit 84d2128)
58a2def
@mworrell mworrell core: fix a problem where ImageMagick identified PDF files as PBM.
(cherry picked from commit 0a58bd6)
8d81834
@mworrell mworrell Merge branch 'master' into acl-content-groups c4c22a5
Commits on May 23, 2015
@arjan arjan doc: Remove reference to Ubuntu PPA
Fixes #954
ee7b4c3
Commits on May 26, 2015
@arjan arjan mod_survey: Fix results/printable page when survey rsc has page path e66bb94
@mworrell mworrell core: cleanup location_lat/lng update/pivot code.
(cherry picked from commit 809a747)
ef3eb65
Commits on May 27, 2015
@mworrell mworrell mod_base: in scomp_lazy, ensure the 'visible' argument to all 'morere…
…sults' actions

(cherry picked from commit 341fbbf)
fcbe562
@pguyot pguyot Fix typo in _block_view_survey_thurstone.tpl
Looks like a copy-paste issue
f7d5bbc
@mworrell mworrell Merge pull request #955 from pguyot/patch-2
Fix typo in _block_view_survey_thurstone.tpl
248a815
@mworrell mworrell Merge branch 'master' of github.com:zotonic/zotonic d7a09a8
@pguyot pguyot Handle &# entities when splitting markers
split_marker/2 previously did not handle &#; entities (typically with a single quote ').
Rewrote the function to properly skip &#.
a2a85d3
@mworrell mworrell Merge pull request #956 from pguyot/patch-3
Handle &# entities when splitting markers
735bc86
@arjan arjan mod_admin_identity: Remove big 'show all' button when searching users 08d2218
@arjan arjan mod_admin_identity: Start with showing only users, not persons c804cfa
Commits on May 28, 2015
@mworrell mworrell mod_admin: pass all strings from the new-rsc dialog form. Fixes #948
(cherry picked from commit a49282c)
8e4f215
@ddeboer ddeboer Fix modal signup 380e0cd
@mworrell mworrell Merge pull request #958 from driebit/fix-signup-delegate
Fix modal signup
85baf0a
@mworrell mworrell core: adding some test data for smtp tests. 648dbae
@mworrell mworrell Merge branch 'master' into acl-content-groups 35303ac
Jeff Bell mod_admin: Flushed out ability to save [object, predicate] pairs when…
… creating new rsc using the dialog_new_rsc action.

Example Usage:

{% button text="New Topic"
    action={ dialog_new_rsc
             cat='topic'
             tabs_enabled = ["new"]
             nocatselect = "true"
             redirect = `topics`
             objects = [[m.acl.user, `author`]]
    }
%}
99a4588
Jeff Bell CONTRIBUTORS: added myself to CONTRIBUTORS file fce38a4
Commits on May 29, 2015
@mworrell mworrell Merge pull request #960 from trigeek38/fix-dialog-new-rsc
Fix dialog_new_rsc action to save [object, predicate] pairs
5acfd73
@mworrell mworrell Merge branch 'master' into acl-content-groups dbedf0b
Jeff Bell mod_admin: action_admin_dialog_new_rsc fix
Changed Objects to proplists:get_all_values(object, Args).
This will allow calling the action like below ...

{% button text="New Topic"
    action={ dialog_new_rsc
             cat='topic'
             tabs_enabled = ["new"]
             nocatselect = "true"
             redirect = `topics`
             object = [m.acl.user, `author`]
             object = [421, `subject`]
    }
%}

This also fixes and introduced bug when 'objects' was not presented.  Around line 91 of the action

    [m_edge:insert(Id, Pred, m_rsc:rid(Object, Context), Context) || [Object, Pred] <- Objects]

would crap out and break the stream.  The rsc would save, but the subsequent actions would fail, ie close_dialog etc.
e0d4aa4
@mworrell mworrell Merge pull request #961 from trigeek38/fix-my-fix
mod_admin:  action_admin_dialog_new_rsc fix
bda16f1
@mworrell mworrell mod_admin_identity: fix user query. c3e6ddb
@mworrell mworrell mod_admin: make action admin_dialog_new_rsc more robust against illeg…
…al objects arg
3721843
@mworrell mworrell mod_admin_identity: small changes/fixes to the users query. 7887df8
@mworrell mworrell mod_acl_user_groups: add 'block' option to access control rules. Upda…
…te the view via a 'live' subscribe.
d033854
@mworrell mworrell Merge branch 'master' into acl-content-groups c8afa1f
@mworrell mworrell Start removing R15 support. 6167699
@mworrell mworrell Merge branch 'master' into acl-content-groups d8547ff
@mworrell mworrell core: move more code into the m_hierarchy update to prevent race cond…
…itions.
d313f1c
@mworrell mworrell core: in m_hierarchy, lock the rows of a hierarchy when updating. a802c63
Commits on Jun 03, 2015
@ddeboer ddeboer mod_base: Allow to return 401 from API services
Fixes #962
476845c
@ddeboer ddeboer mod_base: Decode JSON body in service calls
Fixes #942

(cherry picked from commit 4362ed7)
6e8aa79
@pguyot pguyot mod_survey: Fix multi & single HTML structure for thurstone checkboxes
Judging from Bootstrap documentation, each checkbox line should be in a <div class="checkbox"> and each radio button line should be in a <div class="radio">.

Fixes #957
7a0d0a1
@AlainODea AlainODea scripts: Fix activating core / user modules
Fixes #889

 - Handle core modules and installed modules separately

 - Include core modules in modules to activate
5769807
Commits on Jun 07, 2015
@mmzeeman mmzeeman mod_base_site: Make configuring the site's navbar logo easier a5a5c86
Commits on Jun 08, 2015
@mworrell mworrell core: trace module (re-)loads and restart modules if any exported fun…
…ctions are changed. Issue #964

(cherry picked from commit 8581886)
4059a82
@mworrell mworrell Merge branch 'master' into acl-content-groups 8035109
@mmzeeman mmzeeman mod_base_site: Minor base template fixes. c9032a7
@mworrell mworrell core: bit more silent start/stop of modules.
(cherry picked from commit 402586e)
2ac4407
@mworrell mworrell core: add realtime block list checks for incoming email. Needs update…
…d z_stdlib.

(cherry picked from commit b3da8df)
761a3d6
Commits on Jun 12, 2015
@mworrell mworrell mod_development: move fswatch/inotify to the core.
This adds two zotonic configuration keys: filewatcher_enabled and filewatcher_scanner_enabled.
The filewatcher also add support for mediaclass file, erlydtl_parser.yrl and lib files.
The flusing behaviour is now more granulated and will flush the system less.
5867b86
@mworrell mworrell core: add cli commands 'zotonic startsite|stopsite|restartsite'. Fixes f7a8495
@mworrell mworrell Merge branch 'master' into acl-content-groups
Conflicts:
	modules/mod_development/mod_development.erl
2fda065
Commits on Jun 13, 2015
@mmzeeman mmzeeman filewatcher: fix, file_changed/2 moved 7ad5f45
@mworrell mworrell core: fix delete of timer in fswatch. 257bd2f
@mmzeeman mmzeeman mod_base_site: Fixed typo 577bd28
Commits on Jun 15, 2015
@mworrell mworrell core: log warnings if trying to insert duplicate rsc name/uri/path
(cherry picked from commit ab81999)
31920cf
Commits on Jun 17, 2015
@mworrell mworrell Fixes for language handling. Allow undefined pref_language for user. …
…Filter on valid language code on pref_language upate. Show select list with all valid languages in /admin/translation.

(cherry picked from commit f40a1a9)

Conflicts:
	modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl
	modules/mod_translation/templates/_dialog_language_edit.tpl

(cherry picked from commit 74f8217)
d706668
@mworrell mworrell Merge branch 'master' into acl-content-groups 7297d4f
@mworrell mworrell core: add m_rsc 'is_linkable' lookup, also in z_acl and m_acl 1530c0e
@mworrell mworrell docs: add placeholders for ACL documentation. 0555d09
@mworrell mworrell core: add m_rsc 'is_linkable' lookup, also in z_acl and m_acl
(cherry picked from commit 1530c0e)
0fb6a60
Commits on Jun 18, 2015
@arjan arjan core: z_media_preview: Do not add white space to small images when re…
…sizing

This commit changes the way Zotonic handles resizing images which are
resized beyond their original image dimensions. (when the 'upscale'
parameter is not used).

Previously, Zotonic would add a white area to the output image so that
the output image always had the requested size. However, this behaviour
turns out to be very annoying and can be emulated with CSS when needed.

This commit changes this behaviour so that for small images, no white
space is added but the image is left unresized.
aab664c
@mworrell mworrell mod_search: allow search terms in texts without '=value' arg, map to …
…'=true'. Fixes #970
ce1f496
@mworrell mworrell Merge branch 'master' into acl-content-groups 0a7ebe4
Commits on Jun 22, 2015
@mworrell mworrell [docs] proposal for site-fsm 8291cd8
@mworrell mworrell [core] add possibility to fetch sub-trees from a hierarchy. Example: …
…m.hierarchy.content_group[id].tree1
a84ce15
Commits on Jun 23, 2015
@mworrell mworrell [docs] A websocket connection is opened by the browser, accepted by t…
…he server.
5957275
@mworrell mworrell [docs] A websocket connection is opened by the browser, accepted by t…
…he server.

(cherry picked from commit 5957275)
fed9ac4
@mmzeeman mmzeeman mod_base: Make synchronous ajax requests when the page is unloading 62956bf
Commits on Jun 24, 2015
@mworrell mworrell mod_menu: fix issue that on insertion of a new item it is added to al…
…l sub-menus. Fixes #971
87d1246
@mworrell mworrell mod_menu: fix issue that on insertion of a new item it is added to al…
…l sub-menus. Fixes #971

(cherry picked from commit 87d1246)
25670b3
@mworrell mworrell mod_search: add query term 'hasanyobject', to search using an 'or' on…
… outgoing edges. Fixes #968
766faad
@mworrell mworrell mod_search: add query term 'hasanyobject', to search using an 'or' on…
… outgoing edges. Fixes #968

(cherry picked from commit 766faad)
c9b9966
Commits on Jun 25, 2015
@mmzeeman mmzeeman mod_search: Make it possible to pass rsc_lists as parameter to hasany…
…object.
c57b0a1
@mworrell mworrell mod_acl_user_groups: new import/export version of the acl rules. Incl…
…ude the content groups, user groups and hierarchies in the export.
34da71b
@mworrell mworrell mod_acl_user_groups: move ensure_name to the core m_rsc module. 3f4799d
@mworrell mworrell mod_menu: in the menu-editor, add open/close buttons for submenus. Th…
…is makes editing big lists easier.
b28c9fb
@mworrell mworrell docs: fix documentation of smtp server settings. Also fix z_config se…
…ttings.
5aa41f0
@mworrell mworrell core: name correction, the bounce server is a complete smtp receive s…
…erver.
cd26199
@mworrell mworrell docs: clarification of the bounce addresses. 3dcd0e7
@mworrell mworrell Merge branch 'master' into acl-content-groups
Conflicts:
	modules/mod_menu/templates/text/_menu_edit_scripts.tpl
	modules/mod_search/support/search_query.erl
062a7e4
Commits on Jun 26, 2015
@arjan arjan mod_base: Allow to set response headers from service API calls
You can now set response headers by returning a ``{Result, #context{}}``
tuple from the ``process_get/2`` and ``process_post/2`` calls.
c95a454
Commits on Jun 27, 2015
@arjan arjan mod_base: Correct ReqData attribute in API controller on processing POST
PR #962 (476845c) introduced retrieving
the request body in the controller_api when a JSON content type was
given. However, the ReqData objcet in the context and in the
Module:process_post/2 call was not updated, leaving WebMachine to thing
that the body still needed to be fetched.

This caused hanging POST connections with certain service modules that
did the JSON parsing themselves by calling `wrq:req_body/2`.
de6abc0
Commits on Jun 30, 2015
@mworrell mworrell core: allow pivot task to return {delay, DateTime}.
(cherry picked from commit 08300d9)
545a495
@mworrell mworrell Merge branch 'master' into acl-content-groups 3fb8996
@mworrell mworrell core: fix a problem where m_rsc:ensure_name/2 could insert duplicate …
…names. Fixes #974
d6dab6b
@mworrell mworrell core: add reserved usernames to prevent users signing up as these. Fi…
…xes #929
30b8b77
@mworrell mworrell core: if some reserved username was taken, allow to update the passwo…
…rd. Issue #929
6d3fb1d
@mworrell mworrell core: allow diff between Date and DateTime.
(cherry picked from commit 80c9fb0)
1c56f5d
Commits on Jul 01, 2015
@mworrell mworrell core: add 'flickrit.com' to the iframe whitelist. bbaef4d
@mworrell mworrell core: copy tmpfiles if they are mailed, add periodic cleanup of the t…
…mp folder. Fixes #972
e302a56
@mworrell mworrell core: fix a problem where a fulltext search with an empty category li…
…st didn't return any results. Fixes #976
908ab9e
@mworrell mworrell core: fix mqtt login, don't start a session_page if there is no sessi…
…on or reqdata. Fixes #973
28574ac
@mworrell mworrell mod_admin: fix problem where the lazy-loader for moreresulsts kept lo…
…ading till no results where left.
fde1d7c
@mworrell mworrell Set next version to 1.0(-dev) c2d341c
@ddeboer ddeboer Allow post-login redirect to be passed to logon modal 4e06242
@mworrell mworrell Merge pull request #977 from driebit/pass-redirect-page-modal
Allow post-login redirect to be passed to logon modal
ac0b561
Commits on Jul 02, 2015
@mworrell mworrell docs: 0.13.0 release notes and some extra (minimal) documentation.
(cherry picked from commit abed964)
b635adc
@mworrell mworrell docs: add tentatve 0.13.0 release date
(cherry picked from commit e8eb996)
f969a46
@mworrell mworrell docs: add shortlog to the 0.13.0 release notes.
(cherry picked from commit 8aa8e3d)
8f0bea6
@mworrell mworrell core: determine mime type of attachments if it was not given.
(cherry picked from commit 0c08a98)
5c85775
@mworrell mworrell docs: amend mod_development documentation with the new file scanning …
…methods.

(cherry picked from commit 2b7ba18)
4f6d746
Commits on Jul 03, 2015
@mworrell mworrell core: use 'rebar' to compile zotonic from the command line. Move .yrl…
… output to default location for rebar.

> Use skip_deps for 'make compile-zotonic'. Add 'make refresh-deps' and 'make list-deps'. Fixes #978

(cherry picked from commit bff3385)
ac7f2aa
@mworrell mworrell tests: fix z_media_preview_tests to accomodate for changes in b67b5d6 39fc861
@mworrell mworrell travis: also build release-0.13.x branch ed21a0b
@mworrell mworrell travis: added marc@... email address for any failures. a24a74d
@mworrell mworrell travis: send email to comitter. Later we have to figure out how to se…
…nd it to the email list again.
a05eeab
@mworrell mworrell core: use zotonic_compile to compile modules and sites. Issue #978 1f81e61
@mworrell mworrell doc: another fix for sidebar versions. 8670d2d
Commits on Jul 04, 2015
@mworrell mworrell doc: cleanup commit log in 0.13.0 release notes. 78a0f5a