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
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
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
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
6bd2f3bff5
Drop 1.9.3 testing on Travis, add 2.3.0.
2016-01-10 15:28:23 +01:00
8c3c519679
Adds links to youtube videos in README.
2016-01-10 11:49:34 +01:00
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
5a53c58b04
Sanitize basepath options when adding with more than one / at the start. Fixes #1066
2015-12-05 23:23:22 -02:00
a61d1e3d10
Merge pull request #1094 from repotag/master
...
Update kramdown and useragent dependencies.
2015-11-30 11:26:51 +01:00
1a50f99189
Merge branch 'master' of https://github.com/gollum/gollum
2015-11-30 00:28:30 +01:00
6caacbf388
Update kramdown and useragent dependencies.
2015-11-30 00:28:01 +01:00
f876aa7d0f
Merge pull request #1077 from mpnowacki/renaming
...
fixed file renaming issues with page_file_dir
2015-11-02 11:42:50 +01:00
31e1281600
Merge pull request #1086 from ngyuki/fix-preview-sidebar
...
Fix position of sidebar in preview
2015-11-02 11:42:25 +01:00
90072a9332
Fix position of sidebar in preview
2015-11-02 12:45:30 +09:00
bacd2893b9
Merge pull request #1084 from SkyCrawl/master
...
Fixing the vague "running from source" description in README
2015-10-25 13:20:17 +01:00
7362fd859b
Fixing the "running" section
2015-10-25 13:12:36 +01:00
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
ab42c0c0df
Release 4.0.1
2015-09-20 14:48:32 +02:00
de5aed2f6a
Merge pull request #1069 from repotag/master
...
Added security check.
2015-09-20 14:31:14 +02:00
ce68a88293
Added security check.
2015-09-20 13:53:02 +02:00
288f75929d
Merge pull request #1065 from n-st/sysv-init-script
...
Added init script for Debian's SysV-style init system
2015-09-16 12:52:38 +02:00
8528dd0c7f
Merge pull request #1067 from SkyCrawl/master
...
Fixing the link to Windows support meta issue
2015-09-14 17:55:18 +02:00
Daniele Grandini
Jérémie Astori
Horacio Sanson
Bart Kamphorst
Sven Schwyn
Dawa Ometto
Maarten Engelen
Jean Hominal
André Luis Leal Cardoso Junior
ngyuki
SkyCrawl
mpnowacki