wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
2,373 Commits 23 Branches 89 Tags
wiki.ohea.xyz-production
Commit Graph

2373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dawa Ometto 253ba89f90 Use relative asset urls in scss so base path will work 2018-12-10 19:53:40 +01:00
Dawa Ometto 7f598cb49e Fix e shortcut with baseurl 2018-12-10 19:52:52 +01:00
Dawa Ometto d3402dded2 Fix delete button in pages view with basepath 2018-12-10 19:52:23 +01:00
Dawa Ometto f222efd281 Remove unnecessary uglifier requirement 2018-12-10 19:51:06 +01:00
Dawa Ometto 8f6c19b3fd Move precompilation task to Rakefile 2018-12-10 19:50:49 +01:00
Dawa Ometto f44367c31b Remove Hacktoberfest Announcement 2018-12-02 17:35:10 +01:00
Bart Kamphorst 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
Bart Kamphorst ddfaf8c091 Simpler solution for normalization of uploaded files. 2018-11-29 09:25:19 +01:00
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 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
Bart Kamphorst ae853e074a Commit @dometto's fix for asset precompilation. 2018-11-20 16:16:25 +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 4eb7fd211c Fix tests (do not expect redirect after edit) and add test for edit collisions. 2018-11-20 14:53:27 +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
Dawa Ometto bde72cb52e Update README.md 2018-11-12 23:33:23 +01:00
Bart Kamphorst 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
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 70bf766cd0 Update README.md 2018-11-11 02:25:29 +01:00
Dawa Ometto 104c959bf7 Update README.md 2018-11-11 02:11:21 +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
Bart Kamphorst 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
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 83fbb16c3b Fix precompilation 2018-10-20 00:47:15 +02:00
Dawa Ometto d2ea03fbb9 Use path helpers consistently 2018-10-20 00:28:25 +02:00
Bart Kamphorst 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
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
Dawa Ometto 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
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 874c20e69f Update README.md 
💄
 2018-10-15 10:44:32 +02:00
Dawa Ometto b93083667d Update README.md 2018-10-15 10:43:23 +02:00
Dawa Ometto 8f7108c56f Update README.md 
Remove bit about building gem from source.
 2018-10-15 10:40:53 +02:00
Dawa Ometto a6167d88cd Fix base_path bugs in bin/gollum (#1329) 2018-10-14 17:54:39 +02:00