bootstraponline
87a95b85c5
Use FontAwesome 4.0.3 for anchor links
2014-04-05 13:30:03 -04:00
bootstraponline
4f49859bf7
Format css
2014-04-05 13:30:03 -04:00
bootstraponline
2c53e55533
Update css
2014-04-05 13:30:03 -04:00
bootstraponline
2ae75978dd
Format code
2014-04-05 13:30:02 -04:00
bootstraponline
452d825e66
Clean up tests. Remove templates
2014-04-05 13:30:02 -04:00
bootstraponline
a7a1c4f81e
Fix utf8 test
2014-04-05 13:30:02 -04:00
bootstraponline
00740eb9e8
Fix locale warning
2014-04-05 13:30:02 -04:00
bootstraponline
d76264c255
Update version to 3.0.0
2014-04-05 13:28:04 -04:00
bootstraponline
2297ce418d
Test on Ruby 2.1.1
...
The current stable version of Ruby is 2.1.1 so gollum should be tested there.
2014-04-02 23:30:20 -04:00
Sunny Ripert
fec85e6c59
Merge pull request #815 from nyjt/patch-1
...
Travis-CI SVG badge [ci skip]
2014-03-28 14:49:01 +01:00
Jozsef Nyitrai
54efa35fb3
Fix broken travis-ci badge
2014-03-28 14:08:21 +01:00
bootstraponline
988aebf630
Merge pull request #813 from bootstraponline/update_template_css
...
Update template.css to match github
2014-03-14 22:20:08 -04:00
bootstraponline
d2f7766aea
Update template.css to match github
2014-03-14 22:19:33 -04:00
Daniel Kimsey
25d30aee64
Release 2.7.0
v2.7.0
2014-02-20 11:10:00 -05:00
Daniel Kimsey
8af92da23c
Update version of gollum-lib to 2.0.0
2014-02-20 11:07:59 -05:00
Andrew Jaeger
08dd36e1b0
In the javascript editor, '$' characters were getting stomped on when
...
trying to remove backreferences after doing transformations on text
(Bolding, Italicizing, etc.). This can be fixed by first escaping the
string to be transformed and then unescaping it afterwards.
2014-02-08 14:18:36 -08:00
Sunny Ripert
324ff0a17c
Merge pull request #802 from ExocTBlid/master
...
Printing CSS
2014-02-04 14:05:15 -08:00
Blomquist, Ethan
cfb372e5e2
Another minor update...
2014-02-03 10:53:37 -07:00
Blomquist, Ethan
6513c732ba
Minor update to the delete link for printing.
2014-02-03 10:50:13 -07:00
Blomquist, Ethan
c4ea869223
Added print.css to remove action buttons and delete link for better print format.
2014-02-03 10:45:06 -07:00
Dawa Ometto
5387267675
Merge pull request #800 from budziq/delete_crash
...
Fixes crash if "delete page" was selected in preview of page that being created
2014-02-01 10:01:57 -08:00
Dawa Ometto
8e4c3cc562
Merge pull request #801 from budziq/history_crash_clean
...
fixes crash when selected "history" in preview of page being created
2014-02-01 09:58:42 -08:00
Michał Budzyński
8b6b0699e5
fixes crash when selected "history" in preview of page being created
...
- history button is hidden in newly created page preview as it makes no sense
- redirect to '/' if page does not exist yet
2014-01-31 02:43:03 +01:00
Michał Budzyński
229bff1658
Fixes crash if "delete page" was selected in preview of page that being created
2014-01-31 02:10:15 +01:00
Jamie Oliver
7a59d37350
Merge pull request #794 from github/ungithub-upstream
...
Status of GitHub Wikis
2014-01-28 11:12:20 -08:00
Dawa Ometto
d06b1e7883
Merge pull request #787 from akretion/fix-upload-path
...
fixes bug #786 per_page_uploads: incorrect file path if page is inside some directory
2014-01-25 02:12:55 -08:00
Akretion BOT
c8a284db9d
fixes bug #786 per_page_uploads: incorrect file path if page is inside some directory
2014-01-25 04:53:19 +01:00
Dawa Ometto
c7d6aceff4
Update sanitization.md
2014-01-23 19:33:25 +01:00
Dawa Ometto
7ea45d5e89
Update sanitization.md
...
Document customization of sanitation settings; see https://github.com/gollum/gollum/issues/759
2014-01-23 19:29:20 +01:00
Brandon Keepers
48c4aafb15
Remove reference to GitHub in readme
...
:(
2014-01-21 09:40:41 -08:00
Bart Kamphorst
ff302ed842
Fixes alignment of tables (issue #700 ).
...
Fixes https://github.com/gollum/gollum/issues/700 .
2014-01-21 16:55:05 +01:00
Dawa Ometto
20a2424b83
Merge pull request #793 from repotag/flag_for_per_page_uploads
...
Add optional 'mode' argument to --allow-uploads flag, allowing user to toggle per_page_uploads.
2014-01-21 03:34:43 -08:00
Dawa Ometto
de0f34a27a
Add optional 'mode' argument to --allow-uploads flag, allowing user to toggle per_page_uploads.
2014-01-21 12:14:47 +01:00
Sunny Ripert
d0992cce3f
Merge pull request #790 from akretion/better-redirect-after-upload
...
fixes #788 better redirect after file upload
2014-01-20 03:13:13 -08:00
Akretion BOT
15feeb3614
fixes #788 better redirect after file upload
2014-01-19 23:24:01 +01:00
Jamie Oliver
fc0a879e52
Support Ruby 2.1.0. Closes #784
2014-01-11 14:42:35 +00:00
Daniel Kimsey
9b675146a2
Merge pull request #782 from Joe8Bit/master
...
Update README.md to show options
2014-01-10 07:26:25 -08:00
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