Joe Pettersson
4d0bdcc8c0
Update README.md to show options
2014-01-10 13:47:15 +00:00
bootstraponline
0abdb67687
Merge pull request #781 from anchor/per-page-uploads
...
Implement the ability to store uploads on a per-page basis
2014-01-04 19:11:07 -08:00
Matt Palmer
d1fb98cf1b
Merge remote-tracking branch 'upstream/master' into per-page-uploads
...
Conflicts:
lib/gollum/public/gollum/javascript/gollum.js
2014-01-03 17:49:53 +11:00
Matt Palmer
5eac24eacb
Implement the ability to store uploads on a per-page basis
...
Storing all uploaded files in a single directory kinda sucks when you've got
a largish wiki, or the possibility of filename collisions. With this patch,
though, you can set `:per_page_uploads => true` in your wiki settings and
have the file uploaded to a directory named for the page you were on when
you clicked 'Upload'.
2014-01-03 15:34:24 +11:00
bootstraponline
3fd16daeca
Release 2.6.0
v2.6.0
2014-01-02 23:32:41 -05:00
bootstraponline
d9b38c3b73
Use baseUrl for /uploadFile
...
Thanks @mpalmer
https://github.com/gollum/gollum/pull/780
2014-01-02 23:03:33 -05:00
bootstraponline
0a5176c1ee
Merge pull request #780 from peterkeen/upload-base-path
...
Base upload button action on home page url
2014-01-02 19:50:35 -08:00
Pete Keen
b836b0e273
Base upload button action on home page url
2014-01-01 17:05:32 -05:00
bootstraponline
9a41e2a65d
Merge pull request #772 from zorun/master
...
Prevent indexing of old versions of a page (fixes #768 )
2014-01-01 09:05:07 -08:00
bootstraponline
cb1b74ed7b
Merge pull request #776 from eucher/first_slash_in_create
...
First slash in create
2014-01-01 09:02:58 -08:00
bootstraponline
e25e5d9768
Merge pull request #779 from anchor/semantic-versioning
...
Fix version specifiers
2014-01-01 09:02:14 -08:00
Matt Palmer
9f3766952f
Fix version specifiers
...
Adjusted the version specs on the two gems that explicitly state they are
SemVer compliant, and fixed up the one dependency that correctly *could* have
used ~> but didn't.
2013-12-31 15:18:15 +11:00
bootstraponline
cb4471b07f
Merge pull request #778 from jhogendorn/baddialog
...
Fixes dialog hiding so it doesnt block the UI
2013-12-08 08:55:28 -08:00
Joshua Hogendorn
9fa7eac41f
Fixes dialog hiding so it doesnt block the UI
2013-12-08 20:15:59 +10:00
zorun
94fa985550
Add a test for issue #772
2013-12-06 02:46:15 +01:00
Evgeni Cherdancev
1c498ead35
gsub before begin
2013-11-28 12:32:08 +07:00
Evgeni Cherdancev
5abc983172
write_page first slash fix
2013-11-28 12:26:06 +07:00
zorun
7a0d4919b0
Prevent indexing of old versions of a page ( fixes #768 )
2013-11-22 12:49:42 +01:00
bootstraponline
d5e9183877
Merge pull request #762 from pdenes/add_template_dir_option
...
add option to specify custom template directory
2013-11-11 14:25:27 -08:00
bootstraponline
9b39a51e9f
Merge pull request #758 from samer/master
...
Fix revert for pages in directories
2013-11-11 14:25:10 -08:00
pdenes
bec7eabd1c
add option to specify custom template directory
2013-11-06 21:46:54 +00:00
Samer N
cd3791087f
Fix revert for pages in directories, as seen in issue #736
2013-11-04 13:03:31 +02:00
Jamie Oliver
714985e377
Release 2.5.2
v2.5.2
2013-11-02 11:31:21 +00:00
Jamie Oliver
76c37dce96
Upgrade gollum-lib
2013-11-02 11:21:39 +00:00
bootstraponline
5a9af40058
Release 2.5.1
v2.5.1
2013-10-15 07:20:13 -04:00
bootstraponline
e871ff35b7
Merge pull request #753 from bootstraponline/master
...
Update gemspec
2013-10-15 04:19:41 -07:00
bootstraponline
ecc6c32933
Update gemspec
2013-10-15 07:11:36 -04:00
bootstraponline
831cf61a08
Merge pull request #747 from invenia/master
...
Created OpenRC init script.
2013-10-12 12:18:22 -07:00
Curtis Vogt
cc1231dece
Added MIT license to init script header.
2013-09-30 13:52:34 +00:00
bootstraponline
bb3d1a165b
Merge pull request #751 from 1gor/patch-1
...
Added dependency 'github-markdown'
2013-09-29 09:29:23 -07:00
1gor
3da0426c54
Added dependency 'github-markdown'
2013-09-29 10:49:11 +06:00
Curtis Vogt
e01aa25be3
Added basic logging to OpenRC script.
2013-09-27 17:02:16 +00:00
Abhijit Menon-Sen
ee2f9d8dcb
Merge pull request #748 from singlebrook/upload_instructions
...
Add some instructions to upload dialog
2013-09-27 07:30:40 -07:00
Leon Miller-Out
4d8677965c
Add instructions for how to access file post-upload
2013-09-27 10:16:35 -04:00
Leon Miller-Out
72729d5510
Whitespace
2013-09-27 10:16:35 -04:00
Curtis Vogt
0b57e70c87
Removed explictly set license in OpenRC init script.
2013-09-27 14:09:00 +00:00
Curtis Vogt
033d6489f8
Created OpenRC init script.
2013-09-26 16:28:19 +00:00
Abhijit Menon-Sen
8608007337
Merge pull request #743 from singlebrook/upload_action_path
...
Use correct path for uploadFile action even when current page is in a folder.
2013-09-17 21:32:33 -07:00
Leon Miller-Out
665e493570
Use correct path for uploadFile action even when looking at a page in a folder
2013-09-17 12:36:53 -04:00
bootstraponline
eb1e2f60f3
Fix #740
2013-09-12 08:49:27 -04:00
bootstraponline
dc637f0a9b
Merge pull request #734 from repotag/no_grit
...
No grit
2013-08-11 08:07:33 -07:00
Dawa Ometto
f81634728d
Replaced grit calls to new calls in gollum-lib 1.06 (set_git_timeout and set_git_max_filsize). Removed grit dependency from tests, using cp of empty.git instead. Replaced Grit exceptions with equivalents in the Gollum module.
2013-08-11 13:19:43 +02:00
bootstraponline
440cd5ebc0
Merge pull request #735 from ngyuki/fix-edit-for-multibyte
...
Fix `Encoding::CompatibilityError` of edit view.
2013-08-10 11:27:14 -07:00
Jamie Oliver
1cd7d0f205
Use display path in rename dialog. Fixes #703
2013-08-10 11:41:15 +01:00
ngyuki
a69d62911c
Fix editing of the sidebar with multi-byte characters.
2013-08-09 14:45:19 +09:00
ngyuki
395e9bd006
Add test for editing the sidebar, including multi-byte characters.
2013-08-09 14:41:52 +09:00
Jamie Oliver
90e20810d5
Do not force downcase on URLs. Fixes #621
2013-08-04 18:27:32 +01:00
bootstraponline
9c714e7687
Release 2.5.0
v2.5.0
2013-07-21 07:22:46 -04:00
bootstraponline
6c3523d61c
Merge pull request #725 from amenonsen/upload
...
Add a file Upload button
2013-07-21 04:19:58 -07:00
Abhijit Menon-Sen
183840b793
Add file upload functionality
...
Adds an :allow_uploads wiki option, an --allow-uploads flag to
bin/gollum, an "Upload" button with a file upload dialog, and a
handler to commit uploaded files into the repository.
:allow_uploads defaults to false, to prevent unauthenticated users
from uploading arbitrary files into the repository (albeit only in
the uploads directory).
This code is based on the patch from @l3iggs at
https://github.com/gollum/gollum/issues/694 , but the handling on the
backend is completely rewritten to use the Committer infrastructure.
2013-07-21 16:28:15 +05:30