Commit Graph

46 Commits

Author SHA1 Message Date
Dawa Ometto 5b02a864e6 Add support for Mermaid. Resolves #1118. (#1834)
* Add Mermaid node package
* Add mermaid wiki setting and load mermaid conditionally
* Perform js error checks with mermaid active
* Precompile static assets
2022-09-13 12:00:49 +02:00
kyle tibbetts 9e722c5033 Add default keybinding flag. Resolves #1691 2022-05-26 13:16:09 +02:00
Nikita Ivanov 6f870501a0 Add option to show browser's local time (#1653)
* Add tests for --local-time option
* Update Readme
2022-01-13 18:19:22 +01:00
benjamin wil f6a7c57175 Don't include primer.css separate from app.css (#1685)
* Recompile static assets
2021-02-25 09:39:41 +01:00
benjamin wil 38fc7e69c1 Update Primer CSS to v15.2.0 (#1659) 2021-02-14 01:05:10 +01:00
Dawa Ometto 519a275ff0 Fix mathjax config path (#1605)
Related to #1602
2020-08-03 19:00:49 +02:00
Watal M. Iwasaki 6c7b12ae5e Restore base_url for baseUrl in JavaScript 2020-06-16 17:29:32 +09:00
Watal M. Iwasaki 6e6d9d8c1f Use page_route() for custom.css, custom.js, and MathJax 2020-06-14 23:11:07 +09:00
Watal M. Iwasaki e49758334f Replace base_url with page_route() 2020-06-14 23:11:07 +09:00
Sam 3d12aeb8b2 Update layout.mustache (#1539)
Fix loading of MathJax when run with a base path.
2020-04-03 15:28:00 +02:00
Dawa Ometto a45101cfe9 Package assets (#1493)
* Package static assets
* Fixed cancel button in editor
* Fix rake compilation task
* Add asset path helper
* Serve MathJax statically
* Fix mathjax in preview
2020-03-24 15:55:28 +01:00
Dawa Ometto c137c2af4b Advanced search. Implements #615 (#1427) 2019-09-30 15:30:34 +02:00
Dawa Ometto 9da11dba10 Split editor and app JS. Fix asset precompilation (#1422) 2019-09-13 00:59:55 +02:00
Dawa Ometto efaa6a0ba2 Editable sections. Resolves #1000 (#1415)
* Extend Ace highlighters to support gollum syntax
* Update ACE to 1.4.6
* Simplify (de)activation of function buttons
2019-09-12 12:37:24 +02:00
Bart Kamphorst 2216d67d5a Have upload modal ignore base-path when generating upload path. Resolves #1410. 2019-09-06 10:10:03 +02:00
Dawa Ometto d1b1375629 Fix usericons (#1408)
* Fix and refactor user icons, add Basic tests
* Remove identicon_canvas, use identicon.js
* Use octicon by default
2019-09-01 21:45:55 +02:00
Dawa Ometto 976f55e1b2 Pagination for history and latest changes. (#1396)
* Pagination for history and latest changes

* New footer for historical pages

* Fix pagination on history view.

* Do not directly use git adapter

* History view: allow selecting from different pages

* Use log_pagination_options to determine latest changes parameters

* Fix JS pageFullPath
2019-08-21 23:28:49 +02:00
Bart Kamphorst 8413e5b5ee Merge branch '5.x' into primer_css 2019-08-13 22:46:19 +02:00
Bart Kamphorst aa16f6ba2a Major CSS/styling overhaul with Primer.css. 2019-08-13 22:10:10 +02:00
Yang Zhang c0e6de899b Upgrade to mathjax-2.7.5 and use original mathjax config (fix comments in #1218) 2019-05-12 14:30:45 +08:00
Yang Zhang c103f3ebdc Fix mathjax loading and remove unused config 2019-05-11 09:04:14 +08:00
Yang Zhang 7cabd684a9 Bundle a slim mathjax (4.5MB uncompressed, 1.5MB compressed) 2019-05-11 09:04:14 +08: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 5de2442540 Merge branch '5.x' into critic_markup_styling 2018-11-12 16:39:45 +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 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
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
Dawa Ometto dac91e9998 CSS to SCSS (#1247)
* CSS to SCSS

* Fix travis

* Use sprockets

* Use Sprockets helpers

* Fix gollum.editor.js error when changing language

* Fix fileview styles, use same style as Pages View.

* Add keybinding files required by ace and some ace ext files that are required or might be useful.
2018-01-14 16:47:47 +01:00
Dawa Ometto f9b8b4e8d3 Remove ws subs (#1220)
* remove unwanted whitespace substitution
* end repression of file extensions
* see also https://github.com/gollum/gollum-lib/pull/249
2017-04-10 14:50:18 +02:00
Zhang YANG c1f94d2deb Replace the editor body with Ace editor (#1173)
* Replace editor's content editor with Ace Editor

* Bundle ace 1.2.5

* Give the ace editor body a name

* Changeing edit mode now changes Ace's editor mode

* Move Ace interface into gollum.editor.js and implement drag and drop uploading

* Make editor bottons work (mostly)

* Fix edit mode mapping

* Fix mode selection for empty editor

* Make the ace editor vertically resizable

* Add org-mode and reStructuredText mode mapping

* Add missing jquery.resize.js

* Change keybinding from vim to emacs

* Makes ace resizable on Chrom

* Fix accidental change of resize

* Add keyboard selector and fix commit message updating

* Add visual aid in editor to signal unavailable formats

* Hide line number by default
2017-04-09 10:48:22 +02:00
Joshua Swanson 73e61dbcff Changed layout template, to correctly handle custom.js when --page-file-dir is set 2015-08-05 13:26:19 +01:00
simonzack 3be2e76ec0 enable $ inline expressions so the example markdown doc works, $ can be escaped using \$ so shouldn't be much of an issue 2015-01-28 19:06:24 +11:00
Dawa Ometto c78dbc8bc1 Merge branch 'master' into rc
Conflicts:
	README.md
	lib/gollum/app.rb
2014-11-28 13:36:21 +01:00
Lucas Clemente 16dd7e46ef allow uploading files by drag and drop 2014-10-05 14:15:48 +02:00
Hardy ee55b74898 add --mathjax [CONFIG] to inject root-repo/[CONFIG] file,
which is similar to the behavior of --css and --js.
CONFIG is "mathjax.config.js" by default.
2014-10-04 23:09:10 -04:00
Geoffrey Roberts 1148d29439 Made the Gollum theme responsive.
Not a particularly comprehensive change in style, just one that removes all the fixed sizing for browsers below 940px in width.

Closes #831.
2014-10-02 00:50:29 +02:00
Marcus P S e65a78a5f5 Fix MathJax CDN URL
According to the [MathJax Blog](http://www.mathjax.org/changes-to-the-mathjax-cdn/), MathJax will retire the `rackcdn` CDN address at the end of this month. Updated the script to used the new CDN URL, and also made it so that the URL is HTTP/HTTPS agnostic, following the [MathJax docs](http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn).
2014-07-23 11:46:22 -04:00
Blomquist, Ethan c4ea869223 Added print.css to remove action buttons and delete link for better print format. 2014-02-03 10:45:06 -07:00
Matt Palmer d1fb98cf1b Merge remote-tracking branch 'upstream/master' into per-page-uploads
Conflicts:
	lib/gollum/public/gollum/javascript/gollum.js
2014-01-03 17:49:53 +11:00
Matt Palmer 5eac24eacb Implement the ability to store uploads on a per-page basis
Storing all uploaded files in a single directory kinda sucks when you've got
a largish wiki, or the possibility of filename collisions.  With this patch,
though, you can set `:per_page_uploads => true` in your wiki settings and
have the file uploaded to a directory named for the page you were on when
you clicked 'Upload'.
2014-01-03 15:34:24 +11:00
zorun 7a0d4919b0 Prevent indexing of old versions of a page (fixes #768) 2013-11-22 12:49:42 +01:00
Jamie Oliver 1cd7d0f205 Use display path in rename dialog. Fixes #703 2013-08-10 11:41:15 +01:00
Charles Pence 3b494c235a Tweak TeX math delimiters. 2013-03-21 22:09:01 -04:00
Jamie Oliver b989f160cf Merge branch 'master' into feature/gollum-lib
Conflicts:
	lib/gollum/markup.rb
	test/test_gitcode.rb
2013-03-20 07:46:11 +00:00
Jamie Oliver 1f79126b27 Move gollum back end to gollum-lib #647 2013-03-19 22:11:09 +00:00