93af289d3b
Remove extraneous li tags
2015-04-06 02:40:02 -04:00
ec0e1bf26f
Merge pull request #992 from kirat-singh/fix-upload-file-url
...
prepend baseUrl to /uploadFile
2015-04-05 23:34:07 +02:00
e4df298bb4
prepend baseUrl to /uploadFile
2015-04-05 14:22:41 -04:00
804d21e31d
Release 3.1.3
2015-04-04 11:45:17 +02:00
6d33687866
Merge pull request #990 from repotag/issue940
...
Block on no-edit without using middleware
2015-04-03 17:32:20 +02:00
21bb1efb46
Block on no-edit without using middleware
2015-04-03 17:22:51 +02:00
9d0986f1ca
Merge pull request #964 from simonzack/mathjax_livepreview
...
Enable mathjax in live preview
2015-04-02 13:13:25 +02:00
fd483f397f
Merge pull request #988 from andrewarrow/fix_template_dir
...
adding template dir logic to app.rb vs. just the bin
2015-03-30 13:27:54 +02:00
09364850ee
adding template dir logic to app.rb vs. just the bin
2015-03-27 15:13:55 -07:00
4d3a8bad4c
Merge pull request #985 from uraimo/patch-1
...
Fixed two broken links in README.md
2015-03-13 14:40:19 +01:00
cc39b0aa41
Fixed two broken links in README.md
...
The textile site was shut down a few years ago, better refer to wiki for format details.
2015-03-13 14:28:04 +01:00
6fc3b4be75
Merge pull request #970 from repotag/issue969
...
Add root slash to drag-and-drop upload path. Resolves #969 .
2015-01-30 22:13:01 +01:00
af6d690fc8
Add root slash to drag-and-drop upload path. Resolves #969 .
2015-01-30 22:06:31 +01:00
eea5152444
Update README.md
2015-01-30 18:34:18 +01:00
1ca38b625b
Update README.md
2015-01-30 18:33:52 +01:00
f964407c47
Merge pull request #965 from simonzack/ace_hook
...
added an initAce hook to allow configuration of the live editor
2015-01-28 17:00:43 +01:00
3be2e76ec0
enable $ inline expressions so the example markdown doc works, $ can be escaped using \$ so shouldn't be much of an issue
2015-01-28 19:06:24 +11:00
f9a9b90ed7
enable mathjax in live preview
2015-01-28 18:00:35 +11:00
1f2917ac22
Merge pull request #959 from simonzack/ace_update
...
Updated ace so markdown highlights better.
2015-01-27 17:51:47 +01:00
fe1a8569f6
updated ace
2015-01-27 22:46:30 +11:00
33e8d4f328
added an initAce hook to allow configuration of the live editor
2015-01-27 21:16:05 +11:00
e183260d0a
Merge pull request #956 from repotag/issue_955
...
Resolves #955 .
2015-01-26 23:16:50 +01:00
b4023942b4
Remove page file dir from upload path
2015-01-26 23:10:28 +01:00
c10c24d90d
Merge pull request #953 from simonzack/master
...
Resolves #952 .
2015-01-25 18:45:17 +01:00
915f63cac4
pixel tweaks so the left scrollbar is selectable and the viewport takes the whole page
2015-01-26 04:15:14 +11:00
5c30ff4d3e
Release 3.1.2
2015-01-23 00:27:04 +01:00
3269f02ba7
Merge pull request #950 from repotag/fix_allow_editing
...
Set the allow_editing wiki option to true by default.
2015-01-23 00:26:22 +01:00
e5c2e3b3eb
Set the allow_editing wiki option to true by default.
2015-01-23 00:14:13 +01:00
77f4aee0af
Fix test related to gollum-lib TOC update
2015-01-23 00:00:01 +01:00
868cbdfc7b
Merge pull request #936 from techwiz24/iss922-sort-pages
...
Sort `/pages` alphabetically. Resolves #922 .
2015-01-13 10:18:51 +01:00
a650c0eab8
Sort /pages alphabetically
...
Previously, the 'All Pages' view was not sorted alphabetically. We need
to sort on the lowercase version of the page names so that lowercase
names do not end up at the bottom of the list and are instead mixed in
alphabetically, as they should be.
Patches test/test_latest_changes_view.rb to include changes needed to
test alphabetical sorting.
2015-01-12 19:04:07 -05:00
a7dc8d8c6f
Merge pull request #929 from repotag/830_pagename_encodings
...
Allow utf-8 page names when not using grit. Resolves #830 (when using rugged adapter).
2015-01-04 13:07:27 +01:00
355db16d2c
Allow utf-8 page names when not using grit.
2015-01-04 12:20:25 +01:00
c54ce41eb7
Merge pull request #928 from LEW21/compare-escape-redirect
...
Encode the page title in the URL of a diff page
2015-01-03 19:58:56 +01:00
afb7d4c9d1
Encode the page title in the URL of a diff page.
2015-01-03 17:56:51 +01:00
b55cdde9da
Merge pull request #924 from rtrvrtg/patch-1
...
Fix wiki_options errors for hosted Gollum instances.
2014-12-29 12:31:39 +01:00
93cbc6c770
Fix intermittent wiki_options errors
...
Changed to resolve intermittent errors where I'd see the following in my logs:
```text
ERROR -- : app error: undefined method `wiki_options' for Precious::App:Class (NoMethodError)
ERROR -- : /home/gollum/production/releases/20141229-172128/vendor/bundle/ruby/2.0.0/gems/gollum-3.1.1.1anchor4/lib/gollum/editing_auth.rb:10:in `call'
ERROR -- : /home/gollum/production/releases/20141229-172128/vendor/bundle/ruby/2.0.0/gems/rack-protection-1.5.3/lib/rack/protection/xss_header.rb:18:in `call'
...
```
I suspect this is the case for Sinatra applications that host instances of Gollum using its `map` feature, as this reflects the production setup we're using it in. Calling @app.settings.wiki_options uses the app instance that gets passed into Precious::EditingAuth, thereby ensuring that we're getting a Gollum instance all the time.
2014-12-29 17:28:47 +11:00
3b1b4a0a96
Update README.md
2014-12-22 20:28:50 +01:00
10b45cb54d
Add --bare command line option (see #811 ).
2014-12-22 20:20:57 +01:00
9d289e571b
Describe important security update.
2014-12-18 16:44:23 +01:00
cce871c30e
Allow running tests with alternative adapter
2014-12-08 01:44:01 +01:00
c2b605a90f
Release 3.1.1
2014-12-04 14:06:57 +01:00
09149592b5
Set allow_editing in Precious::App to true by default. Closes #911
2014-12-04 13:53:58 +01:00
e7410e551b
Bring rake dependency up to date.
2014-11-28 14:13:40 +01:00
9d77bc4192
Release 3.1.0
2014-11-28 14:06:36 +01:00
537fa0c423
Merge branch 'rc'
2014-11-28 13:38:33 +01:00
c78dbc8bc1
Merge branch 'master' into rc
...
Conflicts:
README.md
lib/gollum/app.rb
2014-11-28 13:36:21 +01:00
249eed5c2c
Update HISTORY.md
2014-11-28 13:26:47 +01:00
55eb3b24f7
Merge pull request #904 from ut7/latest_changes_test_fix_dependency
...
Update test to avoide being dependent on git configuration
2014-11-28 12:39:12 +01:00
508c255d0f
Update test to avoide being dependent on git configuration
...
The previous test implementation was dependent on the git configuration:
renames = copies
It could then pass on a computer with that config but not passe on
a different developpeur computer who could have a different git configuration.
That new implementation is testing the same behaviour but at a lower
level and is not dependent on the git configuration anymore.
2014-11-28 12:12:23 +01:00
Tim Fogarty
Dawa Ometto
Kirat Singh
Bart Kamphorst
Andrew Arrow
Umberto Raimondi
Sunny Ripert
simonzack
Nathan Lowe
Janusz Lewandowski
Geoffrey Roberts
Étienne Charignon