58225c7c20
Add basic rest language definition. Fixes #1092 .
2018-12-28 21:33:17 +01:00
c31c68200b
Merge pull request #1353 from gollum/fix_1306
...
Do not attempt to normalize uploaded files unless they have valid page extensions.
2018-11-29 12:04:07 +01:00
ddfaf8c091
Simpler solution for normalization of uploaded files.
2018-11-29 09:25:19 +01:00
ca9702088f
Do not attempt to normalize images or binary files.
2018-11-27 12:20:56 +01:00
413e962871
Update MathJax CDN. Related to PR #1267 .
...
Co-authored-by: dplanella <dplanella@gitlab.com >
2018-11-23 14:29:21 +01:00
848cef26ee
Fix wrapping issue for inline code blocks. Fixes #1033 .
2018-11-23 13:49:51 +01:00
b40b3aa9fc
Merge pull request #1349 from gollum/detect_simultaneous_edits
...
Implement infrastructure for detecting and handling simultaneous edits
2018-11-20 16:41:46 +01:00
ae853e074a
Commit @dometto's fix for asset precompilation.
2018-11-20 16:16:25 +01:00
f4838d12c6
Return the page's most recent version instead of random string.
2018-11-20 15:04:32 +01:00
4eb7fd211c
Fix tests (do not expect redirect after edit) and add test for edit collisions.
2018-11-20 14:53:27 +01:00
efd1d3992d
Use page.sha instead of a content-based hash for collision detection.
2018-11-19 12:58:30 +01:00
d4a9da0db5
Implement infrastructure for detecting and handling of simultaneous edits.
2018-11-16 14:24:21 +01:00
bde72cb52e
Update README.md
2018-11-12 23:33:23 +01:00
f251e0f556
Merge pull request #1345 from gollum/critic_markup_styling
...
Implements frontend support for CriticMarkup. Related to #1016 .
2018-11-12 16:49:20 +01:00
5de2442540
Merge branch '5.x' into critic_markup_styling
2018-11-12 16:39:45 +01:00
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
b50872497e
Loosen route replacement regex to allow for dashes in routes.
2018-11-12 11:57:28 +01:00
6d0b42b18f
Fix superfluous code in edit.rb. Add more descriptive help sentence for CriticMarkup.
2018-11-11 15:35:51 +01:00
70bf766cd0
Update README.md
2018-11-11 02:25:29 +01:00
104c959bf7
Update README.md
2018-11-11 02:11:21 +01:00
3c4c2a072c
Update app.rb ( #1346 )
2018-11-10 17:47:02 +01:00
769f8ec8d6
Implements frontend support for CriticMarkup. Related to #1016 .
2018-11-08 16:11:38 +01:00
64c4ee9c05
Improve upload handling (server-side and UI).
2018-11-07 11:06:25 +01:00
6857995442
Only use ajax for file upload. Prepare for handling of duplicate error.
2018-11-02 14:38:12 +01:00
eade94dcfd
Merge pull request #1341 from ProgramFan/5.x
...
Fix absense of visual feedback when uploading with drag-and-drop. Fixes #1327 .
2018-10-30 12:46:43 +01:00
daef5fe9d2
Show spinning when uploading
2018-10-29 22:03:40 +08:00
b8629729b9
Fix absense of visual feedback when uploading with drag-and-drop
2018-10-28 19:24:22 +08:00
b1ac06cd5f
Merge pull request #1337 from gollum/cleanup_route_naming
...
Use snake_case uniformly for all routes.
2018-10-19 22:10:35 +02:00
19751ec37f
Use snake_case uniformly for all routes.
2018-10-19 21:54:14 +02:00
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
8d611ea25a
Add explanatory notes to deletion logics.
2018-10-19 21:32:22 +02:00
1a8b6d6823
Implement AJAX deletion in /pages in order to remove redirect in /delete route.
2018-10-19 21:04:31 +02:00
78289a53bb
Implement header counting using YAML frontmatter. Resolves #908 ( #1330 )
2018-10-19 16:09:23 +02:00
303796c773
Merge pull request #1335 from lpbearden/5.x
...
Updated print.scss to remove footer when printing. Resolves #1333
2018-10-18 12:22:24 +02:00
825f43c429
Remove debug statements.
2018-10-17 22:24:05 +02:00
454b5e94dc
Unify deletion routes. Closes #1332 .
2018-10-17 22:18:23 +02:00
7ddbab76c1
updated print.scss to remove footer when printing
2018-10-17 12:50:07 -04:00
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
a6167d88cd
Fix base_path bugs in bin/gollum ( #1329 )
2018-10-14 17:54:39 +02:00
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
fd73eb6d05
Minor speed improvements.
2018-10-11 09:57:18 +02:00
963eb24fce
Merge pull request #1318 from onewhaleid/non-image-uploads
...
Handle non-image uploads correctly
2018-10-07 14:40:43 +02:00
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
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
daaa82fab5
Merge pull request #1324 from repotag/secure_customs
...
Secure custom JS and CSS. Resolves #665
2018-10-03 22:27:05 +02:00
ff52933320
Improve error message
2018-10-03 22:19:39 +02:00
84c01bb69b
Improve regexps
2018-10-03 22:13:38 +02:00
eb9b71e94a
Merge pull request #1325 from repotag/update_kramdown
...
Update kramdown
2018-10-03 13:30:40 +02:00
1080e776a3
Update kramdown
2018-10-03 12:39:50 +02:00
f8673f565a
Lockdown write access to custom.css and js
2018-10-02 23:56:46 +02:00
Bart Kamphorst
Dawa Ometto
Dawa Ometto
Yang Zhang
Lucas Bearden