wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
1,922 Commits 23 Branches 89 Tags
8aa10fe40043e7a080ae41f77990244fe8657dca
Commit Graph

1922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 895d2eb97e Merge pull request #1198 from QuaeNocentDocent/template_page 
Template page
 2017-03-09 16:29:44 +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 6b20c5df71 Merge pull request #1176 from svoop/5.x 
Update gemojione to 3.2
 2016-12-31 10:52:01 +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 d3cc5a69c4 Merge branch 'rc' 2016-08-07 21:36:51 +02:00
Dawa Ometto 07ca53a778 Merge branch 'rc' into master 
Conflicts:
	bin/gollum
 2016-08-07 21:36:13 +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
Bart Kamphorst f02c934ad7 Merge pull request #1154 from maarten/#855-delete-files 
Fixes #855 Adds file deletion fuctionality.
 2016-08-07 19:46:55 +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
Dawa Ometto 6316f97c06 Update CONTRIBUTING.md 2016-08-07 12:50:48 +02:00
Dawa Ometto 14830af306 Update CONTRIBUTING.md 2016-08-07 12:50:18 +02:00
Dawa Ometto b620decde7 Add contributing guidelines 2016-08-07 12:48:07 +02:00
Bart Kamphorst b08ca620a0 Merge pull request #1148 from astorije/patch-2 
Remove deprecated github-markdown markup
 2016-07-11 21:44:02 +02:00
Jérémie Astori 66a2bb0393 Remove deprecated github-markdown markup 
From [RubyGems](https://rubygems.org/gems/github-markdown/versions/0.6.9):

> THIS GEM IS NOT MAINTAINED AND NOT SUPPORTED.

Also, the GitHub repository, maintained by GitHub, was removed.

The link is now a redirect, it doesn't point to the GFM page anymore.
 2016-07-11 12:19:43 -04: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 148eda2990 Merge pull request #1136 from gollum/503-safari-live 
Add Safari to livepreview-enabled browsers. Fixes #503
 2016-06-16 13:28:46 +02:00
Dawa Ometto 330f7b4002 Add Safari to livepreview-enabled browsers. Fixes #503 2016-06-16 12:58:22 +02:00
Dawa Ometto def0fc8866 Merge pull request #1126 from svoop/emoji 
Support for emoji
 2016-06-09 16:43:52 +02:00
Sven Schwyn fa1bcf9608 Add support for emojione 2016-05-19 20:33:25 +02:00
Bart Kamphorst 5a5e56a47b Merge pull request #1111 from jhominal/master 
Unconditionally add 'test-unit' dependency.
 2016-02-24 02:28:24 +01:00
Jean Hominal e64f40eaa3 Unconditionally add 'test-unit' dependency. 
Fixes #1110
 2016-02-23 22:52:07 +01:00
Dawa Ometto 3f3d86ad4c Merge pull request #1091 from jhominal/master 
Use `last_version` instead of `versions` when possible. Fixes #1087.
 2016-02-21 22:51:40 +01: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
Bart Kamphorst c049f7c11f Merge pull request #1106 from gollum/youtube_demo_vids 
Adds links to youtube videos in README.
 2016-01-14 17:01:28 +01:00
Bart Kamphorst 6bd2f3bff5 Drop 1.9.3 testing on Travis, add 2.3.0. 2016-01-10 15:28:23 +01:00
Bart Kamphorst 8c3c519679 Adds links to youtube videos in README. 2016-01-10 11:49:34 +01:00
Dawa Ometto 4e5002a31e Merge pull request #1098 from andrehjr/gh-1066-sanitize-basepath 
Sanitize basepath options when adding with more than one / at the start Fixes #1066.
 2015-12-30 18:39:30 +01:00
André Luis Leal Cardoso Junior 5a53c58b04 Sanitize basepath options when adding with more than one / at the start. Fixes #1066 2015-12-05 23:23:22 -02:00
Bart Kamphorst a61d1e3d10 Merge pull request #1094 from repotag/master 
Update kramdown and useragent dependencies.
 2015-11-30 11:26:51 +01:00
Bart Kamphorst 1a50f99189 Merge branch 'master' of https://github.com/gollum/gollum 2015-11-30 00:28:30 +01:00
Bart Kamphorst 6caacbf388 Update kramdown and useragent dependencies. 2015-11-30 00:28:01 +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
Dawa Ometto 31e1281600 Merge pull request #1086 from ngyuki/fix-preview-sidebar 
Fix position of sidebar in preview
 2015-11-02 11:42:25 +01:00
ngyuki 90072a9332 Fix position of sidebar in preview 2015-11-02 12:45:30 +09:00