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

151 commits

Author SHA1 Message Date
Stephane Martin 328f41b85c authentication by reverse proxy 2016-09-05 23:36:59 +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
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
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 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
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 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
Chase Sterling 3223e9fa65 Merge branch 'master' into no_gittle 
# Conflicts:
#	realms/modules/wiki/models.py
 2016-08-09 01:10:01 -04:00
Chase Sterling f175f12970 Merge remote-tracking branch 'origin/master' into update_flask 2016-07-28 10:22:37 -04:00
Chase Sterling 36d3fb7215 Fix some deprecation warnings with newer flask version 2016-07-14 17:59:08 -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 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 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 8a81bb121c Fix history cache clearing when page modified 2016-07-09 19:51:56 -04:00
Chase Sterling fcb23466dd Merge branch 'master' into history_optimization 2016-07-09 19:33:56 -04:00
Chase Sterling 9602dd993d Oops, fix first vs last sha in comparison view 2016-07-09 19:21:57 -04:00
Chase Sterling 631dc03f38 Add a + to indicate all revisions are not loaded in history view 2016-07-09 19:09:15 -04:00
Chase Sterling 184a47185c Re-implement revision comparison 2016-07-09 18:26:55 -04:00
Chase Sterling b3f6c311b3 Switch page history view to use jquery datatable 2016-07-09 15:50:07 -04:00
Chase Sterling 1c097a146a Remove gittle dependency and use dulwich directly 2016-07-09 12:56:26 -04:00
Chase Sterling aa0a8a2aa8 Store next url redirect for in session to work with oauth login callbacks 2016-07-08 23:39:11 -04:00
Chase Sterling 3d14412604 Ensure git repo remains valid with unicode committer names. fix #152 2016-07-08 18:57:14 -04:00
Chase Sterling 1bc15594f6 Allow WikiPage methods to be hooked 2016-07-08 13:53:09 -04:00
Chase Sterling ed0ac58e6f Update search module hooks to use new WikiPage methods 2016-07-08 02:11:57 -04:00
Chase Sterling 3c3d39c771 Fix clearing cache on page edits with new WikiPage refactor 2016-07-07 20:05:11 -04:00
Chase Sterling 0bcfaba807 Remove WikiPage.info refs #148 2016-07-07 18:07:21 -04:00
Chase Sterling 242e317e65 Make the history view pagination prettier. 2016-07-07 18:07:21 -04:00
Chase Sterling 35471d3c3f Don't add a separate class to iterate history 2016-07-07 18:07:09 -04:00
Chase Sterling 74452fe58f Add ability for 404 page to show error description. 2016-07-07 02:50:45 -04:00
Chase Sterling e3ae3a1ccb Lazy load history view with pagination. refs #149 2016-07-07 02:49:52 -04:00
Chase Sterling 2e6db650f2 Fix the __nonzero__ method for WikiPage 2016-07-05 20:29:01 -04:00
Chase Sterling 7a20135d55 Fix a mistake added to one of the wiki tests 2016-07-05 20:25:07 -04:00
Chase Sterling d50cf54072 Create WikiPage class to encapsulate wiki page functions 2016-07-04 22:22:12 -04:00
Matthew Scragg 701cadcb46 Merge pull request #139 from nakato/DBURI 
Use properties in config for pass-through compat vars
 2016-06-24 16:38:53 -05:00