Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
408 commits 1 branch 0 tags 2.4 MiB
Commit graph

408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Scragg 63ae863c41 Merge pull request #179 from stephane-martin/fix-include-templates 
add templates from modules to MANIFEST.in
 2016-09-07 11:52:19 -04:00
Stephane Martin 046dd88269 add templates from modules to MANIFEST.in so that they get included in the distribution 2016-09-07 11:03:19 +02:00
Matthew Scragg 5469a32dc9 Merge pull request #177 from stephane-martin/auth_proxy 
Authentication by proxy
 2016-09-06 20:57:39 -04:00
Stephane Martin 1531eac9da flask 0.11 compatibility 2016-09-06 22:32:40 +02:00
Stephane Martin d643b97875 authentication by reverse proxy 2016-09-06 22:32:40 +02:00
Stephane Martin a747b9505d flask 0.11 compatibility 2016-09-06 22:32:40 +02:00
Chase Sterling 0675ad9c85 Fix usage of is_anonymous as a method for new version of flask-login 2016-09-06 22:31:20 +02:00
Stephane Martin 49b1a329a8 moving auth_proxy to hooks.py 2016-09-06 13:56:25 +02:00
Stephane Martin cb7430df4e moving auth_proxy to hooks.py 2016-09-06 13:53:40 +02:00
Chase Sterling 07b5371a1a Fix usage of is_anonymous as a method for new version of flask-login 2016-09-06 00:08:58 -04:00
Stephane Martin cc2d0b7e09 more explicit nginx conf example 2016-09-06 00:08:44 +02:00
Stephane Martin 483899574b Merge branch 'auth_proxy' of https://github.com/stephane-martin/realms-wiki into auth_proxy 2016-09-05 23:37:41 +02:00
Stephane Martin a84926239a fix request.environ -> request.headers to get HTTP headers from reverse proxy 2016-09-05 23:36:59 +02:00
Stephane Martin 9ac015b3dd flask 0.11 compatibility 2016-09-05 23:36:59 +02:00
Stephane Martin 328f41b85c authentication by reverse proxy 2016-09-05 23:36:59 +02:00
Stephane Martin 034cc1febd fix request.environ -> request.headers to get HTTP headers from reverse proxy 2016-09-05 23:34:15 +02:00
Stephane Martin d7d8ef6d76 flask 0.11 compatibility 2016-09-05 23:19:28 +02:00
Matthew Scragg c6016c6116 0.9.0 2016-09-05 17:15:10 -04:00
Matthew Scragg bd39255dd0 Merge pull request #170 from gazpachoking/partials-update 
Partials improvements
 2016-09-05 17:00:19 -04:00
Stephane Martin 509f97a9f5 authentication by reverse proxy 2016-09-05 22:54:53 +02:00
Chase Sterling 7260c88571 Merge branch 'master' into partials-update 
Conflicts:
	realms/modules/wiki/views.py
 2016-09-05 13:30:27 -04:00
Matthew Scragg c6db7909b8 Merge pull request #167 from gazpachoking/markdown-it 
Switch from marked to markdown-it markdown renderer
 2016-09-05 13:23:14 -04:00
Matthew Scragg 87827ca156 Merge pull request #174 from stephane-martin/explicit_absolute_relative_imports 
systematic use of `from __future__ import absolute_import`
 2016-09-05 13:22:01 -04:00
Stephane Martin c9b8fbfcba merge last conflict 2016-09-05 09:37:59 +02:00
Stephane Martin 0288038111 make imports absolute 2016-09-05 01:31:01 +02:00
Stephane Martin 3d980e1459 make imports absolute 2016-09-05 01:31:00 +02:00
Stephane Martin 45a1b1a7af make imports absolute 2016-09-05 01:31:00 +02:00
Stephane Martin bae317c5b6 typo :-/ 2016-09-05 01:30:37 +02:00
Stephane Martin 1fef1b754c added six as an explicit dependency 2016-09-05 01:30:37 +02:00
Stephane Martin 1152c851e1 woosh -> whoosh 2016-09-05 01:30:37 +02:00
stef 6a043f4a7d more readable imports 2016-09-05 01:30:37 +02:00
stef 2731531768 systematic use of from __future__ import absolute_import. it eliminates import NAME confusion with very common names (eg. import ldap is very ambiguous: can be a ldap module from realms-wiki, a ldap module from flask-ldap-login, or python-ldap module. 
also cleant up a bit the import towards PEP8: builtin modules first, then 3rd party python packages, then local packages
 2016-09-05 01:29:29 +02:00
Chase Sterling 2919be6b87 Fix deprecated usage of flask.ext 2016-09-04 17:08:18 -04:00
Chase Sterling f34eabd7df Viewing historical versions of pages now works, and show historical version of partials as well 2016-09-04 16:35:56 -04:00
Chase Sterling d2bd13da46 Add back heading anchors via markdown-it-anchors plugin 2016-09-04 16:03:16 -04:00
Chase Sterling 2bf11e6604 Merge branch 'master' into markdown-it 2016-09-04 15:31:51 -04:00
Chase Sterling 3cecb160df Merge pull request #157 from gazpachoking/oauth_redirect 
Store next url redirect for in session to work with oauth login callback
 2016-09-04 14:42:50 -04:00
Chase Sterling f47af0ecae Merge branch 'master' into partials-update 2016-09-04 12:31:56 -04:00
Chase Sterling 2ce6c2d314 Merge branch 'master' into oauth_redirect 
# Conflicts:
#	realms/modules/auth/views.py
 2016-09-04 12:25:57 -04:00
Matthew Scragg a47d7e2471 Merge pull request #161 from gazpachoking/update_flask 
Update flask versions
 2016-09-02 12:56:21 -04:00
Matthew Scragg f49ef01f52 Merge pull request #173 from gazpachoking/module_static 
Make modules contain their own static files and templates
 2016-09-02 12:45:54 -04:00
Matthew Scragg eb01b3d269 Merge pull request #175 from zlapper/fix-docker-clean-css 
Added missing global node package to Dockerfile: clean-css
 2016-09-02 12:43:55 -04:00
Daniel Garcia 54b2b72734 Added missing global node package to Dockerfile: clean-css 2016-09-02 01:34:31 -05:00
Chase Sterling 1965cbb9ba Merge pull request #172 from alxjsn/master 
Search is now blocked for anonymous users on PRIVATE_WIKIs
 2016-08-15 23:43:10 -04:00
Chase Sterling 33aa2b851e Make modules contain their own static files and templates 2016-08-15 23:06:05 -04:00
alxjsn b4d16740c9 Added check for PRIVATE_WIKI in search fuction. Without this there would be information disclosure. 2016-08-15 12:27:18 -07:00
Chase Sterling b13f766176 Prevent overzealous requesting of partials while editing pages 2016-08-09 23:20:06 -04:00
Chase Sterling 9a730a947e Fix scope order when importing partials with metadata. 
Render error when importing wiki pages that do not exist.
 2016-08-09 22:54:41 -04:00
Chase Sterling 55e2ceccaa Fix live preview of imports in editor 2016-08-09 22:54:40 -04:00
Chase Sterling 55e1ed3a2b WIP partial improvements 2016-08-09 22:54:39 -04:00