b989f160cf
Merge branch 'master' into feature/gollum-lib
...
Conflicts:
lib/gollum/markup.rb
test/test_gitcode.rb
2013-03-20 07:46:11 +00:00
54e144564c
Merge pull request #660 from simonista/fix-github-links
...
Fix for embedding code from github
2013-03-19 17:25:36 -07:00
1f79126b27
Move gollum back end to gollum-lib #647
2013-03-19 22:11:09 +00:00
846ebb285e
Add option for custom js (like custom css)
...
* Add a new 'js' flag to indicate you want to embed a file named 'custom.js'
which should exist at the root of the wiki
2013-03-17 18:42:01 -06:00
e567759935
Fix for embedding code from github
2013-03-17 18:27:40 -06:00
90bbb8e348
Fix symlink base path, don't allow symlinks in bare repos.
2013-03-16 22:00:19 -04:00
2a4517ced4
Add basic support for symbolic links.
2013-03-16 21:07:05 -04:00
02dfb0a8c1
Fix tests that depended on old github location
...
* Two tests depended on the following file existing:
github/gollum/master/test/file_view/1_file.txt
2013-03-14 23:14:39 -06:00
8ebc2f7079
Fix #645
2013-03-04 19:32:55 -05:00
60e3baad8a
Fix empty commits and non-descript revert messages
...
* Empty commits via editor now have the message: "[no message]"
* Reverts now have the slightly more useful message: "Revert commit #1234567 "
2013-03-04 12:37:16 -05:00
852ecdd1a9
Update pygments.rb. Fixes #639
2013-02-26 18:57:34 -05:00
78f5df5e56
Update org-ruby. Fixes #640
2013-02-26 18:25:00 -05:00
4faf5a0150
Update working directory when creating new page in subdirectory
2013-02-26 22:43:27 +00:00
e3acef0e91
Add test for custom markup engine
...
This required adding a file to the example repo, so some of the tests'
expected hash values changed accordingly.
2013-02-25 21:06:00 -05:00
2e2e6457c7
Add option to specify index_page
...
Fix redirect to index_page creation for subdirs
Redirect attempts to access directories to index_page
Add tests
2013-02-06 22:05:36 -05:00
8fd8a56893
New and Rename buttons now support directories
...
* Also fixes renaming a file from a subdirectory moves it to the root.
* Add context info option to dialog, used in the new dialog
* Added CSS to support new context option for dialogs
* Fix /pages view messing up directory creation in new
* Removed the Edit and Rename buttons from historic view
2013-01-30 11:03:00 -05:00
78e4dfbece
Fix metadata tests
2013-01-08 17:09:21 -05:00
9227f0a195
Fix tests
...
File names do not have spaces.
2012-12-20 18:08:21 -07:00
4838611273
Fix #602
2012-12-07 17:16:25 -07:00
144f9959c9
Update test #602
2012-12-07 17:02:50 -07:00
291c6a8fa0
Add test for #602
2012-12-07 16:49:00 -07:00
904f975f0c
Fix comment
2012-11-30 00:02:24 -07:00
4ee94a6574
Fix UTF-8 header and add test
2012-11-29 23:47:25 -07:00
f929df0419
Update check_h1
2012-11-29 23:04:40 -07:00
31a95e81b3
Fix test name
2012-11-29 21:36:04 -07:00
70a4e9551b
Improve h1 test
2012-11-29 21:27:45 -07:00
1b53e36666
Fix UTF-8
2012-11-29 16:58:47 -07:00
10fa5c7bd2
Upgrade to stringex 1.5
2012-11-29 16:50:52 -07:00
7d5311a075
Modified gitcode to allow syntax highlighting of arbitrary files
2012-11-19 12:59:45 -05:00
8b3d944fd2
Fix #586
...
Place ASCIIDOC test behind ENV var
2012-11-16 19:08:45 -07:00
2d886fd38a
Fix tests #587
2012-11-16 18:13:38 -07:00
be1883f317
Use HTTPS rubygems
...
Update gemspec
2012-11-16 17:07:38 -07:00
30119e0c77
Fix tests
2012-11-16 17:03:18 -07:00
3d21ed362e
Add history view test
2012-11-14 21:03:24 -07:00
f699b82a9f
Fix #539
2012-11-11 14:18:14 -07:00
bc4fc0edd9
Fix gitcode test
2012-11-11 13:14:25 -07:00
9c50ba9eeb
XSLT was never used
2012-11-10 17:02:27 -07:00
ca7d82278c
Pretty print with nokogiri
2012-11-10 16:34:37 -07:00
6888420cc6
Update file_view output
2012-11-10 12:15:19 -07:00
c5631f5b7d
Fixed a:hover not highlighting the a block correctly
2012-11-10 12:15:19 -07:00
fe0eb72fa3
Renamed page.meta_data to page.metadata for consistency with views
2012-11-09 18:29:49 -05:00
2783257f06
Added page.meta_data to tests
2012-11-09 18:25:33 -05:00
b5be5df11a
Fix test name
2012-11-06 18:26:49 -07:00
70127922ab
Added test for #568
2012-11-06 15:49:47 -05:00
6fa4504e31
Fix #551
2012-10-28 12:37:02 -06:00
72c5a74cf1
Update test
...
The test passes when verified manually using bin/gollum. Without a running server the test
will fail so it has been commented out. If there's an easy way to mock Rack::Server
then the test can be restored.
2012-10-27 23:44:11 -06:00
919f41a0f1
Fix #559
2012-10-27 23:44:11 -06:00
776df4e6ee
Fix nokogiri rendering
...
https://github.com/sparklemotion/nokogiri/issues/782
2012-10-27 19:52:26 -06:00
fa16c8960c
Fix #560
2012-10-27 17:58:14 -06:00
fbc0548b43
Add --show-all
...
--show-all will show all files in file view (not just valid pages). Default is false.
2012-10-22 19:03:21 -06:00
Jamie Oliver
bootstraponline
Simon Williams
Charles Pence
Daniel Kimsey
James Dabbs
Arran Cudbard-Bell