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
56ad3251fd
Add keyboard shorts dialog and enable Ctrl+S in the editor
2017-04-14 22:25:39 +08:00
750e2ee677
Fix syntax error in bin/gollum
2017-04-14 00:28:44 +02:00
cc273f30e9
Merge pull request #1224 from repotag/remove_livepreview
...
Remove livepreview
2017-04-13 20:14:27 +02:00
64fd56e8ef
Merge branch '5.x' into remove_livepreview
2017-04-13 20:00:59 +02:00
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
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
cabe9f353b
Fix tests
2017-04-13 00:24:06 +02:00
5aa5bccda3
Remove livepreview
2017-04-12 23:03:11 +02:00
16ea6245e3
Follow page renames in history view
2017-04-12 23:00:07 +02:00
df9382bbc3
Add test for Page view #sha. Fix h1 title test.
2017-04-12 19:50:40 +02:00
39aa290ea6
Expose page's SHA id in Page view. Closes 1222.
2017-04-12 19:42:26 +02:00
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
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
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
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
1e53d7ba53
Remove unicode support on deprecated ruby 1.8
2017-03-28 22:12:01 +02:00
895d2eb97e
Merge pull request #1198 from QuaeNocentDocent/template_page
...
Template page
2017-03-09 16:29:44 +01:00
c5f3270ff6
final before pull request
2017-02-24 13:54:29 +01:00
318a4717d1
rebasing
2017-02-24 13:50:38 +01:00
37a11546fa
rebasing
2017-02-24 13:49:28 +01:00
643a42aea6
Merge branch 'template_page' of https://github.com/QuaeNocentDocent/gollum into template_page
...
rebasing
2017-02-24 13:43:42 +01:00
2b8497531d
rebasing
2017-02-24 13:41:52 +01:00
fdbde7840d
mv template load in page create and added tests
2017-02-24 13:32:20 +01:00
d702026134
final
2017-02-24 13:32:20 +01:00
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
72c8e1aff3
Add option to configure PlantUML endpoint
2017-02-24 13:32:20 +01:00
6b20c5df71
Merge pull request #1176 from svoop/5.x
...
Update gemojione to 3.2
2016-12-31 10:52:01 +01:00
8da809f22c
Update gemojione to 3.2
...
https://github.com/gollum/gollum-lib/issues/226
2016-12-28 23:49:39 +01:00
54ece4e432
mv template load in page create and added tests
2016-08-27 15:51:18 +02:00
a50fcd31e2
final
2016-08-25 10:11:22 +02:00
d3cc5a69c4
Merge branch 'rc'
2016-08-07 21:36:51 +02:00
07ca53a778
Merge branch 'rc' into master
...
Conflicts:
bin/gollum
2016-08-07 21:36:13 +02:00
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
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
435a3e62ba
Remove calls to Page#last_version, replace with AJAX-lookup of version info.
2016-08-07 20:09:01 +02:00
f02c934ad7
Merge pull request #1154 from maarten/#855-delete-files
...
Fixes #855 Adds file deletion fuctionality.
2016-08-07 19:46:55 +02:00
236680aab9
Add file deletion functionality
...
Adds route for file deletion
Add styles and images for this
2016-08-07 17:18:36 +02:00
6316f97c06
Update CONTRIBUTING.md
2016-08-07 12:50:48 +02:00
14830af306
Update CONTRIBUTING.md
2016-08-07 12:50:18 +02:00
b620decde7
Add contributing guidelines
2016-08-07 12:48:07 +02:00
b08ca620a0
Merge pull request #1148 from astorije/patch-2
...
Remove deprecated github-markdown markup
2016-07-11 21:44:02 +02:00
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
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
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
330f7b4002
Add Safari to livepreview-enabled browsers. Fixes #503
2016-06-16 12:58:22 +02:00
def0fc8866
Merge pull request #1126 from svoop/emoji
...
Support for emoji
2016-06-09 16:43:52 +02:00
fa1bcf9608
Add support for emojione
2016-05-19 20:33:25 +02:00
5a5e56a47b
Merge pull request #1111 from jhominal/master
...
Unconditionally add 'test-unit' dependency.
2016-02-24 02:28:24 +01:00
e64f40eaa3
Unconditionally add 'test-unit' dependency.
...
Fixes #1110
2016-02-23 22:52:07 +01:00
Dawa Ometto
Yang Zhang
Dawa Ometto
Zhang YANG
Daniele Grandini
Jérémie Astori
Horacio Sanson
Bart Kamphorst
Sven Schwyn
Maarten Engelen
Jean Hominal