Commit Graph

  • e966de6922 Added tests for mathjax.config.js permissions. Fixed typo in permission regex. Bart Kamphorst 2018-12-28 22:57:13 +01:00
  • 616c004058 Refactor Dawa Ometto 2018-12-28 22:47:39 +01:00
  • 59bb48340e Fix test by adding new h2 editable class to expected output. Bart Kamphorst 2018-12-28 22:45:17 +01:00
  • 7ec80bf2f1 Optional assets path argument for rake task via ENV Dawa Ometto 2018-12-28 22:43:59 +01:00
  • 006dd36078 Make mathjax.config.js the standard filename. Fixes #1340. Bart Kamphorst 2018-12-28 22:07:07 +01:00
  • 58225c7c20 Add basic rest language definition. Fixes #1092. Bart Kamphorst 2018-12-28 21:33:17 +01:00
  • 04501c205a Introduce JS variant of path helpers Dawa Ometto 2018-12-10 19:54:21 +01:00
  • 253ba89f90 Use relative asset urls in scss so base path will work Dawa Ometto 2018-12-10 19:53:40 +01:00
  • 7f598cb49e Fix e shortcut with baseurl Dawa Ometto 2018-12-10 19:52:52 +01:00
  • d3402dded2 Fix delete button in pages view with basepath Dawa Ometto 2018-12-10 19:52:23 +01:00
  • f222efd281 Remove unnecessary uglifier requirement Dawa Ometto 2018-12-10 19:51:06 +01:00
  • 8f6c19b3fd Move precompilation task to Rakefile Dawa Ometto 2018-12-10 19:50:49 +01:00
  • f44367c31b Remove Hacktoberfest Announcement Dawa Ometto 2018-12-02 17:35:10 +01:00
  • c31c68200b Merge pull request #1353 from gollum/fix_1306 Bart Kamphorst 2018-11-29 12:04:07 +01:00
  • ddfaf8c091 Simpler solution for normalization of uploaded files. Bart Kamphorst 2018-11-29 09:25:19 +01:00
  • ca9702088f Do not attempt to normalize images or binary files. Bart Kamphorst 2018-11-27 12:20:56 +01:00
  • 413e962871 Update MathJax CDN. Related to PR #1267. Bart Kamphorst 2018-11-23 14:29:21 +01:00
  • 848cef26ee Fix wrapping issue for inline code blocks. Fixes #1033. Bart Kamphorst 2018-11-23 13:49:51 +01:00
  • b40b3aa9fc Merge pull request #1349 from gollum/detect_simultaneous_edits Bart Kamphorst 2018-11-20 16:41:46 +01:00
  • ae853e074a Commit @dometto's fix for asset precompilation. Bart Kamphorst 2018-11-20 16:16:25 +01:00
  • f4838d12c6 Return the page's most recent version instead of random string. Bart Kamphorst 2018-11-20 15:04:32 +01:00
  • 4eb7fd211c Fix tests (do not expect redirect after edit) and add test for edit collisions. Bart Kamphorst 2018-11-20 14:53:27 +01:00
  • efd1d3992d Use page.sha instead of a content-based hash for collision detection. Bart Kamphorst 2018-11-19 12:58:30 +01:00
  • d4a9da0db5 Implement infrastructure for detecting and handling of simultaneous edits. Bart Kamphorst 2018-11-16 14:24:21 +01:00
  • bde72cb52e Update README.md Dawa Ometto 2018-11-12 23:33:23 +01:00
  • f251e0f556 Merge pull request #1345 from gollum/critic_markup_styling Bart Kamphorst 2018-11-12 16:49:20 +01:00
  • 5de2442540 Merge branch '5.x' into critic_markup_styling Bart Kamphorst 2018-11-12 16:39:45 +01:00
  • b5c4fdcc83 Merge pull request #1344 from gollum/ajax_file_upload Bart Kamphorst 2018-11-12 16:32:05 +01:00
  • b50872497e Loosen route replacement regex to allow for dashes in routes. Bart Kamphorst 2018-11-12 11:57:28 +01:00
  • 6d0b42b18f Fix superfluous code in edit.rb. Add more descriptive help sentence for CriticMarkup. Bart Kamphorst 2018-11-11 15:35:51 +01:00
  • 70bf766cd0 Update README.md Dawa Ometto 2018-11-11 02:25:29 +01:00
  • 104c959bf7 Update README.md Dawa Ometto 2018-11-11 02:11:21 +01:00
  • 3c4c2a072c Update app.rb (#1346) Dawa Ometto 2018-11-10 17:47:02 +01:00
  • 769f8ec8d6 Implements frontend support for CriticMarkup. Related to #1016. Bart Kamphorst 2018-11-08 16:11:38 +01:00
  • 64c4ee9c05 Improve upload handling (server-side and UI). Bart Kamphorst 2018-11-07 11:06:25 +01:00
  • 6857995442 Only use ajax for file upload. Prepare for handling of duplicate error. Bart Kamphorst 2018-11-02 14:38:12 +01:00
  • eade94dcfd Merge pull request #1341 from ProgramFan/5.x Bart Kamphorst 2018-10-30 12:46:43 +01:00
  • daef5fe9d2 Show spinning when uploading Yang Zhang 2018-10-29 22:03:40 +08:00
  • b8629729b9 Fix absense of visual feedback when uploading with drag-and-drop Yang Zhang 2018-10-28 19:24:22 +08:00
  • 4e2b1442bd Fixup: typo and correct asset path Dawa Ometto 2018-10-20 00:47:35 +02:00
  • 83fbb16c3b Fix precompilation Dawa Ometto 2018-10-20 00:47:15 +02:00
  • d2ea03fbb9 Use path helpers consistently Dawa Ometto 2018-10-20 00:24:15 +02:00
  • b1ac06cd5f Merge pull request #1337 from gollum/cleanup_route_naming Bart Kamphorst 2018-10-19 22:10:35 +02:00
  • 19751ec37f Use snake_case uniformly for all routes. Bart Kamphorst 2018-10-19 21:54:14 +02:00
  • 814caff755 Merge pull request #1336 from gollum/unify_deletion_routes Bart Kamphorst 2018-10-19 21:41:33 +02:00
  • 8d611ea25a Add explanatory notes to deletion logics. Bart Kamphorst 2018-10-19 21:32:22 +02:00
  • 1a8b6d6823 Implement AJAX deletion in /pages in order to remove redirect in /delete route. Bart Kamphorst 2018-10-19 21:04:31 +02:00
  • 78289a53bb Implement header counting using YAML frontmatter. Resolves #908 (#1330) Dawa Ometto 2018-10-19 16:09:23 +02:00
  • 303796c773 Merge pull request #1335 from lpbearden/5.x Dawa Ometto 2018-10-18 12:22:24 +02:00
  • 825f43c429 Remove debug statements. Bart Kamphorst 2018-10-17 22:24:05 +02:00
  • 454b5e94dc Unify deletion routes. Closes #1332. Bart Kamphorst 2018-10-17 22:18:23 +02:00
  • 7ddbab76c1 updated print.scss to remove footer when printing Lucas Bearden 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. Bart Kamphorst 2018-10-17 14:47:35 +02:00
  • 874c20e69f Update README.md Dawa Ometto 2018-10-15 10:44:32 +02:00
  • b93083667d Update README.md Dawa Ometto 2018-10-15 10:43:23 +02:00
  • 8f7108c56f Update README.md Dawa Ometto 2018-10-15 10:40:53 +02:00
  • a6167d88cd Fix base_path bugs in bin/gollum (#1329) Dawa Ometto 2018-10-14 17:54:39 +02:00
  • 197a2bd57b Namespace (#1328) Dawa Ometto 2018-10-14 15:46:10 +02:00
  • fd73eb6d05 Minor speed improvements. Bart Kamphorst 2018-10-11 09:57:18 +02:00
  • 963eb24fce Merge pull request #1318 from onewhaleid/non-image-uploads Bart Kamphorst 2018-10-07 14:40:43 +02:00
  • 5c5bfc71bd Merge pull request #1326 from gollum/fix_pages_view_urls Bart Kamphorst 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. Bart Kamphorst 2018-10-05 14:48:42 +02:00
  • daaa82fab5 Merge pull request #1324 from repotag/secure_customs Dawa Ometto 2018-10-03 22:27:05 +02:00
  • ff52933320 Improve error message Dawa Ometto 2018-10-03 22:19:39 +02:00
  • 84c01bb69b Improve regexps Dawa Ometto 2018-10-03 22:13:38 +02:00
  • eb9b71e94a Merge pull request #1325 from repotag/update_kramdown Dawa Ometto 2018-10-03 13:30:40 +02:00
  • 1080e776a3 Update kramdown Dawa Ometto 2018-10-03 12:39:50 +02:00
  • f8673f565a Lockdown write access to custom.css and js Dawa Ometto 2018-10-02 23:56:46 +02:00
  • 6d4f97fdc4 Add custom.css and custom.js files to example repo Dawa Ometto 2018-10-02 23:56:16 +02:00
  • c85e14336e Lockdown access to custom css and js files in repo Dawa Ometto 2018-10-02 23:31:07 +02:00
  • b1cdf91789 Merge pull request #1322 from gollum/enhance_pages_view Bart Kamphorst 2018-10-02 15:25:11 +02:00
  • fd9156821c Resolve minor issue to fix tests. Bart Kamphorst 2018-10-02 14:21:00 +02:00
  • feb098bf45 Implement basic file deletion for /pages view. Bart Kamphorst 2018-10-02 14:03:26 +02:00
  • b0ad3265e7 Announce Hacktober Dawa Ometto 2018-10-01 18:51:41 +02:00
  • 02fd12339f Release 4.1.4 v4.1.4 Dawa Ometto 2018-10-01 13:30:14 +02:00
  • 9048d6a03d Depend on newest gollum-lib for patched sanitize version Dawa Ometto 2018-10-01 13:30:07 +02:00
  • b5eed33932 Add warbler to Gemfile and update gemspec. Depend on gollum-lib@master and adapters@master for dev purposes. Dawa Ometto 2018-09-28 13:03:17 +02:00
  • c660222300 Update README.md Dawa Ometto 2018-09-27 19:58:14 +02:00
  • 93f6b0373a Update README.md Dawa Ometto 2018-09-24 19:41:36 +02:00
  • 43d3271b4e Update .gitattributes Dawa Ometto 2018-09-24 18:40:08 +02:00
  • 66d09b76c7 Update README.md Dawa Ometto 2018-09-24 18:34:14 +02:00
  • 90043a66cb Update README.md Dawa Ometto 2018-09-24 18:11:50 +02:00
  • 317ccef7c8 Add CodeTriage badge to gollum/gollum (#1291) README Bot 2018-09-24 10:34:40 -05:00
  • ef6bd9b538 Merge pull request #1320 from gollum/remove_file_view Bart Kamphorst 2018-09-24 14:30:29 +02:00
  • 012f1fcd47 Remove fileview from gollum and rely on /pages. Bart Kamphorst 2018-09-23 14:38:09 +02:00
  • e46861f827 Merge branch '5.x' of https://github.com/gollum/gollum into 5.x Bart Kamphorst 2018-09-22 21:16:44 +02:00
  • 4549fdb9c5 Redirect broken links to 404 when --no-edit mode is enabled. Resolves #1197. Bart Kamphorst 2018-09-22 21:16:01 +02:00
  • f5ad5e397e Merge pull request #1319 from onewhaleid/editor-hover-text Bart Kamphorst 2018-09-19 16:06:18 +02:00
  • f64ecd340b Add hover text to editor buttons Dan Howe 2018-09-19 23:09:21 +10:00
  • 3060a3576f Handle non-image uploads correctly Dan Howe 2018-09-19 22:48:09 +10:00
  • 771ca331e9 Create ISSUE_TEMPLATE.md Dawa Ometto 2018-09-17 22:44:09 +02:00
  • 92e42236f5 Add --versions flag to the gollum binary that outputs the version numbers of auxiliary gems. Resolves #1022. Bart Kamphorst 2018-09-17 22:41:31 +02:00
  • 7ada448bce Release 4.1.3 v4.1.3 Dawa Ometto 2018-09-17 22:29:34 +02:00
  • c2258c449e Added necessary escaping Dawa Ometto 2018-09-17 21:57:52 +02:00
  • 051b88fe70 Drop support for ruby =< 2.2 on Travis (due to Sinatra upgrade to 2.0). Bart Kamphorst 2018-09-17 21:25:24 +02:00
  • 25578961c0 Merge branch '5.x' of https://github.com/gollum/gollum into 5.x Bart Kamphorst 2018-09-17 21:12:39 +02:00
  • b47db5611b Upgrade Sinatra to v.2.0 or higher. Closes #1193 (Rails 5 compatibility). Bart Kamphorst 2018-09-17 21:12:30 +02:00
  • efe1df769b Remove legacy git_adapter helper method Dawa Ometto 2018-09-17 17:09:19 +02:00
  • 812cd311c3 Fix conditional check on git adapter for String extension library. Bart Kamphorst 2018-09-17 16:53:07 +02:00
  • 676fb474b9 Merge pull request #1293 from ProgramFan/5.x Bart Kamphorst 2018-09-17 11:47:18 +02:00