Commit graph

384 commits

Author SHA1 Message Date
Matthew Scragg 7178a6190e define tokegetter 2015-11-13 16:55:42 -06:00
Matthew Scragg 6edaec3876 get oauth data from providers 2015-11-12 17:19:26 -06:00
Matthew Scragg 96b583d63b update scripts and readme with dependencies 2015-11-06 22:05:02 -06:00
Matthew Scragg 0b1c55f6a5 fallback to default avatar if email is not set
auth submodules are registered with initialized
check if auth.local is loaded before accessing registration route
check DB_URI before attempt to create db
2015-11-06 17:44:48 -06:00
Matthew Scragg e635be8961 oauth field map to include lists to access nested response dicts
oauth authorize callback to use absolute url, needed by Facebook
2015-10-26 16:47:32 -05:00
Matthew Scragg c92cc46db2 add more oauth providers, really authenticate 2015-10-21 17:34:20 -05:00
Matthew Scragg 4375db4f8c add github support, fix redirect on oauth 2015-10-21 09:09:42 -05:00
Matthew Scragg 4fede50136 enable oauth, set correct default oauth success endpoint 2015-10-20 17:18:43 -05:00
Matthew Scragg a0124baf1d oauth work 2015-10-15 17:36:47 -05:00
Matthew Scragg e9709b6c8f ldap second pass, working state 2015-10-15 15:55:38 -05:00
Matthew Scragg 838eb3cb06 2nd pass on oauth, making more generic 2015-10-14 23:08:56 -05:00
Matthew Scragg 2eaf09dc78 ldap first pass 2015-10-14 17:36:22 -05:00
Matthew Scragg 3c2f4a0445 first pass, non-working 2015-10-13 22:52:30 -05:00
Matthew Scragg 4441cfafd0 Merge pull request #81 from doordash/rename-page-fix
Fix bug with rename page to also delete old page
2015-09-30 14:33:37 -05:00
Matthew Scragg 5022276863 Merge pull request #83 from doordash/delete-page
Implement delete page
2015-09-30 14:27:28 -05:00
Alvin Chow b517e7e714 Fix bug where any page update would invoke rename_page()
fix
2015-09-29 17:13:45 -07:00
Alvin Chow 4e4cdf6348 Get delete page feature working 2015-09-28 00:06:49 -07:00
Alvin Chow 4ef08cc988 Add delete wiki page feature, delete wiki page after rename 2015-09-28 00:04:21 -07:00
Alvin Chow fdf482d14b Fix bug with rename feature to also delete old page 2015-09-27 16:20:54 -07:00
Matthew Scragg 459a9c2c59 Merge pull request #80 from doordash/wiki-index-fix
Make rebuild_index() more robust
2015-09-26 06:59:08 -07:00
Alvin Chow 1cf9295c78 Don't die if some non-MD files are found in the wiki repo during rebuild_index() 2015-09-25 16:35:16 -07:00
Matthew Scragg 08525c10ba Merge pull request #78 from larsimmisch/master
Fix subtle bug in new click parameter handling
2015-09-24 14:27:07 -07:00
Lars Immisch ac01fbcf7f Merge branch 'master' of github.com:scragg0x/realms-wiki 2015-09-24 22:00:09 +02:00
Lars Immisch 644929c4c8 Subtle bug in parameter handling
The parameter names must not be converted to upper case before calling
context.invoke, because that works with the lowercase names.

Before this bugfix,, we had kw like this in the various setup_* functions:
{'DB_URI': 'sqlite:////tmp/wiki.db', 'db_uri': 'sqlite:////real/path.db'}
and whichever won was pretty much random (dict sort order)
2015-09-24 21:49:18 +02:00
Matthew Scragg 85f80cc211 Merge pull request #77 from larsimmisch/master
Improve setup, small bug fixes
2015-09-22 10:02:53 -07:00
Lars Immisch 9d340e0da1 Work around a bug in click
Closes https://github.com/scragg0x/realms-wiki/issues/76
2015-09-22 16:37:39 +02:00
Lars Immisch a8e4ec69bf Fix gravatar URL and one possible redirect loop 2015-09-22 13:33:26 +02:00
Matthew Scragg 087ee0be15 version bump 2015-08-30 19:37:00 -05:00
Matthew Scragg 88555836c8 Update travis CI config 2015-08-30 19:28:44 -05:00
Matthew Scragg f59e46c7df Disable sendfile when running dev from vagrant.
Upgrade gunicorn.
Add BS3 classes to rendered markdown tables. Fixes #72
2015-08-30 19:17:51 -05:00
Matthew Scragg 24f681de89 Check if PID file is writeable before starting server
Set path prefix for gunicorn when inside virtualenv
2015-08-30 17:02:46 -05:00
Matthew Scragg f50e2cb27a Merge pull request #71 from AngryEgret/bug/bump-gevent-version
bumping gevent to 1.0.2
2015-08-16 16:14:51 -05:00
Ryan Greget 955cf8d0cd bumping gevent to 1.0.2 to address https://github.com/docker-library/python/issues/29 2015-08-16 11:42:30 -07:00
Matthew Scragg dbebc5100b Merge pull request #69 from darkindex/permanent-swap
Make swapfile permanent by adding to fstab in install.sh
2015-08-02 08:30:32 -05:00
Simon Edwards 98f5430732 Make swapfile permanent by adding to fstab in install.sh 2015-07-31 15:12:33 +01:00
Matthew Scragg 8f3b189f2a Merge pull request #67 from darkindex/datatables-update
Update DataTables dependency to 1.10.7
2015-07-27 15:48:32 -07:00
Simon Edwards 31c61e1c09 Update DataTables dependency to 1.10.7
This version includes a fix for a DataTables bug that can cause JS errors.
Possibly only affects certain jQuery versions but seems reproducible with
1.11.3

https://github.com/DataTables/DataTablesSrc/commit/485b259e5c
2015-07-27 16:34:34 +01:00
Matthew Scragg a721de26b6 Merge pull request #66 from darkindex/elasticsearch-fields
Make Elasticsearch searched fields configurable
2015-07-24 12:30:17 -07:00
Simon Edwards 1bcf43352b Update README with detail on ELASTICSEARCH_FIELDS 2015-07-24 13:47:07 +01:00
Simon Edwards 8e73a32875 Make Elasticsearch searched fields configurable
This allows fields stuch as "content" to be searchable when using Elasticsearch
Add config item ELASTICSEARCH_FIELDS, list of fields to search.
Defaults to just "name" to preserve existing behaviour
Available fields are:
- "name"
- "username"
- "content"
- "message"
2015-07-24 13:29:24 +01:00
Matthew Scragg a0b0ac9102 bump version 2015-07-22 12:02:42 -05:00
Matthew Scragg bd41eaac4e use app context aware cli, fixes #65 2015-07-22 12:01:59 -05:00
Matthew Scragg 8a7ef6bc90 Merge pull request #64 from cybrwushl93/master
added the ability to make wiki private (resolves #54)
2015-07-21 14:25:29 -07:00
cybrwushl93 c9308b25e3 added the ability to make wiki private (resolves #54) 2015-07-18 11:02:59 +02:00
Matthew Scragg ceec6b6789 allow uppercase in canonical names fixes #53 2015-07-15 09:34:36 -05:00
Matthew Scragg 2e056a5865 remove collaboration button if it's disabled 2015-07-15 09:06:39 -05:00
Matthew Scragg bf69f86236 comment user settings page until it's useful 2015-07-15 09:01:04 -05:00
Matthew Scragg b9f1bca23b Merge pull request #57 from magic890/patch-2
Improved installation steps + other small improvements.
2015-07-01 14:31:47 -07:00
Matteo Guarnerio 87efa345c4 Fixed capital letters in MySQL header. 2015-07-01 22:46:31 +02:00
Matteo Guarnerio 360c594725 Fixed conflicts + Other improvements. 2015-07-01 22:44:38 +02:00