Commit graph

382 commits

Author SHA1 Message Date
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 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 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 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 1261d7c2e9 Merge branch 'master' into markdown-it 2016-08-09 16:41:11 -04:00
Chase Sterling 4a38e896eb Merge pull request #158 from gazpachoking/no_gittle
Remove gittle dependency and use dulwich directly
2016-08-09 01:18:17 -04:00
Chase Sterling 3223e9fa65 Merge branch 'master' into no_gittle
# Conflicts:
#	realms/modules/wiki/models.py
2016-08-09 01:10:01 -04:00
Matthew Scragg 241d763937 version: 0.8.1 2016-08-03 11:53:29 -05:00
Chase Sterling 2a8bf2c511 Fix crash with docker setting read only config val. 2016-08-01 11:25:56 -04:00
Chase Sterling f175f12970 Merge remote-tracking branch 'origin/master' into update_flask 2016-07-28 10:22:37 -04:00
Chase Sterling 065a8c3327 Merge pull request #160 from gazpachoking/github_auth_email
Use github's anonymous email when github auth user has private email
2016-07-26 16:00:46 -04:00
Chase Sterling d6800f9c4e Update flask-sqlalchemy connection format link. fix #165 2016-07-25 21:50:49 -04:00
Chase Sterling 021de4da78 Enable markdown-it typographer option 2016-07-25 20:59:28 -04:00
Chase Sterling b6ecaa9197 Switch from marked to markdown-it markdown renderer 2016-07-25 20:20:45 -04:00
Chase Sterling 36d3fb7215 Fix some deprecation warnings with newer flask version 2016-07-14 17:59:08 -04:00
Chase Sterling a22e99bf9b Re-enable custom flask error handler registration. 2016-07-14 00:12:49 -04:00
Chase Sterling f7bb21dd2b Start updating flask and flask modules 2016-07-14 00:12:48 -04:00
Chase Sterling 2d3de77bf6 Use github's anonymous email standin when github auth user has email as private 2016-07-13 22:47:24 -04:00
Chase Sterling 7a7dfd5097 Merge pull request #154 from gazpachoking/validate_hooks
Cause an error when trying to hook invalid HookMixin method
2016-07-13 21:08:40 -04:00
Chase Sterling 533e52945d Disallow _private methods to be hooked 2016-07-13 21:05:49 -04:00
Chase Sterling d914579b11 Merge pull request #150 from gazpachoking/history_optimization
History optimization/improvement fix #149
2016-07-13 20:56:13 -04:00
Chase Sterling 7487a65314 Merge branch 'master' into history_optimization
# Conflicts:
#	realms/modules/search/commands.py
2016-07-13 20:48:28 -04:00
Chase Sterling 192177ba2d Fix search rebuild_index command 2016-07-12 00:27:39 -04:00
Chase Sterling ac69c1c053 Merge pull request #159 from gazpachoking/fix_cli_commands
Fix CLI registration for module command groups. fix #103
2016-07-12 00:25:03 -04:00
Chase Sterling 57e98cdd9d Fix CLI registration for module command groups 2016-07-10 17:47:43 -04:00
Chase Sterling b754b9ac5a History cache not cleared on edit, and can follow renames 2016-07-10 01:00:43 -04:00
Chase Sterling 687b0f5ced Add view button back to history revisions 2016-07-09 20:48:21 -04:00
Chase Sterling 15924df4e2 Do date formatting for history view server side for consistency. 2016-07-09 20:10:46 -04:00
Chase Sterling bc0876cf33 Add gravatars back to history view 2016-07-09 20:02:53 -04:00
Chase Sterling 8a81bb121c Fix history cache clearing when page modified 2016-07-09 19:51:56 -04:00