Merge remote-tracking branch 'origin/master' into hunternif

# Conflicts:
#	client/css/post-content-control.styl
#	client/css/post-list-view.styl
#	client/html/post_edit_sidebar.tpl
#	client/js/controllers/post_list_controller.js
#	client/js/controllers/post_main_controller.js
#	client/js/controllers/post_upload_controller.js
#	client/js/controllers/tag_controller.js
#	client/js/controllers/user_list_controller.js
#	client/js/controls/expander_control.js
#	client/js/controls/post_content_control.js
#	client/js/controls/post_edit_sidebar_control.js
#	client/js/controls/post_readonly_sidebar_control.js
#	client/js/controls/tag_input_control.js
#	client/js/main.js
#	client/js/models/abstract_list.js
#	client/js/models/post.js
#	client/js/models/post_list.js
#	client/js/models/settings.js
#	client/js/models/tag.js
#	client/js/models/tag_list.js
#	client/js/tags.js
#	client/js/util/search.js
#	client/js/util/touch.js
#	client/js/util/uri.js
#	client/js/util/views.js
#	client/js/views/post_main_view.js
#	client/js/views/post_upload_view.js
#	client/js/views/posts_header_view.js
#	client/js/views/posts_page_view.js
#	client/js/views/settings_view.js
#	client/js/views/tag_view.js
#	client/package-lock.json
#	client/package.json
#	server/config.yaml.dist
#	server/szurubooru/api/__init__.py
#	server/szurubooru/api/post_api.py
#	server/szurubooru/api/tag_api.py
#	server/szurubooru/func/posts.py
#	server/szurubooru/func/tags.py
#	server/szurubooru/model/__init__.py
#	server/szurubooru/model/post.py
#	server/szurubooru/model/tag.py
#	server/szurubooru/search/configs/__init__.py
#	server/szurubooru/search/configs/post_search_config.py
#	server/szurubooru/search/executor.py
#	server/szurubooru/tests/api/test_post_retrieving.py
#	server/szurubooru/tests/api/test_post_updating.py
#	server/szurubooru/tests/api/test_tag_updating.py
#	server/szurubooru/tests/conftest.py
#	server/szurubooru/tests/func/test_posts.py
#	server/szurubooru/tests/func/test_tags.py
#	server/szurubooru/tests/search/configs/test_post_search_config.py

1 files changed, 44 insertions, 10 deletions

diff --git a/server/config.yaml.dist b/server/config.yaml.dist
index 7440777..3de5568 100644
--- a/server/config.yaml.dist
+++ b/server/config.yaml.dist
@@ -3,12 +3,10 @@
 
 # shown in the website title and on the front page
 name: szurubooru
-# user agent name used to download files from the web on behalf of the api users
-user_agent:
-# used to salt the users' password hashes
+# full url to the homepage of this szurubooru site, with no trailing slash
+domain: # example: http://example.com
+# used to salt the users' password hashes and generate filenames for static content
 secret: change
-# required for running the test suite
-test_database: 'sqlite:///:memory:'
 
 # Delete thumbnails and source files on post delete
 # Original functionality is no, to mitigate the impacts of admins going
@@ -21,18 +19,29 @@ thumbnails:
     post_width: 300
     post_height: 300
 
+# settings used to download files from the web on behalf of the api users
+user_agent:
+max_dl_filesize: 25.0E+6 # maximum filesize limit in bytes
+
+# automatically convert animated GIF uploads to video formats
 convert:
    gif:
      to_webm: false
      to_mp4: false
 
+# allow posts to be uploaded even if some image processing errors occur
+allow_broken_uploads: false
+
 # used to send password reset e-mails
 smtp:
     host: # example: localhost
     port: # example: 25
     user: # example: bot
     pass: # example: groovy123
-    # host can be left empty, in which case it is recommended to fill contactEmail.
+    from: # example: noreply@example.com
+    # if host is left empty the password reset feature will be disabled,
+    # in which case it is recommended to fill contactEmail so that users
+    # know who to contact when they want to reset their password
 
 contact_email: # example: bob@example.com. Meant for manual password reset procedures
 
@@ -41,12 +50,21 @@ enable_safety: yes
 tag_name_regex: ^\S+$
 tag_category_name_regex: ^[^\s%+#/]+$
 
+pool_name_regex: ^\S+$
+pool_category_name_regex: ^[^\s%+#/]+$
+
 # don't make these more restrictive unless you want to annoy people; if you do
 # customize them, make sure to update the instructions in the registration form
 # template as well.
 password_regex: '^.{5,}$'
 user_name_regex: '^[a-zA-Z0-9_-]{1,32}$'
 
+# webhooks to call when events occur (such as post/tag/user/etc. changes)
+# the listed urls will be called with a HTTP POST request with a payload
+# containing a snapshot resource as JSON. See doc/API.md for details
+webhooks:
+    # - https://api.example.com/webhooks/
+
 default_rank: regular
 
 privileges:
@@ -112,6 +130,7 @@ privileges:
     'tag_categories:create':        moderator
     'tag_categories:edit:name':     moderator
     'tag_categories:edit:color':    moderator
+    'tag_categories:edit:order':    moderator
     'tag_categories:list':          anonymous
     'tag_categories:view':          anonymous
     'tag_categories:delete':        moderator
@@ -123,6 +142,24 @@ privileges:
     'metrics:list':                 regular
     'metrics:delete':               moderator
 
+    'pools:create':                 regular
+    'pools:edit:names':             power
+    'pools:edit:category':          power
+    'pools:edit:description':       power
+    'pools:edit:posts':             power
+    'pools:list':                   regular
+    'pools:view':                   anonymous
+    'pools:merge':                  moderator
+    'pools:delete':                 moderator
+
+    'pool_categories:create':       moderator
+    'pool_categories:edit:name':    moderator
+    'pool_categories:edit:color':   moderator
+    'pool_categories:list':         anonymous
+    'pool_categories:view':         anonymous
+    'pool_categories:delete':       moderator
+    'pool_categories:set_default':  moderator
+
     'comments:create':              regular
     'comments:delete:any':          moderator
     'comments:delete:own':          regular
@@ -135,6 +172,7 @@ privileges:
     'snapshots:list':               power
 
     'uploads:create':               regular
+    'uploads:use_downloader':       power
 
 ## ONLY SET THESE IF DEPLOYING OUTSIDE OF DOCKER
 #debug: 0 # generate server logs?
@@ -144,7 +182,3 @@ privileges:
 ## usage: schema://user:password@host:port/database_name
 ## example: postgres://szuru:dog@localhost:5432/szuru_test
 #database:
-#elasticsearch: # used for reverse image search
-#    host: localhost
-#    port: 9200
-#    index: szurubooru