Bart Kamphorst
ca9702088f
Do not attempt to normalize images or binary files.
2018-11-27 12:20:56 +01:00
Bart Kamphorst
413e962871
Update MathJax CDN. Related to PR #1267 .
...
Co-authored-by: dplanella <dplanella@gitlab.com >
2018-11-23 14:29:21 +01:00
Bart Kamphorst
848cef26ee
Fix wrapping issue for inline code blocks. Fixes #1033 .
2018-11-23 13:49:51 +01:00
Bart Kamphorst
f4838d12c6
Return the page's most recent version instead of random string.
2018-11-20 15:04:32 +01:00
Bart Kamphorst
efd1d3992d
Use page.sha instead of a content-based hash for collision detection.
2018-11-19 12:58:30 +01:00
Bart Kamphorst
d4a9da0db5
Implement infrastructure for detecting and handling of simultaneous edits.
2018-11-16 14:24:21 +01:00
Bart Kamphorst
5de2442540
Merge branch '5.x' into critic_markup_styling
2018-11-12 16:39:45 +01:00
Bart Kamphorst
b5c4fdcc83
Merge pull request #1344 from gollum/ajax_file_upload
...
Improvements and fixes for file uploading. Prepares for handling of duplicate error.
2018-11-12 16:32:05 +01:00
Bart Kamphorst
b50872497e
Loosen route replacement regex to allow for dashes in routes.
2018-11-12 11:57:28 +01:00
Bart Kamphorst
6d0b42b18f
Fix superfluous code in edit.rb. Add more descriptive help sentence for CriticMarkup.
2018-11-11 15:35:51 +01:00
Dawa Ometto
3c4c2a072c
Update app.rb ( #1346 )
2018-11-10 17:47:02 +01:00
Bart Kamphorst
769f8ec8d6
Implements frontend support for CriticMarkup. Related to #1016 .
2018-11-08 16:11:38 +01:00
Bart Kamphorst
64c4ee9c05
Improve upload handling (server-side and UI).
2018-11-07 11:06:25 +01:00
Bart Kamphorst
6857995442
Only use ajax for file upload. Prepare for handling of duplicate error.
2018-11-02 14:38:12 +01:00
Yang Zhang
daef5fe9d2
Show spinning when uploading
2018-10-29 22:03:40 +08:00
Yang Zhang
b8629729b9
Fix absense of visual feedback when uploading with drag-and-drop
2018-10-28 19:24:22 +08:00
Dawa Ometto
4e2b1442bd
Fixup: typo and correct asset path
2018-10-20 00:47:35 +02:00
Dawa Ometto
d2ea03fbb9
Use path helpers consistently
2018-10-20 00:28:25 +02:00
Bart Kamphorst
19751ec37f
Use snake_case uniformly for all routes.
2018-10-19 21:54:14 +02:00
Bart Kamphorst
814caff755
Merge pull request #1336 from gollum/unify_deletion_routes
...
Unify deletion routes. Implement ajax deletion for /pages. Closes #1332 .
2018-10-19 21:41:33 +02:00
Bart Kamphorst
8d611ea25a
Add explanatory notes to deletion logics.
2018-10-19 21:32:22 +02:00
Bart Kamphorst
1a8b6d6823
Implement AJAX deletion in /pages in order to remove redirect in /delete route.
2018-10-19 21:04:31 +02:00
Dawa Ometto
78289a53bb
Implement header counting using YAML frontmatter. Resolves #908 ( #1330 )
2018-10-19 16:09:23 +02:00
Bart Kamphorst
825f43c429
Remove debug statements.
2018-10-17 22:24:05 +02:00
Bart Kamphorst
454b5e94dc
Unify deletion routes. Closes #1332 .
2018-10-17 22:18:23 +02:00
Lucas Bearden
7ddbab76c1
updated print.scss to remove footer when printing
2018-10-17 12:50:07 -04:00
Bart Kamphorst
6475394133
Use new view helper method in /pages. Add /deleteFile route to helpers. Fix bug in breadcrumb of /Home.
2018-10-17 14:47:35 +02:00
Dawa Ometto
197a2bd57b
Namespace ( #1328 )
...
* CSS to SCSS
* Use sprockets
* Use Sprockets helpers
* Fix gollum.editor.js error when changing language
* Add keybinding files required by ace and some ace ext files that are required or might be useful.
* Move app paths to /gollum namespace, add route helpers for view templates
* Use path helper for links in page view
* Use path helper methods in javascript assets
* Refactored sprockets helpers for mustache
* Remove debugging
2018-10-14 15:46:10 +02:00
Bart Kamphorst
fd73eb6d05
Minor speed improvements.
2018-10-11 09:57:18 +02:00
Bart Kamphorst
963eb24fce
Merge pull request #1318 from onewhaleid/non-image-uploads
...
Handle non-image uploads correctly
2018-10-07 14:40:43 +02:00
Bart Kamphorst
5c5bfc71bd
Merge pull request #1326 from gollum/fix_pages_view_urls
...
Fix url generation in pages view.
2018-10-07 14:39:33 +02:00
Bart Kamphorst
3b9af34e0d
Fix url generation in pages view. Show full filename with extension for pages. Distinguish in HTML between file and pages.
2018-10-05 14:48:42 +02:00
Dawa Ometto
ff52933320
Improve error message
2018-10-03 22:19:39 +02:00
Dawa Ometto
84c01bb69b
Improve regexps
2018-10-03 22:13:38 +02:00
Dawa Ometto
f8673f565a
Lockdown write access to custom.css and js
2018-10-02 23:56:46 +02:00
Dawa Ometto
c85e14336e
Lockdown access to custom css and js files in repo
2018-10-02 23:31:07 +02:00
Bart Kamphorst
fd9156821c
Resolve minor issue to fix tests.
2018-10-02 14:21:00 +02:00
Bart Kamphorst
feb098bf45
Implement basic file deletion for /pages view.
2018-10-02 14:03:26 +02:00
Bart Kamphorst
012f1fcd47
Remove fileview from gollum and rely on /pages.
2018-09-23 14:38:09 +02:00
Bart Kamphorst
e46861f827
Merge branch '5.x' of https://github.com/gollum/gollum into 5.x
2018-09-22 21:16:44 +02:00
Bart Kamphorst
4549fdb9c5
Redirect broken links to 404 when --no-edit mode is enabled. Resolves #1197 .
2018-09-22 21:16:01 +02:00
Bart Kamphorst
f5ad5e397e
Merge pull request #1319 from onewhaleid/editor-hover-text
...
Add hover text to editor buttons
2018-09-19 16:06:18 +02:00
Dan Howe
f64ecd340b
Add hover text to editor buttons
2018-09-19 23:09:21 +10:00
Dan Howe
3060a3576f
Handle non-image uploads correctly
2018-09-19 22:48:09 +10:00
Dawa Ometto
efe1df769b
Remove legacy git_adapter helper method
2018-09-17 17:09:19 +02:00
Bart Kamphorst
812cd311c3
Fix conditional check on git adapter for String extension library.
2018-09-17 16:53:07 +02:00
Yang Zhang
167b5c4b1f
Upgrade bundle ACE editor to 1.3.1
2018-02-18 11:15:02 +08:00
Bart Kamphorst
d87a481ffb
Add cancel button to editor. Resolves issue #1282 .
2018-02-05 16:44:55 +01:00
Bart Kamphorst
ddea445a28
Refactor create view. Fixes create with file extension. Fixes automatic selection of format in editor.
2018-02-05 15:15:54 +01:00
Bart Kamphorst
f75037db42
Pagename() function no longer returns fill extension. Fixes #1274 .
2018-02-05 12:24:29 +01:00