Commit Graph

1199 Commits

Author SHA1 Message Date
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 ddea445a28 Refactor create view. Fixes create with file extension. Fixes automatic selection of format in editor. 2018-02-05 15:15:54 +01:00
Bart Kamphorst f75037db42 Pagename() function no longer returns fill extension. Fixes #1274. 2018-02-05 12:24:29 +01:00
Bart Kamphorst 0b906dd952 Change gollum version to 5.0.1b to prevent confusion during development. Closes #1278. 2018-01-17 16:58:58 +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
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 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 35f6952519 Found more spurious whitespace substitution. 2017-04-23 11:45:48 +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 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 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 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
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 1e53d7ba53 Remove unicode support on deprecated ruby 1.8 2017-03-28 22:12:01 +02: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
Sven Schwyn 8da809f22c Update gemojione to 3.2
https://github.com/gollum/gollum-lib/issues/226
2016-12-28 23:49:39 +01:00
Daniele Grandini 54ece4e432 mv template load in page create and added tests 2016-08-27 15:51:18 +02:00
Daniele Grandini a50fcd31e2 final 2016-08-25 10:11: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 6910b6d024 Merge pull request #1143 from astorije/patch-1
Fix compare page not accessible in no-edit mode. Resolves #1140.
2016-08-07 20:17:34 +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
Maarten Engelen 236680aab9 Add file deletion functionality
Adds route for file deletion
Add styles and images for this
2016-08-07 17:18:36 +02:00
Jérémie Astori 0675844d97 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.
2016-06-27 13:50:47 -04:00
Dawa Ometto 330f7b4002 Add Safari to livepreview-enabled browsers. Fixes #503 2016-06-16 12:58:22 +02:00
Sven Schwyn fa1bcf9608 Add support for emojione 2016-05-19 20:33:25 +02:00
Jean Hominal 91833dd72e Use last_version instead of versions when possible. Fixes #1087.
Use Gollum::Page#last_version instead of Gollum::Page#versions in the
cases identified in #1087:
 * In Precious::App#show_page_or_file
 * In Precious::Views::Page#author
 * In Precious::Views::Page#date
2016-02-14 23:15:38 +01:00
Dawa Ometto f876aa7d0f Merge pull request #1077 from mpnowacki/renaming
fixed file renaming issues with page_file_dir
2015-11-02 11:42:50 +01:00
ngyuki 90072a9332 Fix position of sidebar in preview 2015-11-02 12:45:30 +09:00
mpnowacki 3811fb46b3 fixed file renaming issues with page_file_dir. This will only work with appropriate changes in gollum-lib 2015-10-04 11:34:25 +02:00
Dawa Ometto ab42c0c0df Release 4.0.1 2015-09-20 14:48:32 +02:00
Bart Kamphorst ce68a88293 Added security check. 2015-09-20 13:53:02 +02:00
Matt Hill 51b5a11a54 Fix custom.x path when page-file-dir is not set 2015-08-20 23:19:25 -04: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
GROUX Richard f9e5c05046 Fix search without querry
App crash when we try to get /search

Add an empty querry '' as default
2015-07-21 19:35:45 +02:00