Commit Graph

2266 Commits

Author SHA1 Message Date
Dawa Ometto 2f864c5e15 Stop support for ruby 2.0.0 because it is not compatible with a safe nokogiri. See https://github.com/gollum/gollum-lib/issues/278 2017-07-31 18:09:32 +02:00
Dawa Ometto c9e3e9aa84 Try fix Travis 2017-07-31 18:05:43 +02:00
Dawa Ometto 7139590798 Try fix travis 2017-07-31 18:01:37 +02:00
Dawa Ometto 37c1183515 Fix potential bug in YAML rendering: convert object to string before escaping 2017-05-31 17:18:45 +02:00
Dawa Ometto 935a080152 Merge pull request #1235 from svoop/escape_emojis
Document how to escape emoji
2017-04-30 20:49:04 +02:00
Sven Schwyn 6f11ce71c4 Minor rewording 2017-04-30 17:30:10 +02:00
Sven Schwyn f41a85ced9 Document how to escape emoji 2017-04-30 15:54:55 +02:00
Dawa Ometto 97fab1df14 Mark more Precious::App internal methods as private 2017-04-27 23:54:28 +02:00
Dawa Ometto f6273ded80 app.rb: mark non-route methods as private. 2017-04-27 23:32:16 +02:00
Dawa Ometto 9b7028a74e Remove superfluous useragent tests 2017-04-27 23:28:33 +02:00
Dawa Ometto 16894330a9 Merge pull request #1234 from repotag/wssub_fix
Found more spurious whitespace substitution.
2017-04-23 11:53:48 +02:00
Dawa Ometto 35f6952519 Found more spurious whitespace substitution. 2017-04-23 11:45:48 +02:00
Dawa Ometto ca50e87538 Merge pull request #1229 from ProgramFan/feature-5.x/add-keyboard-shortcuts-dialog
Add keyboard shortcuts dialog. Closes #505.
2017-04-17 22:24:48 +02:00
Dawa Ometto 0870655455 Release 4.1.1 v4.1.1 2017-04-17 11:20:06 +02:00
Dawa Ometto ba24a7bb8c Update gemijione dependency. Closes #1227 2017-04-17 11:01:50 +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 f32d7465a2 Set bar_side for versioned pages. Closes #1226 2017-04-14 00:31:09 +02:00
Dawa Ometto 750e2ee677 Fix syntax error in bin/gollum 2017-04-14 00:28:44 +02:00
Dawa Ometto cc273f30e9 Merge pull request #1224 from repotag/remove_livepreview
Remove livepreview
2017-04-13 20:14:27 +02:00
Dawa Ometto 64fd56e8ef Merge branch '5.x' into remove_livepreview 2017-04-13 20:00:59 +02:00
Dawa Ometto 0fa47047f3 Merge pull request #1225 from repotag/follow_renames
Follow page renames in history view. Close #565
2017-04-13 19:59:59 +02:00
Dawa Ometto 6e2559f77a Merge pull request #1223 from repotag/expose_page_sha
Expose page's SHA id in Page view. Closes 1222.
2017-04-13 01:01:30 +02:00
Dawa Ometto cabe9f353b Fix tests 2017-04-13 00:24:06 +02:00
Dawa Ometto 5aa5bccda3 Remove livepreview 2017-04-12 23:03:11 +02:00
Dawa Ometto 16ea6245e3 Follow page renames in history view 2017-04-12 23:00:07 +02:00
Dawa Ometto df9382bbc3 Add test for Page view #sha. Fix h1 title test. 2017-04-12 19:50:40 +02:00
Dawa Ometto 39aa290ea6 Expose page's SHA id in Page view. Closes 1222. 2017-04-12 19:42:26 +02: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
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
Dawa Ometto e202698bf1 Merge pull request #1189 from nimag42/patch-1
Solve bug when folder contains non-ascii character
2017-04-09 11:49:54 +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 11c2bf7dae Fix date. Closes #1211 2017-04-05 23:05:24 +02:00
Dawa Ometto 159a2e13ad Merge pull request #1213 from repotag/remove_ruby18
Remove unicode support on deprecated ruby 1.8
2017-04-04 14:31:08 +02:00
Dawa Ometto 1e53d7ba53 Remove unicode support on deprecated ruby 1.8 2017-03-28 22:12:01 +02:00
Dawa Ometto 53cf0e1148 Merge pull request #1201 from adamniedzielski/skip-transliteration-tests-rugged
Skip tests for transliteration for adapters different than grit
2017-03-11 20:35:53 +01:00
Adam Niedzielski 2d1e49e3f2 Skip tests for transliteration for adapters different than grit 2017-03-11 19:28:31 +01:00
Dawa Ometto 199161f611 Merge pull request #1188 from adamniedzielski/pass-non-empty-author-details
Pass non-empty commit author details in transliteration test
2017-03-10 12:00:57 +01:00
Dawa Ometto ece5c775f1 Release 4.1.0 v4.1.0 2017-03-09 17:34:37 +01:00
Dawa Ometto 895d2eb97e Merge pull request #1198 from QuaeNocentDocent/template_page
Template page
2017-03-09 16:29:44 +01:00
Dawa Ometto 3121c43b71 Merge pull request #1180 from bogado/issue#1179
Fix page list for files that have regexp special chars.
2017-03-09 16:22:40 +01:00
Daniele Grandini c5f3270ff6 final before pull request 2017-02-24 13:54:29 +01:00
Daniele Grandini 318a4717d1 rebasing 2017-02-24 13:50:38 +01:00
Daniele Grandini 37a11546fa rebasing 2017-02-24 13:49:28 +01:00
Daniele Grandini 643a42aea6 Merge branch 'template_page' of https://github.com/QuaeNocentDocent/gollum into template_page
rebasing
2017-02-24 13:43:42 +01:00
Daniele Grandini 2b8497531d rebasing 2017-02-24 13:41:52 +01:00
Daniele Grandini fdbde7840d mv template load in page create and added tests 2017-02-24 13:32:20 +01:00
Daniele Grandini d702026134 final 2017-02-24 13:32:20 +01:00
Jérémie Astori e2d55b45ba Fix compare page not accessible in no-edit mode
Permission checking was spread across `post` action handlers instead of inside the `before` to normalize between `get` and `post` action handlers and be more explicit.
2017-02-24 13:32:20 +01:00
Horacio Sanson 72c8e1aff3 Add option to configure PlantUML endpoint 2017-02-24 13:32:20 +01:00
Bart Kamphorst 51e8caf369 Merge pull request #1191 from polyzen/patch-1
readme: Use --document in place of deprecated options
2017-02-16 16:05:35 +01:00