Commit Graph

144 Commits

Author SHA1 Message Date
Bart Kamphorst c991149422 Fix RTL button. Rename Edit Mode label to Markup. 2019-08-19 22:38:54 +02:00
Bart Kamphorst 92b17f9053 Removed some inline CSS. Removed footer from preview pages. 2019-08-14 16:39:55 +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
Dawa Ometto dfb4281a14 Add MediaWiki language def (#1382) 2019-05-16 21:03:07 +02:00
Dawa Ometto 7881237de2 Improve RTL support. Resolves #1314 (#1350)
* Improve RTL support with updated ACE 1.4.4
* Implement direction switch button
* RTL support on rendered pages
* Fix ace editor modes
* Fix language definitions
2019-05-16 20:38:33 +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 94fe2f59d3 Implements a breadcrumb for normal wiki pages. Resolves #629. 2019-01-03 09:45:08 +01:00
Bart Kamphorst fb5c65827d Move page title (h1) down. Move Home button to upper left corner on all views. 2018-12-30 19:09:52 +01:00
Dawa Ometto bb79cf5ce6 Merge branch 'repotag-use_path_helpers' into 5.x 2018-12-28 23:42:21 +01:00
Dawa Ometto 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
Dawa Ometto b76a250596 Use AJAX button click for cmd-s hotkey. Fixes 1356 (#1361) 2018-12-28 23:40:32 +01:00
Dawa Ometto 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
Bart Kamphorst 58225c7c20 Add basic rest language definition. Fixes #1092. 2018-12-28 21:33:17 +01:00
Dawa Ometto 04501c205a Introduce JS variant of path helpers 2018-12-10 19:54:21 +01:00
Dawa Ometto 253ba89f90 Use relative asset urls in scss so base path will work 2018-12-10 19:53:40 +01:00
Bart Kamphorst 848cef26ee Fix wrapping issue for inline code blocks. Fixes #1033. 2018-11-23 13:49:51 +01:00
Bart Kamphorst d4a9da0db5 Implement infrastructure for detecting and handling of simultaneous edits. 2018-11-16 14:24:21 +01:00
Bart Kamphorst 5de2442540 Merge branch '5.x' into critic_markup_styling 2018-11-12 16:39:45 +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
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 d2ea03fbb9 Use path helpers consistently 2018-10-20 00:28:25 +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
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
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
Bart Kamphorst 963eb24fce Merge pull request #1318 from onewhaleid/non-image-uploads
Handle non-image uploads correctly
2018-10-07 14:40:43 +02:00
Bart Kamphorst 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
Dan Howe 3060a3576f Handle non-image uploads correctly 2018-09-19 22:48:09 +10:00
Yang Zhang 167b5c4b1f Upgrade bundle ACE editor to 1.3.1 2018-02-18 11:15:02 +08:00
Bart Kamphorst d87a481ffb Add cancel button to editor. Resolves issue #1282. 2018-02-05 16:44:55 +01:00
Bart Kamphorst f75037db42 Pagename() function no longer returns fill extension. Fixes #1274. 2018-02-05 12:24:29 +01: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
Thomas KUNTZ a75b003c78 Update Mousetrap and use new 'mod' helper (#1245)
* Fix page list for files that have regexp special chars.

The page list collection logic was using the filename without any
scaping to create a regexp. This not only breaks for some names it might
even be a security problem by introducing bad regular expression as
filenames.

* Add another video to README.

* Test on Ruby 2.4

* Pass non-empty commit author details in transliteration test

Empty name or email are not allowed by libgit2 and cause a test failure
when the test suite is run against rugged_adapter.

* Solve bug when folder contain non-ascii character

When you create a file in a folder with non-ascii character, for exemple "Réseau", after creating the page, it throwed an "URI::InvalidURIError", given the fact that the url returned was "/Réseau/H%C3%A9y", only the part with the name of the file was correctly encoded.

So I propose to encode every part of the url to solve this issue
So I just

* readme: Use --document in place of deprecated options

* Release 4.1.0

* Skip tests for transliteration for adapters different than grit

* Fix date. Closes #1211

* Set bar_side for versioned pages. Closes #1226

* Update gemijione dependency. Closes #1227

* Release 4.1.1

* Update Mousetrap and use new 'mod' helper

Since version 1.4, a generic 'mod' helper can be used for cross
platform shortcuts. I updated Mousetrap to latest v1.6.1 and
used 'mod+s' instead of ['ctrl+s', 'command+s'] for the editor's
keyboard shortcut.

See https://craig.is/killing/mice#api.bind.combo
2017-08-07 00:29:08 +02:00
Yang Zhang 56ad3251fd Add keyboard shorts dialog and enable Ctrl+S in the editor 2017-04-14 22:25:39 +08:00
Dawa Ometto 5aa5bccda3 Remove livepreview 2017-04-12 23:03:11 +02:00
Dawa Ometto 8aa10fe400 Yaml frontmatter (#1217)
Render YAML frontmatter

* Fix tests on 5.x

* Update README

* Refactor Page view #table

* Minor refactor

* Refactor
2017-04-09 19:26:04 +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
Dawa Ometto abb516e1b1 Merge pull request #1155 from gollum/dont_wait_on_versions
Remove calls to Page#last_version. Closes #1078.
2016-08-07 20:28:52 +02:00
Dawa Ometto 435a3e62ba Remove calls to Page#last_version, replace with AJAX-lookup of version info. 2016-08-07 20:09:01 +02:00