fb5c65827d
Move page title (h1) down. Move Home button to upper left corner on all views.
2018-12-30 19:09:52 +01:00
bb79cf5ce6
Merge branch 'repotag-use_path_helpers' into 5.x
2018-12-28 23:42:21 +01:00
f72e8610da
Merge branch 'use_path_helpers' of https://github.com/repotag/gollum into repotag-use_path_helpers
2018-12-28 23:41:56 +01:00
b76a250596
Use AJAX button click for cmd-s hotkey. Fixes 1356 ( #1361 )
2018-12-28 23:40:32 +01:00
2aea55a92c
[WIP] Improve editor buttons: insert markup at the correct position. Resolves #504 ( #1348 )
...
* Improve editor buttons: insert markup at the correct position
* Center cursor after replacing text.
* Reimplement keyboard shortcuts for ace.
* Add break_line and whole_line to all language definitions
* Implement a better unordered list function.
2018-12-28 23:23:06 +01:00
073137af7d
Merge pull request #1358 from gollum/fix_1340
...
Make mathjax.config.js the standard filename. Fixes #1340 .
2018-12-28 23:10:48 +01:00
e966de6922
Added tests for mathjax.config.js permissions. Fixed typo in permission regex.
2018-12-28 22:57:13 +01:00
616c004058
Refactor
2018-12-28 22:47:39 +01:00
59bb48340e
Fix test by adding new h2 editable class to expected output.
2018-12-28 22:45:17 +01:00
7ec80bf2f1
Optional assets path argument for rake task via ENV
2018-12-28 22:43:59 +01:00
006dd36078
Make mathjax.config.js the standard filename. Fixes #1340 .
2018-12-28 22:07:07 +01:00
58225c7c20
Add basic rest language definition. Fixes #1092 .
2018-12-28 21:33:17 +01:00
04501c205a
Introduce JS variant of path helpers
2018-12-10 19:54:21 +01:00
253ba89f90
Use relative asset urls in scss so base path will work
2018-12-10 19:53:40 +01:00
7f598cb49e
Fix e shortcut with baseurl
2018-12-10 19:52:52 +01:00
d3402dded2
Fix delete button in pages view with basepath
2018-12-10 19:52:23 +01:00
f222efd281
Remove unnecessary uglifier requirement
2018-12-10 19:51:06 +01:00
8f6c19b3fd
Move precompilation task to Rakefile
2018-12-10 19:50:49 +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
4e2b1442bd
Fixup: typo and correct asset path
2018-10-20 00:47:35 +02:00
83fbb16c3b
Fix precompilation
2018-10-20 00:47:15 +02:00
d2ea03fbb9
Use path helpers consistently
2018-10-20 00:28:25 +02: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
Bart Kamphorst
Dawa Ometto
Dawa Ometto
Yang Zhang