Commit graph

363 commits

Author SHA1 Message Date
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 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 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
Chase Sterling fcb23466dd Merge branch 'master' into history_optimization 2016-07-09 19:33:56 -04:00
Chase Sterling fb54710709 Show a loading message before first page of history is loaded. 2016-07-09 19:22:28 -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 497f743976 Initialize js date directly 2016-07-09 16:08:34 -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 cb8c6fdaba Redirect back to current page when login button is clicked 2016-07-09 00:47:46 -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 eafff2ae43 Cause an error when trying to hook invalid HookMixin method 2016-07-08 21:30:20 -04:00
Chase Sterling 0b931d1a05 Merge pull request #153 from gazpachoking/fix_unicode_username_commits
Ensure git repo remains valid with unicode committer names. fix #152
2016-07-08 21:17:53 -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 9d80adf65e Merge pull request #151 from gazpachoking/fix_search_hooks
Fix search hooks with WikiPage refactor
2016-07-08 18:52:18 -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 c0a4e6b480 Pass self to HookMixin hooks 2016-07-08 02:10:26 -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 6e10d56479 Only add 'auth.local' to MODULES when AUTH_LOCAL_ENABLED is True 2016-07-07 19:42:23 -04:00