Dawa Ometto
5dd31e32c6
Update gollum.gemspec
2022-09-27 10:24:51 +02:00
Dawa Ometto
869292ed1e
Expect error related to mathjax.conf
2022-09-22 11:40:10 +02:00
Dawa Ometto
5ed777834d
Fix locale location
2022-09-22 11:40:10 +02:00
Dawa Ometto
0098e9187a
Only require uglifier when precompiling
2022-09-22 11:40:10 +02:00
Dawa Ometto
e7b324f9ff
Make gollum executable
2022-09-22 11:40:10 +02:00
Dawa Ometto
c48c7dab0b
Run capybara tests against dockerized instance
2022-09-22 11:40:10 +02:00
benjamin wil
aac6c9da70
Remove dead link from Markdown help pane
...
In the editor, the help text for "Emoji" included a dead link. This
changes the link to a non-dead link.
After changing the JS, assets needed to be recompiled.
Resolves #1775 .
2022-09-21 19:19:07 -07:00
benjamin wil
af570a97e3
Test the help panel's "Emoji" section
...
This test is passing. I wrote it so I can safely change this panel in a
subsequent commit.
2022-09-21 19:19:07 -07:00
benjamin wil
193f449058
Make help button more accessible
...
Using an `aria-label` for buttons without text is a good practice.
This lets users who use screenreaders better understand what this button
is for.
2022-09-21 19:19:07 -07:00
Dawa Ometto
5b02a864e6
Add support for Mermaid. Resolves #1118 . ( #1834 )
...
* Add Mermaid node package
* Add mermaid wiki setting and load mermaid conditionally
* Perform js error checks with mermaid active
* Precompile static assets
2022-09-13 12:00:49 +02:00
Dawa Ometto
22edcf7174
Remove --static option, rename --no-static to --development-assets ( #1848 )
2022-09-12 16:57:28 +02:00
Josh Soref
681c687ad9
spelling: version
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
3743346633
spelling: switching
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
0d5753f075
spelling: specifying
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
e7de92a6de
spelling: simplistically
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
8bab196380
spelling: sensitive
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
eb08eb490d
spelling: rendering
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
6d8e89b5fe
spelling: overridden
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
c51562b738
spelling: nonexistent
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
5934697aa3
spelling: insensitively
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
83055d03f7
spelling: highlighter
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
231b1d108f
spelling: differently
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
2a132bce16
spelling: compatible
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
734909229d
spelling: committed
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
d50255c50d
spelling: changes
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
ed16078c2d
spelling: changelog
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
c983895870
spelling: boromir
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
590199ffb4
spelling: add
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
6995e609f0
spelling: actually
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
Josh Soref
e727098650
spelling: accepts
...
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com >
2022-09-06 21:47:02 -06:00
benjamin wil
f5766c81e7
Refactor keybinding tests
...
There was an order-dependent test failure that plagued a couple of my
recent pull requests:
Failure:
Default_keybindings#test_keybinding_unset
[/home/runner/work/gollum/gollum/test/test_app.rb:1098]
Minitest::Assertion: Expected: true
Actual: false
This commit ensures that `default_keybinding` is set to `nil` before
each test, and that the first line of each test changes the
configuration to the setting under test explicitly.
I also refactored the teardown to `nil` out all instance values so
they'll all certainly be reset when the next set of tests is run.
2022-09-04 14:40:06 -07:00
benjamin wil
6814dfe997
Test localization for some views
...
In #1853 , it was reported that some views are errorring out due to
missing translations. These tests exercise the translations for the
reported views.
2022-09-04 14:40:06 -07:00
benjamin wil
ed9ef140ba
Don't call nonexistent view method from I18n
...
The search view doesn't have a `#count` method, meaning this YAML
variable can't be filled properly.
2022-09-04 14:40:06 -07:00
benjamin wil
93c47caa4a
Provide ENV to set a custom Chrome binary path
...
On my system, Chrome is not in the location that the
`Selenium::WebDriver` expects it to be by default. This configuration
setting lets a developer set the path to the Chrome binary explicitly if
necessary.
2022-09-04 14:40:06 -07:00
benjamin wil
f15a72ce05
Extract Capybara setup to a helper file
...
Any Capybara-related test setup has been moved to `capybara_helper.rb`.
Now we just must require this file in order to run tests with Capybara.
I also moved the `#console_log` helper to this file to showcase how
other global helper methods could be defined in this file.
2022-09-04 14:40:06 -07:00
benjamin wil
ce85301e70
Remove link to SauceLabs ( #1846 )
2022-08-15 11:05:38 +02:00
benjamin wil
b0a1f8a004
Refactor test teardown
...
I saw a random (??) failure on the test on line 1098. This trivial chang
e just ensures that the configuration under test (the default
keybinding) is explicitly being set to `nil` after test runs.
2022-08-02 15:06:02 -07:00
benjamin wil
10ae969139
Refactor RSS view renderer
...
In issue #1815 , it was reported that Gollum RSS feeds attempt to put
entire commit messages into a feed item's `<title>` element.
Given that commit messages can be many paragraphs long, this is not an
acceptable way to render a feed item title.
If a commit has many lines or paragraphs, we now put those inside the
`<description>` element as of this commit.
While I was editing this view, I decided it would be a good time to
increase test coverage, as this view renderer was not under test at
all. I also fixed a typo ("Commited" should say "Committed"). There are
implicit dependencies on other gems that provide the
`Gollum::Git::Commit`, `Gollum::Git::Actor`, and `Rugged::Commit`
classes here, so mocking out simple versions of their interfaces seemed
like the path of least resistance to setting up controllable tests.
I also removed some now-duplicated assertions from `test/test_app.rb`.
2022-08-02 15:06:02 -07:00
benjamin wil
738d6f6ec4
Start localizing the views ( #1797 )
...
* Internationalize `Views::Compare` templates
* Internationalize `Views::Error` templates
* Internationalize `Views::History` templates
* Internationalize `Views::LatestChanges` templates
* Internationalize `Views::Layout` templates
* Internationalize `Views::Overview` templates
* Internationalize `Views::Search` templates
* Reset I18n load path after I18n helper tests
* Create locale helper for global translations
There are some translation strings we should use across multiple views.
Instead of duplicating the translations, we can use a different locale
helper method, `#tt`, to get a hash of all available translations.
Then, in a partial view like `pagination.mustache`, we can render
translations regardless of what the current view class is.
This commit adds the necessary helper, tests, and uses the new method to
render translations on the `pagination.mustache` template, which is used
by many other view classes (latest changes, history, and search).
2022-07-30 17:01:05 -07:00
Dawa Ometto
98cb39347d
Add integration tests with capybara ( #1707 )
...
* Add integration tests with capybara
* Add Rake task for running integration tests
* Don't include integration in default test task
2022-06-19 00:51:58 +02:00
Dawa Ometto
a1406da44a
Update test.yaml
...
Fix invalid `run` statement
2022-06-19 00:08:19 +02:00
Dawa Ometto
0d71655aa3
Update test.yaml
...
Add Selenium tests
2022-06-18 23:58:09 +02:00
Dawa Ometto
ee512bdad5
Refactor logic for determining per page upload location. Resolves #1830 ( #1831 )
...
* Refactor logic for determining per page upload location. Add tests.
* Add per page upload test for context
2022-06-18 22:31:26 +02:00
benjamin wil
738f8ed462
Start using Yarn to manage JavaScript dependencies ( #1824 )
...
* Start using `yarn` for vendor assets
Until this commit, Gollum has included JavaScript assets by committing
the source code to the `lib/gollum/public/gollum/javascript/` directory
and including them for compilation in the Sprockets asset manifest file
at `lib/gollum/public/gollum/javascript/app.js`. This has been a
reasonable way to deal with third-party JavaScript, but there are a few
downsides:
- It's a burden to find out if JavaScript dependencies have been
updated and require updating in Gollum.
- It doesn't give us good visibility into the JavaScript dependencies
required by our dependencies.
- It forces us to commit external code to our repository, which can
make our developer tools more difficult to configure or use. For
example: when I search for key words in the repository using
Ripgrep, I often get "garbage" results from minified JavaScript.
Managing JavaScript dependencies via a JS package manager can resolve
all of these issues.
This commit allows us to manage JavaScript dependencies using the Yarn
package manager for Node JS modules[1]. I chose Yarn over NPM for one
reason: Yarn is the JavaScript package manager that Rails uses by
default. So many Ruby developers will already be familiar with Yarn.
To demonstrate how this can change how we manage JS assets in Gollum,
I've configured Yarn and started to manage the `mousetrap` dependency
with it. I chose `mousetrap` to start because it's a smaller, mostly
uncomplicated dependency. I was easily able to manually test that
`mousetrap` is still working after re-compiling the assets.
Hopefully this gives anyone reading enough context to jump in and start
moving our third-party JS assets out of the codebase.
[1]: https://yarnpkg.com/
* Recompile assets
* Add dev environment setup info to CONTRIBUTING
Now that we require additional tooling to manage JavaScript
dependencies, it seemed reasonable to add more documentation around
setting up one's development environment.
* Don't compile assets without `yarn`-managed ones
If a developer compiled assets without first running `yarn install`, we
would get incomplete collection of up-to-date assets.
Let's ensure that the developer has all the required assets by enforcing
this in the precompile task they should be using to compile production
assets to begin with.
2022-06-06 15:52:26 +02:00
Dawa Ometto
c52ad667da
Merge branch 'fuzzylemma-configure-default-keybinding'
2022-05-26 13:16:55 +02:00
kyle tibbetts
9e722c5033
Add default keybinding flag. Resolves #1691
2022-05-26 13:16:09 +02:00
Dawa Ometto
9c2f8dfeba
Release 5.3.0
2022-05-25 11:24:19 +02:00
Dawa Ometto
8e35688b17
Release preparation: update readme, rakefile and changelog ( #1788 )
...
* Update README.md
* Add LATEST_CHANGES.md and release helpers
2022-05-24 16:27:39 +02:00
Paul Westcott
860e8b2ebd
Restore the normalize check that appears to be inadvertantly removed ( #1802 )
...
* Add test for normalize on upload
Co-authored-by: Dawa Ometto <d.ometto@gmail.com >
2022-05-24 16:13:35 +02:00
benjamin wil
0d2ab11604
Include rdoc as a dependency ( #1823 )
...
We've had some reports (#1342 , #1809 ) of `rdoc` not being installed
in some environments, causing Gollum to error in unpleasant ways.
This isn't an issue that's unique to Gollum, and I don't think `rdoc`
should actually be a hard dependency of this project. But since we can
side-step the issue by requiring `rdoc`, something that most users who
install Gollum via RubyGems would already have installed, I don't think
this is a horrible solution.
2022-05-04 18:25:48 -07:00
Andreas Wachter
ddc7dba0a2
Remove arm/v6 and v7 from the Docker builds ( #1822 )
...
* added platforms to actions, install libc6-compat for pi
* fix build problem for now. https://github.com/gollum/gollum/runs/6248371141
2022-05-03 08:15:09 -07:00
Andreas Wachter
bc3503f374
added platforms to actions, install libc6-compat for pi ( #1806 )
2022-04-30 23:04:45 -07:00
benjamin wil
2dfe103687
Ensure example git repos are valid ( #1821 )
...
* Ensure example git repos are valid
It was reported in #1817 that the `lotr_migration.git` repository we use
in `test/test_migrate.rb` is not a valid git repository on when clone,
causing the test suite to fail when run locally.
The reason is because there is no `.git/refs` directory, meaning it's
not really a valid git repository at all. I noticed that the `empty.git`
example repository has the same problem.
This commit simply ensures that the directory structure of these example
repositories are persisted in git.
* Run `test_migrate` tests on CI
Now that we've resolved the issue with the invalid git repository in the
parent commit, we can run all of the tests in our CI environment.
2022-04-30 23:03:56 -07:00
benjamin wil
95d35d38da
Switch from TestUnit to Minitest ( #1805 )
...
* Use `Minitest::Test`
`Test::Unit` is deprecated, and we can switch to `Minitest::Test` with
almost no side effects.
This commit does all of the work required to make Minitest tests run
with Gollum's existing test helpers.
* Change Minitest output format
- The `DefaultReporter` seems to have cleaner output than what we had
before.
- `color: true` ensures things are colorized. It's pretty nice.
* Tweak test formatting; fix order-dependent failure
The order-dependent failure has been been commented in code.
After manually bisecting the test suite, I was able to determine that
the template cascade tests were leaving the `@@template_priority_path`
set to an overridden value in tests run afterward.
* Tweak setting initialization
I could not see a meaningful reason behind calling `forbid` so early in
the settings initialization block. But moving the `forbid` call until
later resolved this issue.
In the real world, I don't see how this would cause issues. But I found
that calling `forbid` when `wiki_options[:allow_editing]` was set to
false caused order-dependent test errors where Sprockets would end up
being badly configured and left without an initialized
`Sprockets::Environment` object, which is required by the
`sprockets-helpers` gem to resolve asset paths.
The test that would cause errors is also in this commit diff. I've
updated it to be a bit more readable.
I also took this opportunity to review and clean up the `@allow_editing`
assignment, which seemed a bit obfuscated.
* Update migration script to test run warnings
When running the entire test suite, many warnings would be output:
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: already initialized constant HYPHENATE
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: previous definition of HYPHENATE was here
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: already initialized constant PAGE_FILE_DIR
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: previous definition of PAGE_FILE_DIR was here
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:91: warning: already initialized constant REPO
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:91: warning: previous definition of REPO was here
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:236: warning: already initialized constant TREE
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:236: warning: previous definition of TREE was here
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: already initialized constant PAGE_FILE_DIR
/Users/bw/Projects/gollum/test/test_migrate.rb:37: warning: previous definition of PAGE_FILE_DIR was here
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:91: warning: already initialized constant REPO
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:91: warning: previous definition of REPO was here
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:236: warning: already initialized constant TREE
/Users/bw/Projects/gollum/bin/gollum-migrate-tags:236: warning: previous definition of TREE was here
While it's unlikely that end users would ever see these warnings, as
they'd only be running the migration script once, they will always be
shown in our local test runs and CI run output.
So instead of using constants in our migration script, I change the
script to use class variables instead. This should not effect the
functionality of the migration script whatsoever.
* Use `File.exist?` instead of `File.exists?`
In Ruby 3.x, `File.exists?` is deprecated and outputs a warning.
* Improve "allow editing" tests
While making changes to the test suite, I ran into some issues with
these tests failing on occasion.
I added some setup and teardown to help with this.
But one thing I did notice is that the word "Upload" appears in the
response body whether uploading is enabled or not, so I made these
assertions more specific to the HTML rather than other places the word
"Upload" might appear (which is related to Critic Markup).
* Do not attempt to modify frozen strings
Using `#gsub!` here now results in an error. I am not entirely sure why
this hasn't happened before, but the error is straightforward:
FrozenError: can't modify frozen String: "Author %{author} is from %{location}"
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:45:in `gsub!'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:45:in `fill_argument_content'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:37:in `block in autofill'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `each'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `map'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `autofill'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:35:in `block in autofill'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `each'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `map'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:33:in `autofill'
/home/runner/work/gollum/gollum/lib/gollum/views/helpers/locale_helpers.rb:21:in `t'
/home/runner/work/gollum/gollum/test/gollum/views/test_locale_helper.rb:95:in `block (4 levels) in <top (required)>'
`#gsub!` attempts to modify a string in-place, which does not work when
a string is frozen. It seems that in some Ruby environments, strings
from YAML files are frozen.
* Fix another order-dependent test failure
Very occasionally, this test fails due to `Precious::App` settings set
in previous tests. You can reproduce this failure using this seed:
bundle exec rake TESTOPTS="--seed=42898"
2022-04-27 08:25:54 -07:00
Tevin
81c90e55a7
Add page context to template filter, resolves #1603 ( #1818 )
...
* Add a test for template filter
* Add a test for template filter with page parameter
* Passing page as a parameter to template filter
2022-04-25 09:44:19 +02:00
mishina
3f0b61081b
Add Ruby 3.1 to the CI matrix ( #1812 )
...
* Enclose all the version numbers in quotes
2022-03-23 15:30:49 +01:00
mishina
ecc317886a
Remove fields from gemspec that should not be set ( #1811 )
2022-03-23 13:27:54 +01:00
Dawa Ometto
4b2dc8e5c0
Set encoding explicitly in bin/gollum ( #1801 )
...
Resolves #1699
2022-01-13 21:45:49 +01:00
Nikita Ivanov
6f870501a0
Add option to show browser's local time ( #1653 )
...
* Add tests for --local-time option
* Update Readme
2022-01-13 18:19:22 +01:00
Nikita Ivanov
f30058f4ee
Fix broken History button when viewing historical deleted file ( #1759 )
...
* Fix broken History button when viewing historical deleted file
* Add tests
2022-01-13 18:06:13 +01:00
Dawa Ometto
82ce013cab
Fix Docker Deploy workflow ( #1800 )
2022-01-12 11:34:42 +01:00
Dawa Ometto
0c36cdf5ba
Support versioned Docker builds ( #1799 )
2022-01-12 11:04:12 +01:00
Dawa Ometto
6159fcd4a2
Remove explicit nokogori version requirement. Resolves #1779 ( #1798 )
...
* Remove explicit nokogori version requirement
* Require ruby >= 2.6, use latest JRuby
No longer needed after nokogiri's recent release, see https://github.com/gollum/gollum/issues/1779
2022-01-11 17:51:14 +01:00
benjamin wil
8f7793f461
Improve presentation of page navigation and #head area on mobile devices ( #1742 )
...
* Add `.header-title` style
This style shows smaller text on mobile devices. It reverts back to the
`2em` size used in Primer for H1 tags.
* Use `.header-title` for all `#head` headings
This commit:
1. Updates all main templates to use the new `.header-title` class,
making these titles less disruptively large on mobile devices.
2. Centers these titles for mobile breakpoints only, re-setting them
back to left-aligned text for `md-` breakpoints and up.
Note that in `lib/gollum/templates/wiki_contentf.mustache`, the
`.header-title` is not a `#head .header-title`, so it doesn't inherit
all of the new styles added in this commit.
* Adjust padding and presentation of mobile menu
To give mobile page headers more structure, this commit adjusts the
padding to be more symmetrical. It also adds a `border-bottom` on mobile
only. In my opinion this improves readability by telling the reader,
"This is where the navigation menu ends and the page content begins."
* Recompile assets
* Fix failing spec
My changes to the header layout seem to changed where the spaces in
`last_response.body` are placed. So let's assert only that the content
is present, since that's all this test should actually care about.
2021-12-30 14:36:51 -08:00
James Reynolds
589b4bce39
Added docker environment variables for author and email ( #1789 )
...
Sets git user.name and user.email if env var is set
2021-12-30 14:27:20 -08:00
benjamin wil
9c574fd760
Improve test suite and CI run performance ( #1796 )
...
* Simplify test
I came across this test because it was failing JRuby CI runs. I should
emphasize, though, that this test was only failing due do an upstream
bug in Nokogiri v1.12.5.
When I was reviewing the test, to understand why it was failing at all,
I noticed that the assertion was rather obfuscated. Specifically, we
were post-processing the entire `response.body` and using that as an
expectation.
* Use an older version of Nokogiri in our test env
This is a temporary fix. See the commit diff for more information.
* Split JRuby CI runs from MRI CI runs
We can improve the performance of our MRI test runs by not installing
Java as part of their run. (Java is only required for JRuby.)
* Use latest Ruby patch versions during CI runs
* Simplify GitHub Action workflow steps
Judging by the output in the GitHub Actions workflow UI, the `echo`
steps were not providing much value to us.
We can get rid of them to slightly increase run performance.
I've also named the other steps to make it easier to skim the Actions
workflow output.
* Remove `twitter_cldr` development dependency
This is no longer being used.
* Change GitHub Actions workflow Ruby matrix
We can drop Ruby 2.4 from our test run matrix. It is beyond EOL.
Let's add 2.7 instead.
2021-12-30 14:21:23 -08:00
Dawa Ometto
46c22a8b87
Take account of possible https referer in upload route ( #1787 )
2021-12-23 12:18:30 +01:00
Ryan Govostes
7e379cfab1
Reduce size of container image ( #1777 )
...
* Reduce size of container image
* Add deprecation message for automatic --mathjax
2021-12-22 20:54:29 +01:00
Dawa Ometto
93d3d10453
Update gollum ( #1786 )
...
Exit with code 1 (error) when invalid option is given
2021-12-22 18:08:20 +01:00
fhchl
98a0006c86
Fix mathjax on edit and create pages ( #1773 )
...
* Fix mathjax on edit and create pages
2021-12-22 17:00:31 +01:00
Dawa Ometto
d97721f38b
Update test.yaml
...
Update JDK
2021-11-06 13:32:13 +01:00
Aaron Wallentine
8d3ec8605e
Small grammar fix in README.md ( #1776 )
2021-10-28 13:55:32 +02:00
Brian Porter
7517389072
Allow for overriding only specific Mustache templates/partials. ( #1719 )
...
* Allow for overriding only specific templates/partials. Resolves #1450 .
2021-09-07 17:32:46 +02:00
Dawa Ometto
b7011139cf
Create release.yml ( #1760 )
2021-09-06 11:30:56 +02:00
Dawa Ometto
6e8a68dd0d
Delete .travis.yml
2021-09-02 21:04:30 +02:00
Dawa Ometto
4e8309d3e4
Load template page as utf-8 ( #1758 )
2021-08-30 11:09:29 +02:00
Dawa Ometto
371ab21d16
Add SauceLab attribution
2021-08-28 17:36:06 +02:00
yy0931
cbcbc4bc3f
unescape page names in the preview tab ( #1739 )
...
* Unescape page names in the preview tab
* Execute rake precompile
2021-08-28 17:24:00 +02:00
Dawa Ometto
dc9b2e1766
Update gollum.gemspec ( #1749 )
2021-08-28 17:21:44 +02:00
Darless
334df62651
Docker support within the repository ( #1732 )
...
- Adds a Dockerfile within this repository
- GitHub actions to build and test the image
2021-08-03 12:52:47 +02:00
yy0931
046353cf7e
Fix an IME rendering issue ( #1735 )
...
* Fix an IME rendering issue
* Execute rake precompile
2021-07-09 07:52:38 -07:00
benjamin wil
51f2f032d7
Add I18n interface for use in Mustache templates ( #1679 )
...
* Add `i18n` dependency
We will use `i18n` to provide localization for Gollum's frontend. I
chose this because it's a well-supported, pretty normal Ruby library.
* Configure I18n
- Locale files will be kept in `lib/gollum/locales/[lang].yml`
- The available locales, to start, will be English (`en`).
* Add I18n interface for mustache templates
This commit adds an interface that allows mustache templates to get I18n
translation strings, transform any arguments that may be present in
them, and then render them on the frontend.
This is our first real step to getting internationalizing the Gollum
frontend.
2021-06-27 09:26:45 -07:00
Dawa Ometto
70360edb96
Update test.yaml ( #1734 )
2021-06-26 22:06:34 +02:00
benjamin wil
2b12ab9206
Explicitly set encoding for Precious::App ( #1731 )
...
An issue was reported (see #1721 ) where, in docker containers where the
`LANG` was not being set, `Precious::App` would serve Mustache templates
in an ASCII encoding. This caused templates to error out.
In the past, this would have happened in environments where `LANG` was
not set and the Gollum applciation configuration had enabled MathJax.
Now, it happens even if MathJax is disabled because of a UTF-8 character
I added to the mobile navigation menu.
Basically, we should enforce a UTF-8 encoding from now on to avoid
runtime errors related to ASCII encoding.
2021-06-14 21:28:12 +02:00
Darless
87a01e04ce
fixes #1723 : Github Actions Supported ( #1729 )
...
* fixes #1723 : Github Actions Supported
- This is to switch from Travis CI which is shutting down the org version,
and the .com version, a free account is limited.
- Switch test environment variable from TRAVIS to CI to be more generic.
* Adding jruby-9.2.18.0 to matrix for github actions
2021-06-14 21:21:40 +02:00
Sam
5f04200bd0
README.md: Clarify that Gollum should run against an already-initialized Git repository. ( #1722 )
2021-06-13 14:34:28 -07:00
benjamin wil
aa823b5a2d
Use recent JRuby release for Travis CI ( #1730 )
...
Our JRuby CI runs have been errorring due to what I think is an issue
with an older `jruby-openssl` version.
2021-06-13 14:17:18 -07:00
Dawa Ometto
9012dee888
Release 5.2.3
2021-04-18 13:43:00 +02:00
benjamin wil
81d5f1a8bb
Ensure <title> is rendered for pages ( #1710 )
...
I made a mistake when I made `#title` a private method. I did not see
that it was being called from `layout.mustache` to generate the
`<title></title>` tag in the `<head></head>` of each page.
This fixes my error, and adds tests so the behaviour is more explicit.
2021-04-05 09:26:50 -07:00
Dawa Ometto
d2b0a22a8f
Release 5.2.2
2021-03-27 19:43:38 +01:00
Dawa Ometto
355e6b1f18
Fix query ? in mathjax script path ( #1706 )
2021-03-27 19:40:35 +01:00
Nikita Ivanov
7a2c9107c3
Delete dublicate error ( #1700 )
2021-03-27 14:05:03 +01:00
benjamin wil
127473fff8
Fix tab navigation styles ( #1696 )
...
* Fix tabnav styles on #create and #edit views
The Primer CSS-provided `tabnav` styles were not being used on the Edit
and Preview tabs on the create and edit pages.
After following Primer's documentation [1], it looks like we were using
the `aria-current` attribute incorrectly. Dynamically adding/removing
this attribute on the selected tab fixes the issue.
[1]: https://primer-css-git-next-inputs.primer.now.sh/css/components/navigation#tabnav
* Recompile static assets
2021-03-23 09:13:23 -07:00
benjamin wil
9a79b0a800
Merge pull request #1701 from ViChyavIn/fix-focused-button
...
Fix focused button border shown wrong in dialogs
2021-03-23 07:49:52 -07:00
ViChyavIn
ca13298d00
Update static assets
2021-03-23 13:43:26 +05:00
ViChyavIn
eaf82e6367
Overflow is set to visible by default so declaration is removed
2021-03-23 13:39:44 +05:00
benjamin wil
cae290ded7
Merge pull request #1697 from gollum/benjaminwil/fix-nav-outline
...
Fix nav outline styles
2021-03-22 10:21:29 -07:00
Benjamin Willems
a22208a0be
Use <button> instead of <a> without href
...
It is more semantic to use a `<button>` tag in the place of an `<a>`
when there is no other page being linked to. In this circumstance, we're
using JavaScript to present a modal to the user on click.
This change makes the "Upload" and "Rename" buttons appear in the
browser's tab index.
2021-03-21 14:21:07 -07:00
Benjamin Willems
bc877dc9dc
Fix indentation due to DOM simplification
...
We removed one of the parent elements of the `<nav>`, so we must
re-indent the entire file.
2021-03-21 14:19:32 -07:00
Benjamin Willems
40b1775d42
Make the main <nav> element a TableObject
...
There was a display issue, where navbar items's outline styles were
being cut off due to the parent `<nav>` element's margin and padding.
Fortunately, we can do away with the navbar wrapper div entirely. It was
not doing anything important except defining its children as
`TableObject` items. But we can just do this on the `<nav>` itself.
2021-03-21 14:18:45 -07:00
ViChyavIn
c2dc605adb
Fix focused button border shown wrong
2021-03-20 21:43:53 +05:00
benjamin wil
a1e1af07a4
Merge pull request #1676 from gollum/benjaminwil/button-labels
...
Move "Page History" into button group
2021-03-15 08:24:04 -07:00
benjamin wil
76948130f6
Display button groups using Primer flex utilities
...
This small improvement just uses Primer `d-flex` utilities to `display:
flex;` instead of using style tags. It's preferable.
2021-03-06 16:19:01 -08:00
Benjamin Willems
f71ba31bfe
Move "Page History" into button group
...
If the user has edit permissions, the "History" button is shown in a
button group with "Edit" and "Rename". If the user does not have edit
permissions, it's shown by itself.
This commit also renames the label from "Page History" to "History".
2021-03-06 16:19:01 -08:00
Dawa Ometto
b7caa228e6
Add webrick dependency ( #1695 )
...
* Remove webrick as dev dependency
2021-03-06 15:39:21 +01:00
Dawa Ometto
0101dd2f65
Update .travis.yml ( #1690 )
2021-03-06 10:06:11 +01:00
Dawa Ometto
c8baa61fe3
Update image icon in editor ( #1687 )
2021-02-26 15:30:02 +01:00
Dawa Ometto
104335706a
Faster tests ( #1686 )
2021-02-26 11:34:41 +01:00
Dawa Ometto
7c60841bad
Release 5.2.1
2021-02-25 13:35:02 +01:00
benjamin wil
f6a7c57175
Don't include primer.css separate from app.css ( #1685 )
...
* Recompile static assets
2021-02-25 09:39:41 +01:00
Dawa Ometto
730acee609
Release 5.2
2021-02-24 12:06:54 +01:00
Dawa Ometto
b7295df662
Fix Compare view for renames on JRuby ( #1682 )
2021-02-24 11:53:48 +01:00
Dawa Ometto
aba3ec37d9
Fix styling for Latest Changes flexbox ( #1683 )
2021-02-24 09:28:34 +01:00
Dawa Ometto
020c98bfad
Update README.md ( #1670 )
2021-02-23 12:47:30 +01:00
Dawa Ometto
d33d11e086
Make Keybinding and Markup selects smaller ( #1681 )
2021-02-23 12:47:03 +01:00
benjamin wil
2e41751cf6
Fix sidebar and footer padding ( #1677 )
...
* Change footer and footer container spacing
This commit:
1. Removes the Primer `my-md-0` spacing from the `#wiki-footer`
container.
This gives it margins along the Y axis, spacing it out from
the sidebar and main wiki content containers on `md` and larger
screens.
2. Adds `px-4` padding to the `#footer-content`. which makes the
This makes the footer content inset the same way that sidebar
content is. This makes the content look more uniform on mobile
devices, when the sidebar and footer are presented one before
the other.
* Change spacing behaviour of `#wiki-sidebar`
To make `#wiki-sidebar` and `#wiki-footer` more similar, we can make
sure `px-4` padding is applied to the `-content` container, rather than
the outer container.
2021-02-22 09:32:02 +01:00
benjamin wil
f493150825
Fix heading counters and anchor icon presentation. Resolves #1642 ( #1673 )
...
* Reset h2 counters
* Reformat .header-enum scoped SCSS
* Show overflow .wiki-body content
* Re-scope and re-style heading `.anchor` elements
* Remove unused SCSS
* Recompile static assets
Co-authored-by: Dawa Ometto <dawa.ometto@uni-leipzig.de >
2021-02-20 11:10:52 +01:00
benjamin wil
68d0dd0cd5
Add mobile navigation menu ( #1671 )
...
* If navbar is too wide, use overflow-x: scroll
* Add initial mobile nav menu
* Use CSS classes instead of IDs for jQuery events
* Change content x-axis padding for mobile devices
* Recompile assets for mobile menu feature
2021-02-18 09:33:33 +01:00
benjamin wil
38fc7e69c1
Update Primer CSS to v15.2.0 ( #1659 )
2021-02-14 01:05:10 +01:00
benjamin wil
5b7b9f40ae
Only escape HTML from breadcrumbs. Resolves #1658 ( #1663 )
2021-02-14 01:04:42 +01:00
benjamin wil
17162aa091
Make sidebar layout mobile-friendly ( #1660 )
2021-02-13 18:29:33 +01:00
benjamin wil
0c89aa2b3e
Update reference to test git bare repositories ( #1662 )
...
The CONTRIBUTING document referenced a file that has since been moved.
2021-02-13 17:50:27 +01:00
benjamin wil
1980e39876
Remove unused _layout.scss file ( #1661 )
2021-02-13 17:25:54 +01:00
Garet Robertson
2b949014b8
Add JS polyfill for IE compatibility ( #1664 ). ( #1667 )
2021-02-13 17:11:40 +01:00
Dawa Ometto
b399496ec2
Update gems ( #1637 )
2021-02-13 16:48:28 +01:00
Sam
8433327926
contrib/automation/gollum-post: A script to post files to Gollum in an automated way. ( #1608 )
2021-02-13 16:48:11 +01:00
Nikita Ivanov
bb207f43d0
Fix binary diffs unable to be viewed in history. Resolves #1650 ( #1649 )
...
* Fix binary diffs cause error when viewed
* Change color of git lines to #000000a0
* Update assets
2021-01-10 13:54:30 +01:00
Nikita Ivanov
333af9b76c
Add redirect to rename commit ( #1648 )
...
This PR ensures that changes to `REDIRECTS_FILE` are committed with the commit responsible for the corresponding git rename.
2021-01-08 14:36:54 +01:00
Dawa Ometto
18a16665cc
Don't add base path to file url for deletion. Resolves https://github.com/gollum/gollum/pull/1620 ( #1639 )
...
* Add regression test
2021-01-04 11:29:45 +01:00
Bart Kamphorst
6c0796733d
Filter _Template content. Resolves #1603 and #1640 . ( #1612 )
...
* Filter _Template content. Resolves #1603 and #1640 .
* Introduces a Gollum::TemplateFilter class with methods to easily add _Template Filters.
* Adds support for relative _Template pages with fallback to _Template in root.
2020-12-26 14:10:02 +01:00
Nikita Ivanov
97ed5a7c57
Add tests to the ? in page name fix ( #1641 )
2020-12-14 11:24:50 +01:00
Nikita Ivanov
c87c8c446e
Fix bug when link to a page doesn't work if it has ? in its title ( #1634 )
2020-12-13 13:42:19 +01:00
Dawa Ometto
bfbfb21c17
Release 5.1.2
2020-12-01 22:22:22 +01:00
Dawa Ometto
137728cdab
Guard against malicious file names
2020-12-01 22:21:54 +01:00
Dawa Ometto
3f7fd21d4a
Update kramdown-parse-gfm ( #1623 )
2020-11-19 17:10:37 +01:00
Dawa Ometto
2204cef0ef
Fix dependency status badge
2020-11-02 22:14:51 +01:00
Dawa Ometto
29ad7127d1
Add dependency status badge
2020-11-02 22:14:11 +01:00
Dawa Ometto
123518b940
Don't escape page path. Resolves #1615 ( #1618 )
2020-09-21 15:50:58 +02:00
Dawa Ometto
dbe849707a
Update GPG key
2020-09-13 16:21:43 +02:00
Dawa Ometto
986a76cf8e
Release 5.1.1
2020-08-11 12:57:42 +02:00
Dawa Ometto
42439033c8
Release 5.1
2020-08-03 19:07:32 +02:00
Dawa Ometto
421ff18788
Updating assets for bugfix release.
2020-08-03 19:01:29 +02:00
Dawa Ometto
519a275ff0
Fix mathjax config path ( #1605 )
...
Related to #1602
2020-08-03 19:00:49 +02:00
Watal M. Iwasaki
5a95f79b32
Ensure page_route starts with a leading slash ( #1604 )
...
* Ensure page_route starts with a leading slash
* Handle base_url = nil in page_route()
* Refactor page_route()
2020-08-03 18:09:57 +02:00
Dawa Ometto
627ee5bbbe
Merge pull request #1595 from heavywatal/upload-whitespaced-file
...
Address the uploads issue. Resolves #1584
2020-08-03 18:05:27 +02:00
Dawa Ometto
a9d300341c
Merge pull request #1594 from heavywatal/empty-search
...
Show search page even when no parameters are given
2020-07-15 12:46:18 +02:00
Dawa Ometto
6b7e912010
Merge pull request #1593 from heavywatal/fix-home-button
...
Address home button issue #1590
2020-07-15 12:44:13 +02:00
Watal M. Iwasaki
4feae80814
Update assets
2020-07-12 17:39:18 +09:00
Watal M. Iwasaki
5f5730fe2e
Address the uploads issue #1584
...
'%20' in filenames are translated back to ' ' in both editor and file creation.
2020-07-12 17:37:20 +09:00
Watal M. Iwasaki
5f784f5e10
Show search page even when no parameters are given
...
This PR addresses the issue #1586
2020-07-12 15:22:18 +09:00
Watal M. Iwasaki
35a44efafd
Address home button issue #1590
...
A trailing slash is added.
This fixes the behavior when base_url is nil.
2020-07-12 13:41:41 +09:00
Dawa Ometto
b32dcfa8dd
Merge pull request #1580 from heavywatal/reduce-direct-base_url
...
Reduce direct use of base_url
2020-06-17 10:37:15 +02:00
Watal M. Iwasaki
38fc32bbdd
Return nil if url.empty? right after url.comact!
2020-06-16 17:55:01 +09:00
Watal M. Iwasaki
6c7b12ae5e
Restore base_url for baseUrl in JavaScript
2020-06-16 17:29:32 +09:00
Dawa Ometto
649e19bdb1
Merge pull request #1578 from tpoliaw/no-edit-compare
...
Let compare versions be used in no-edit mode
2020-06-15 12:13:34 +02:00
Watal M. Iwasaki
a4266170ea
Address the issue #1572 ( #1581 )
...
* Add double-quote to data-file-path={{url}}
2020-06-15 12:02:32 +02:00
Watal M. Iwasaki
6e6d9d8c1f
Use page_route() for custom.css, custom.js, and MathJax
2020-06-14 23:11:07 +09:00
Watal M. Iwasaki
e49758334f
Replace base_url with page_route()
2020-06-14 23:11:07 +09:00
Watal M. Iwasaki
580068212d
Remove base_url from search.mustache
2020-06-14 23:11:07 +09:00
Watal M. Iwasaki
504278d9ba
Move full_url_path from HasPage to Page
...
so that page_route() is accessible via Layout
2020-06-14 23:11:07 +09:00
Watal M. Iwasaki
214056a88a
Refactor regex in clean_url()
2020-06-14 23:11:07 +09:00
Watal M. Iwasaki
e310f76030
Enhance RouteHelpers
...
- page_route() accepts nil and return base_url
- clean_url() accepts multiple args and join them
2020-06-14 23:11:07 +09:00
Peter Holloway
83abe62125
Use GET for compare methods
...
POST requests are blocked when running in --no-edit mode so using POST
prevents compare being available (see #1546 ).
Change the history view form to use "get" as the form method and change
the routing in app to accept get requests for both forms of compare. The
order of the compare routes is switched to make the more specific form
checked first to prevent all requests being handled by the less specific
form.
2020-06-10 23:27:48 +01:00
Bart Kamphorst
8e7a714991
Merge pull request #1577 from gollum/fix_1571
...
Remove superfluous closing div tag. Add ids to all navigation buttons.
2020-06-09 09:30:27 +02:00
Bart Kamphorst
4f67710ed2
Remove superfluous closing div tag. Add ids to all navigation buttons.
2020-06-08 22:09:04 +02:00
Bart Kamphorst
8ec8be5db3
Merge pull request #1576 from mivok/feature/auto_save
...
Add auto save functionality
2020-06-08 21:26:54 +02:00
Watal M. Iwasaki
92da563211
Add quick access to diff of each commit in the history ( #1555 )
2020-06-08 20:49:34 +02:00
Mark Harrison
2eb5a7e4b8
Remove flash-full from the notification class list
...
It doesn't look right with the banner in the new position.
2020-06-05 22:59:20 -04:00
Mark Harrison
23110d5f05
Add autosave/restore for subpages too
2020-06-05 22:51:14 -04:00
Mark Harrison
18de3272e3
Move autosave message elements into the template
2020-06-05 21:34:07 -04:00
Mark Harrison
1e81c42818
Add auto save functionality
...
Fixes #527
This adds auto saving to gollum using local storage.
2020-06-04 22:30:40 -04:00
Dawa Ometto
ef6e0e8a07
Fix gollum link tag highlighting ( #1566 )
2020-05-15 10:29:38 +02:00
Watal M. Iwasaki
ba575b886d
Simulate 'git show' when a single version is posted from /history/ ( #1543 )
2020-04-16 12:50:45 +02:00
Dawa Ometto
c8f856109d
Set environment to production when precompiling ( #1554 )
2020-04-14 11:50:29 +02:00
Sven Schwyn
4035c579c7
Don't uglify JS in development env ( #1551 )
2020-04-14 11:22:48 +02:00
Bart Kamphorst
8bab3de510
Merge pull request #1549 from yuttie/yuttie-patch-fix-data-file-path
...
Fix `data-file-path` in overview pages
2020-04-10 13:02:13 +02:00
Yuta Taniguchi
9ab4bbb17c
Fix data-file-path
...
This correct the `data-file-path` attribute's value so that the value includes the ancestor directories to a file.
2020-04-09 23:51:02 +09:00
Bart Kamphorst
ae024eb3b3
Merge pull request #1547 from heavywatal/flash-notice-h1
...
Fix a selector in flashNotice()
2020-04-08 20:16:04 +02:00
Watal M. Iwasaki
db84653bf2
Fix a selector in flashNotice()
...
The original selector "#wiki-content h1" matches multiple times
when the page content has h1 headers, resulting in multiple notice
in a page, and what is worse, "$('#gollum-flash').fadeOut()" works
only for the first one.
2020-04-08 22:45:49 +09:00
Dawa Ometto
d8ebba114f
Release 5.0.1
2020-04-04 13:44:00 +02:00
Dawa Ometto
b9d7375dba
Fix migration script when using page-file-dir ( #1542 )
2020-04-04 13:43:29 +02:00
Dawa Ometto
676811206d
Add tests for base_path ( #1540 )
2020-04-03 17:12:09 +02:00
Watal M. Iwasaki
ff1baf0036
Replace redirect_to() with 'redirect to()` ( #1536 )
2020-04-03 15:32:51 +02:00
Sam
3d12aeb8b2
Update layout.mustache ( #1539 )
...
Fix loading of MathJax when run with a base path.
2020-04-03 15:28:00 +02:00
Dawa Ometto
5a8750a975
Fix migrate script path argument. Fix gollum --version ( #1538 )
2020-04-02 14:08:17 +02:00
Watal M. Iwasaki
0cb303f09f
Check page.nil? before page.wiki ( #1535 )
2020-04-02 11:07:33 +02:00
Dawa Ometto
edc7d0b50b
Merge pull request #1531 from repotag/check_empty_repo
...
Add regression test against #1530
2020-03-31 16:51:19 +02:00
Dawa Ometto
2c268a9f8c
Add regression test against #1530
2020-03-31 11:56:42 +02:00
Dawa Ometto
d61a09d421
Update README.md
2020-03-30 12:33:57 +02:00
Dawa Ometto
0eee014a8b
Release 5.0.0
2020-03-30 12:26:08 +02:00
Dawa Ometto
76f6b6e81c
Merge pull request #1525 from repotag/update_assets
...
Update static assets
2020-03-30 11:56:40 +02:00
Dawa Ometto
40215c3da2
Update CONTRIBUTING.md
2020-03-30 11:27:19 +02:00
Dawa Ometto
1056d5cf16
Update static assets
2020-03-30 11:23:26 +02:00
Dawa Ometto
f74c6c1706
Update bug_report.md
2020-03-30 11:15:51 +02:00
Dawa Ometto
821614e45a
Delete ISSUE_TEMPLATE.md
2020-03-30 11:10:34 +02:00
Dawa Ometto
32e8618ed4
Merge pull request #1524 from gollum/dometto-patch-1
...
Update issue templates
2020-03-30 11:10:14 +02:00
Dawa Ometto
e123611fed
Update issue templates
2020-03-30 11:07:09 +02:00
Bart Kamphorst
5c3394c227
Merge pull request #1522 from gollum/fix_1516
...
Improve CSS styling on 5.x using Primer.CSS. Fixes #1515 #1516 #1518 .
2020-03-30 10:52:22 +02:00
Dawa Ometto
da6708e61d
Merge pull request #1517 from repotag/fix_assets
...
Actually package the sprockets manifest
2020-03-30 10:31:15 +02:00
Bart Kamphorst
c99da8ff34
Hide the correct html elements for printing. Fixes #1516 .
2020-03-30 10:16:18 +02:00
Bart Kamphorst
9ab308412c
Let Primer.CSS style <hr> element.
2020-03-30 10:06:53 +02:00
Bart Kamphorst
4efcba6ceb
Let Primer.CSS determine H1-H6 styling ( fixes #1515 ).
2020-03-30 09:52:34 +02:00
Dawa Ometto
ca7c708bf9
Update README.md
2020-03-30 01:40:58 +02:00
Dawa Ometto
1f70dca752
Minor
2020-03-30 01:35:56 +02:00
Dawa Ometto
d32c5a88f7
Actually package the sprockets manifest.
2020-03-30 01:30:05 +02:00
Dawa Ometto
b209127000
Use a precompiled jruby on Travis
2020-03-29 22:45:04 +02:00
Dawa Ometto
6e37601b25
Add therubyrhino to dependencies
2020-03-29 22:35:44 +02:00
Dawa Ometto
23b97daa84
Fix Travis
2020-03-29 22:35:28 +02:00
Dawa Ometto
7329b7595d
Merge branch '5.x'
2020-03-29 22:28:50 +02:00
Dawa Ometto
f0bb300e03
Update docs
2020-03-29 22:28:23 +02:00
Dawa Ometto
6a1ea82ff1
Merge branch 'master' into 5.x
2020-03-29 21:57:31 +02:00
Dawa Ometto
6011deb930
Restore --bare option ( #1512 )
2020-03-29 20:19:48 +02:00
Dawa Ometto
28bfe02411
Update travis
2020-03-29 20:13:09 +02:00
Dawa Ometto
862c6d5d2e
Restore --bare option
2020-03-29 20:04:45 +02:00
Dawa Ometto
4c491a01db
Fix highlights. Resolves #1506 ( #1510 )
2020-03-27 17:10:03 +01:00
Dawa Ometto
16676e0788
Update README.md ( #1508 )
...
* Update --css and --js documentation in bin/gollum
See https://github.com/gollum/gollum/issues/1507
2020-03-27 16:06:40 +01:00
Bart Kamphorst
ebf46629b1
Merge pull request #1504 from heavywatal/align-right-edge
...
Remove a tiny padding in the head div
2020-03-27 13:05:14 +01:00
Dawa Ometto
36811490d0
Add --lenient-tag-lookup option ( #1505 )
2020-03-27 12:20:52 +01:00
Dawa Ometto
f0122cebb5
Created Home (markdown)
2020-03-27 11:18:00 +01:00
Dawa Ometto
e2804d6313
Add RSS Feed ( #1500 )
2020-03-27 10:37:50 +01:00
Watal M. Iwasaki
ae7ed4eafa
Remove a tiny padding in the head div
2020-03-27 16:51:41 +09:00
Dawa Ometto
aae320ddff
Fix assets ( #1501 )
...
* Rename app.css
2020-03-26 15:39:56 +01:00
Bart Kamphorst
a71cb40bdf
Merge pull request #1499 from gollum/primer_breadcrumbs
...
Primer CSS breadcrumbs (related to #1394 ).
2020-03-26 09:20:03 +01:00
Bart Kamphorst
2ba5d389a8
Fix breadcrumb tests.
2020-03-25 21:15:13 +01:00
Bart Kamphorst
f1e8d30a43
Primer CSS breadcrumbs (related to #1394 ).
2020-03-25 20:50:03 +01:00
Bart Kamphorst
e6ee27a083
Merge pull request #1498 from gollum/fix_1488
...
Clear both sides of the Sidebar float to push the footer down.
2020-03-25 16:47:34 +01:00
Bart Kamphorst
4008bf12e7
Clear both sides of the Sidebar float to push the footer down.
2020-03-25 16:36:14 +01:00
Dawa Ometto
0b1d7ab01c
Update migration script ( #1497 )
...
* Add whitespace -> hyphens
* Update README
2020-03-25 12:29:39 +01:00
Dawa Ometto
a45101cfe9
Package assets ( #1493 )
...
* Package static assets
* Fixed cancel button in editor
* Fix rake compilation task
* Add asset path helper
* Serve MathJax statically
* Fix mathjax in preview
2020-03-24 15:55:28 +01:00
Dawa Ometto
d5970d6274
Tag compatibility. Resolves #1487 ( #1492 )
...
* Add --global-tag-lookup
* Add bin/gollum-migrate-tags
* Add migration tests (not on Travis)
2020-03-22 17:40:13 +01:00
Dawa Ometto
83f4ccfa70
Update README.md
2020-03-18 21:07:00 +01:00
Dawa Ometto
707648bde8
Remove old reference to livepreview ( #1490 )
2020-03-18 20:32:41 +01:00
Dawa Ometto
0707205374
Update HISTORY.md
2020-03-18 19:47:57 +01:00
Dawa Ometto
f6f81b39f8
Remove more references to grit and start updating readme ( #1486 )
...
* Remove more references to grit
* Update History and Readme
2020-03-18 18:17:22 +01:00
Dawa Ometto
f8829c68d6
Fix metadata title. Resolves #1484 ( #1485 )
...
* Fix metadata title
2020-03-16 16:53:18 +01:00
Dawa Ometto
54bbd1d789
Remove references to grit and stringex ( #1482 )
...
* Remove references to grit and stringex
* Fix revert tests, fix revert commit message
2020-03-16 01:59:47 +01:00
Dawa Ometto
ee267f72a2
Track path changes in History. Resolves #1441 ( #1443 )
...
* Track path changes in History.
* Reactivate rename following on JRuby
2020-03-16 01:09:42 +01:00
Bart Kamphorst
f516b1cb79
Merge pull request #1477 from gollum/sidebar_position
...
Restore functionality for determining the position of the sidebar (left or right).
2020-03-14 19:44:14 +01:00
Bart Kamphorst
0e4c8342ab
Restore functionality for determining the position of the sidebar (left or right).
2020-03-14 19:28:54 +01:00
Dawa Ometto
6f61ddae77
Merge pull request #1476 from gollum/update_rake
...
Update rake to mitigate CVE-2020-8130.
2020-03-14 00:01:06 +01:00
Bart Kamphorst
e312641cbd
Update rake to mitigate CVE-2020-8130.
2020-03-13 20:09:18 +01:00
Bart Kamphorst
07de956b1d
Merge pull request #1475 from gollum/fix_cloned_test_path
...
Use tmpdir instead of tempfile for creating temporary repos in the test suite.
2020-03-13 17:19:56 +01:00
Bart Kamphorst
4d549b1660
Use tmpdir instead of tempfile for creating temporary repos in the test suite.
2020-03-13 17:07:15 +01:00
Dawa Ometto
e1a13aef1f
Remove sanitize
2020-03-13 15:11:31 +01:00
TheCedarPrince
cc3eb233c7
Disregard letter case for emojis ( #1474 )
2020-03-13 12:16:28 +01:00
Dawa Ometto
f0b04f1334
gollum --versions: output used markdown gem ( #1471 )
2020-03-09 14:22:02 +01:00
flowerysong
9b89e31679
5.x: Fix a couple of upload issues ( #1469 )
...
* Remove debugging junk
* Remove duplicate `#{dir}` from upload commit message
2020-03-04 11:41:19 +01:00
Dawa Ometto
2b380ee6bc
URI decode path in rename dialog ( #1447 )
2019-12-30 21:55:58 +01:00
Dawa Ometto
caf4da73e2
Fix Windows assets and tests ( #1425 )
...
* Fix Windows assets and tests
* Update gemojione
2019-12-15 21:52:37 +01:00
Dawa Ometto
56e36df6bd
Fix editable section link ( #1438 )
2019-10-10 19:56:00 +02:00
Dawa Ometto
c8fed4d50d
Provide JS with correct exts via template ( #1437 )
2019-10-10 16:36:06 +02:00
Bart Kamphorst
c619920452
Merge pull request #1436 from gollum/upload_notices
...
Show flashNotice instead of JS alert for (un)successful uploads.
2019-10-09 18:56:01 +02:00
Bart Kamphorst
70ede99545
Show flashNotice instead of JS alert for (un)successful uploads. FadeOut success notices after 5s.
2019-10-09 13:46:28 +02:00
Bart Kamphorst
9862c51e3f
Merge pull request #1433 from gollum/redirects
...
Add redirect support (e.g., after renames). Fixes #1023 .
2019-10-08 21:50:45 +02:00
Bart Kamphorst
f0dbc2801b
Use clean_url helper.
2019-10-08 20:26:59 +02:00
jamieforth
7c65d65cb1
Rake precompile: Add missing requires ( #1434 )
2019-10-08 12:52:20 +02:00
Bart Kamphorst
5dd6c40933
Make redirect functionality conditional on @redirect_enabled (defaults to true).
2019-10-07 11:37:52 +02:00
Bart Kamphorst
5487563a71
Make regex more lenient. Nest redirect logic.
2019-10-07 11:22:00 +02:00
Bart Kamphorst
7458e396ee
Add tests to ensure protection of redirects file.
2019-10-05 18:07:54 +02:00
Bart Kamphorst
8f104ec09c
Add redirect support (e.g., after renames). Fixes #1023 .
2019-10-05 13:32:28 +02:00
Dawa Ometto
8fe4c614db
Fix redirect location for editor submit ( #1430 )
2019-10-01 15:47:25 +02:00
Dawa Ometto
c137c2af4b
Advanced search. Implements #615 ( #1427 )
2019-09-30 15:30:34 +02:00
Dawa Ometto
2402c9ef3b
Enable CriticMarkup on Preview ( #1429 )
2019-09-30 12:58:15 +02:00
Dawa Ometto
bbe609974a
Fix change of format ( #1419 )
...
* Add empty language def for bibtex
2019-09-25 11:44:42 +02:00
Dawa Ometto
88c624877e
Extract page dir from latest changes. Fix #1388 ( #1395 )
...
* Strip off page_dir prefix from latest changes urls
* Rename spurious next and previous_link
* New format for LatestChanges#versions: detect renames
2019-09-18 18:10:09 +02:00
Dawa Ometto
41d7cf75c5
Preview hotkeys also for create view ( #1426 )
2019-09-14 19:02:40 +02:00
Dawa Ometto
9da11dba10
Split editor and app JS. Fix asset precompilation ( #1422 )
2019-09-13 00:59:55 +02:00
Dawa Ometto
d1857e5824
No symlink for ACE ( #1423 )
...
* No Symlink
* Fix JS syntax error
2019-09-12 23:54:50 +02:00
Dawa Ometto
fc64d88ce9
Ace modes for all compatible markups ( #1420 )
...
* Add support for gollum tags
2019-09-12 22:25:55 +02:00
Dawa Ometto
3713890b5e
Improve preview. Resolves #1414 ( #1421 )
...
* Fix Preview text direction
* Add hotkey for toggling preview
2019-09-12 20:28:58 +02:00
Dawa Ometto
efaa6a0ba2
Editable sections. Resolves #1000 ( #1415 )
...
* Extend Ace highlighters to support gollum syntax
* Update ACE to 1.4.6
* Simplify (de)activation of function buttons
2019-09-12 12:37:24 +02:00
Dawa Ometto
d55a3432a2
Solve minor issue involving Preview title ( #1417 )
2019-09-11 15:47:41 +02:00
Dawa Ometto
0fda253457
Add CSS for table.toc Fix #925 ( #1418 )
2019-09-11 14:42:47 +02:00
Bart Kamphorst
2216d67d5a
Have upload modal ignore base-path when generating upload path. Resolves #1410 .
2019-09-06 10:10:03 +02:00
Bart Kamphorst
a04af6c638
Remove failing base-path test because base-path functionality is implemented in Rack middleware.
2019-09-04 13:56:26 +02:00
Bart Kamphorst
91c04cd44c
Merge pull request #1412 from gollum/more_upload_tests
...
Add uploading tests for mode page, with and without base-path enabled.
2019-09-03 22:35:08 +02:00
Bart Kamphorst
1c98a787ab
Reopen the tempfile before passing it to Rack::Test::UploadedFile.
2019-09-03 22:03:43 +02:00
Bart Kamphorst
87902f258a
Remove base_path in upload path determination.
2019-09-03 13:05:24 +02:00
Dawa Ometto
3740a7f6ff
DRY language definitions ( #1411 )
...
* Dryer language defs
* Fix markup modes after move to Primer
* Fix rest function buttons
2019-09-03 11:58:17 +02:00
Bart Kamphorst
b6b176fdc1
Add uploading tests for mode page, with and without base-path enabled.
2019-09-03 11:33:53 +02:00
Bart Kamphorst
77aaeef5ff
Add clipboard button to upload modal. Fixes #1401 .
2019-09-02 12:33:11 +02:00
Dawa Ometto
d1b1375629
Fix usericons ( #1408 )
...
* Fix and refactor user icons, add Basic tests
* Remove identicon_canvas, use identicon.js
* Use octicon by default
2019-09-01 21:45:55 +02:00
Dawa Ometto
569eac3a06
Improve page-info-toggle JS ( #1409 )
2019-08-31 21:45:21 +02:00
Bart Kamphorst
a5ecb772ae
Merge pull request #1407 from gollum/file_upload_tests
...
Added tests for file_upload route.
2019-08-29 19:52:03 +02:00
Dawa Ometto
736897a168
Merge branch 'repotag-remove_fontawesome' into 5.x
2019-08-29 19:20:12 +02:00
Dawa Ometto
c1f6f0b429
Merge branch 'remove_fontawesome' of https://github.com/repotag/gollum into repotag-remove_fontawesome
2019-08-29 19:19:47 +02:00
Dawa Ometto
9fd9acb573
Use pure CSS spinner
2019-08-29 19:18:34 +02:00
Bart Kamphorst
beff52a68e
Added tests for file_upload route.
2019-08-29 16:01:20 +02:00
Dawa Ometto
cc33d81473
Refactor
2019-08-29 14:10:54 +02:00
Bart Kamphorst
1a27f04577
Minor fix in handling conflict message in drag-and-drop uploading.
2019-08-29 11:56:34 +02:00
Dawa Ometto
2f2487150a
Remove AnchorJS, native anchor styling
2019-08-28 23:51:05 +02:00
Dawa Ometto
6d44bd7bc8
Anchors with AnchorJS
2019-08-28 17:02:12 +02:00
Dawa Ometto
e2d9d1f4d5
Add AnchorJS
2019-08-28 17:01:18 +02:00
Dawa Ometto
958410146b
Add and rename .erb extension where needed
2019-08-28 17:01:01 +02:00
David Yates
0a9b9ff709
Align symbol for reStructuredText with github-markup ( #1406 )
2019-08-28 11:16:09 +02:00
Bart Kamphorst
bce9800142
Restore upload_file route implementation from b40a344c49.
2019-08-27 20:49:33 +02:00
Bart Kamphorst
7f07f652d4
Also prepare drag-and-drop uploading for conflict detection.
2019-08-27 13:19:19 +02:00
Dawa Ometto
1b5f0b910b
Remove FontAwesome
2019-08-27 12:42:21 +02:00
Bart Kamphorst
e1aa4c02a0
Fix uploading ( #1312 ). Requires updating git adapters.
2019-08-23 20:24:18 +02:00
Dawa Ometto
976f55e1b2
Pagination for history and latest changes. ( #1396 )
...
* Pagination for history and latest changes
* New footer for historical pages
* Fix pagination on history view.
* Do not directly use git adapter
* History view: allow selecting from different pages
* Use log_pagination_options to determine latest changes parameters
* Fix JS pageFullPath
2019-08-21 23:28:49 +02:00
Bart Kamphorst
29a8b893f1
Merge pull request #1399 from repotag/editor_fixes
...
Fix RTL button. Rename Edit Mode label to Markup.
2019-08-20 12:42:38 +02:00
Bart Kamphorst
c991149422
Fix RTL button. Rename Edit Mode label to Markup.
2019-08-19 22:38:54 +02:00
Dawa Ometto
175c0ceab5
Show sidebars in preview ( #1398 )
2019-08-19 12:08:12 +02:00
Dawa Ometto
9d48ea0079
Fix typo ( #1397 )
2019-08-18 19:16:06 +02:00
Bart Kamphorst
042ad2d8c4
Merge pull request #1393 from gollum/primer_css
...
Major CSS/styling overhaul with Primer.css.
2019-08-14 20:24:13 +02:00
Bart Kamphorst
19868a10ef
Minor fix for the footer div in preview pages.
2019-08-14 17:07:51 +02:00
Bart Kamphorst
92b17f9053
Removed some inline CSS. Removed footer from preview pages.
2019-08-14 16:39:55 +02:00
Bart Kamphorst
2dc527b60f
Merge branch 'primer_css' of https://github.com/gollum/gollum into primer_css
2019-08-14 15:01:03 +02:00
Bart Kamphorst
fa08ce35cc
Add travis fix for running the tests properly.
2019-08-14 15:00:25 +02:00
Bart Kamphorst
8413e5b5ee
Merge branch '5.x' into primer_css
2019-08-13 22:46:19 +02:00
Bart Kamphorst
aa16f6ba2a
Major CSS/styling overhaul with Primer.css.
2019-08-13 22:10:10 +02:00
Olle Jonsson
22e0fdc822
Gemspec: drop EOL'd property rubyforge_project ( #1391 )
2019-08-12 16:03:05 +02:00
Dawa Ometto
0de56202e9
Attempt travis fix ( #1392 )
2019-08-12 15:33:34 +02:00
Dawa Ometto
bcec052e35
Add revert route helper. Resolves #1385 ( #1386 )
2019-05-18 14:43:10 +02:00
Dawa Ometto
e28a41bb8f
Fix breadcrumbs ( #1387 )
2019-05-18 14:42:42 +02:00
Dawa Ometto
17c574467f
Merge pull request #1384 from gollum/dometto-patch-1
...
Don't lookup page's last version on edit
2019-05-17 11:06:58 +02:00
Dawa Ometto
8f350976a1
Don't lookup page's last version on edit
...
Slow and unused (?).
2019-05-17 01:34:57 +02:00
Dawa Ometto
dfb4281a14
Add MediaWiki language def ( #1382 )
2019-05-16 21:03:07 +02:00
Dawa Ometto
7881237de2
Improve RTL support. Resolves #1314 ( #1350 )
...
* Improve RTL support with updated ACE 1.4.4
* Implement direction switch button
* RTL support on rendered pages
* Fix ace editor modes
* Fix language definitions
2019-05-16 20:38:33 +02:00
Bart Kamphorst
05daab661e
Merge pull request #1218 from ProgramFan/bundle-mathjax-slim
...
Bundle a slim mathjax
2019-05-12 15:14:16 +02:00
Yang Zhang
c0e6de899b
Upgrade to mathjax-2.7.5 and use original mathjax config (fix comments in #1218 )
2019-05-12 14:30:45 +08:00
Yang Zhang
c103f3ebdc
Fix mathjax loading and remove unused config
2019-05-11 09:04:14 +08:00
Yang Zhang
7cabd684a9
Bundle a slim mathjax (4.5MB uncompressed, 1.5MB compressed)
2019-05-11 09:04:14 +08:00
Dawa Ometto
af344c1d25
Update dependencies ( #1379 )
2019-05-04 20:01:52 +02:00
Dawa Ometto
b40a344c49
Remove page file dir from frontend. Resolves #1052 #1241 ( #1369 )
...
* Remove all references to page_file_dir. Use new method signature for Wiki#page. Refactor helpers.
* Use write_file for uploads
* Refactor /pages route
2019-05-04 01:19:59 +02:00
Bart Kamphorst
e0a2b183ad
Merge pull request #1373 from hirocaster/fix-h1-title-org-mode-for-ver5
...
Fix h1-title at org-mode
2019-03-21 09:46:16 +01:00
hirocaster
97857d0e3f
Fix h1-title at org-mode
2019-03-20 22:09:07 +09:00
Bart Kamphorst
6fcfe7895e
Merge pull request #1363 from gollum/page_breadcrumb
...
Implements a breadcrumb for normal wiki pages. Resolves #629 .
2019-01-07 08:52:47 +01:00
Michael Gissing
f5f655e3a1
Feature/fix gem 3 ( #1364 )
...
* change deprecated option which was removed in gem 3
2019-01-05 10:16:07 +01:00
Bart Kamphorst
94fe2f59d3
Implements a breadcrumb for normal wiki pages. Resolves #629 .
2019-01-03 09:45:08 +01:00
Bart Kamphorst
66fd8eef1f
Merge pull request #1362 from gollum/fix_header_layout
...
Move page title (h1) down. Move Home button to upper left corner on all views.
2019-01-01 09:20:24 +01:00
Bart Kamphorst
fb5c65827d
Move page title (h1) down. Move Home button to upper left corner on all views.
2018-12-30 19:09:52 +01:00
Dawa Ometto
bb79cf5ce6
Merge branch 'repotag-use_path_helpers' into 5.x
2018-12-28 23:42:21 +01:00
Dawa Ometto
f72e8610da
Merge branch 'use_path_helpers' of https://github.com/repotag/gollum into repotag-use_path_helpers
2018-12-28 23:41:56 +01:00
Dawa Ometto
b76a250596
Use AJAX button click for cmd-s hotkey. Fixes 1356 ( #1361 )
2018-12-28 23:40:32 +01:00
Dawa Ometto
2aea55a92c
[WIP] Improve editor buttons: insert markup at the correct position. Resolves #504 ( #1348 )
...
* Improve editor buttons: insert markup at the correct position
* Center cursor after replacing text.
* Reimplement keyboard shortcuts for ace.
* Add break_line and whole_line to all language definitions
* Implement a better unordered list function.
2018-12-28 23:23:06 +01:00
Bart Kamphorst
073137af7d
Merge pull request #1358 from gollum/fix_1340
...
Make mathjax.config.js the standard filename. Fixes #1340 .
2018-12-28 23:10:48 +01:00
Bart Kamphorst
e966de6922
Added tests for mathjax.config.js permissions. Fixed typo in permission regex.
2018-12-28 22:57:13 +01:00
Dawa Ometto
616c004058
Refactor
2018-12-28 22:47:39 +01:00
Bart Kamphorst
59bb48340e
Fix test by adding new h2 editable class to expected output.
2018-12-28 22:45:17 +01:00
Dawa Ometto
7ec80bf2f1
Optional assets path argument for rake task via ENV
2018-12-28 22:43:59 +01:00
Bart Kamphorst
006dd36078
Make mathjax.config.js the standard filename. Fixes #1340 .
2018-12-28 22:07:07 +01:00
Bart Kamphorst
58225c7c20
Add basic rest language definition. Fixes #1092 .
2018-12-28 21:33:17 +01:00
Dawa Ometto
04501c205a
Introduce JS variant of path helpers
2018-12-10 19:54:21 +01:00
Dawa Ometto
253ba89f90
Use relative asset urls in scss so base path will work
2018-12-10 19:53:40 +01:00
Dawa Ometto
7f598cb49e
Fix e shortcut with baseurl
2018-12-10 19:52:52 +01:00
Dawa Ometto
d3402dded2
Fix delete button in pages view with basepath
2018-12-10 19:52:23 +01:00
Dawa Ometto
f222efd281
Remove unnecessary uglifier requirement
2018-12-10 19:51:06 +01:00
Dawa Ometto
8f6c19b3fd
Move precompilation task to Rakefile
2018-12-10 19:50:49 +01:00
Dawa Ometto
f44367c31b
Remove Hacktoberfest Announcement
2018-12-02 17:35:10 +01:00
Bart Kamphorst
c31c68200b
Merge pull request #1353 from gollum/fix_1306
...
Do not attempt to normalize uploaded files unless they have valid page extensions.
2018-11-29 12:04:07 +01:00
Bart Kamphorst
ddfaf8c091
Simpler solution for normalization of uploaded files.
2018-11-29 09:25:19 +01:00
Bart Kamphorst
ca9702088f
Do not attempt to normalize images or binary files.
2018-11-27 12:20:56 +01:00
Bart Kamphorst
413e962871
Update MathJax CDN. Related to PR #1267 .
...
Co-authored-by: dplanella <dplanella@gitlab.com >
2018-11-23 14:29:21 +01:00
Bart Kamphorst
848cef26ee
Fix wrapping issue for inline code blocks. Fixes #1033 .
2018-11-23 13:49:51 +01:00
Bart Kamphorst
b40b3aa9fc
Merge pull request #1349 from gollum/detect_simultaneous_edits
...
Implement infrastructure for detecting and handling simultaneous edits
2018-11-20 16:41:46 +01:00
Bart Kamphorst
ae853e074a
Commit @dometto's fix for asset precompilation.
2018-11-20 16:16:25 +01:00
Bart Kamphorst
f4838d12c6
Return the page's most recent version instead of random string.
2018-11-20 15:04:32 +01:00
Bart Kamphorst
4eb7fd211c
Fix tests (do not expect redirect after edit) and add test for edit collisions.
2018-11-20 14:53:27 +01:00
Bart Kamphorst
efd1d3992d
Use page.sha instead of a content-based hash for collision detection.
2018-11-19 12:58:30 +01:00
Bart Kamphorst
d4a9da0db5
Implement infrastructure for detecting and handling of simultaneous edits.
2018-11-16 14:24:21 +01:00
Dawa Ometto
bde72cb52e
Update README.md
2018-11-12 23:33:23 +01:00
Bart Kamphorst
f251e0f556
Merge pull request #1345 from gollum/critic_markup_styling
...
Implements frontend support for CriticMarkup. Related to #1016 .
2018-11-12 16:49:20 +01:00
Bart Kamphorst
5de2442540
Merge branch '5.x' into critic_markup_styling
2018-11-12 16:39:45 +01:00
Bart Kamphorst
b5c4fdcc83
Merge pull request #1344 from gollum/ajax_file_upload
...
Improvements and fixes for file uploading. Prepares for handling of duplicate error.
2018-11-12 16:32:05 +01:00
Bart Kamphorst
b50872497e
Loosen route replacement regex to allow for dashes in routes.
2018-11-12 11:57:28 +01:00
Bart Kamphorst
6d0b42b18f
Fix superfluous code in edit.rb. Add more descriptive help sentence for CriticMarkup.
2018-11-11 15:35:51 +01:00
Dawa Ometto
70bf766cd0
Update README.md
2018-11-11 02:25:29 +01:00
Dawa Ometto
104c959bf7
Update README.md
2018-11-11 02:11:21 +01:00
Dawa Ometto
3c4c2a072c
Update app.rb ( #1346 )
2018-11-10 17:47:02 +01:00
Bart Kamphorst
769f8ec8d6
Implements frontend support for CriticMarkup. Related to #1016 .
2018-11-08 16:11:38 +01:00
Bart Kamphorst
64c4ee9c05
Improve upload handling (server-side and UI).
2018-11-07 11:06:25 +01:00
Bart Kamphorst
6857995442
Only use ajax for file upload. Prepare for handling of duplicate error.
2018-11-02 14:38:12 +01:00
Bart Kamphorst
eade94dcfd
Merge pull request #1341 from ProgramFan/5.x
...
Fix absense of visual feedback when uploading with drag-and-drop. Fixes #1327 .
2018-10-30 12:46:43 +01:00
Yang Zhang
daef5fe9d2
Show spinning when uploading
2018-10-29 22:03:40 +08:00
Yang Zhang
b8629729b9
Fix absense of visual feedback when uploading with drag-and-drop
2018-10-28 19:24:22 +08:00
Dawa Ometto
4e2b1442bd
Fixup: typo and correct asset path
2018-10-20 00:47:35 +02:00
Dawa Ometto
83fbb16c3b
Fix precompilation
2018-10-20 00:47:15 +02:00
Dawa Ometto
d2ea03fbb9
Use path helpers consistently
2018-10-20 00:28:25 +02:00
Bart Kamphorst
b1ac06cd5f
Merge pull request #1337 from gollum/cleanup_route_naming
...
Use snake_case uniformly for all routes.
2018-10-19 22:10:35 +02:00
Bart Kamphorst
19751ec37f
Use snake_case uniformly for all routes.
2018-10-19 21:54:14 +02:00
Bart Kamphorst
814caff755
Merge pull request #1336 from gollum/unify_deletion_routes
...
Unify deletion routes. Implement ajax deletion for /pages. Closes #1332 .
2018-10-19 21:41:33 +02:00
Bart Kamphorst
8d611ea25a
Add explanatory notes to deletion logics.
2018-10-19 21:32:22 +02:00
Bart Kamphorst
1a8b6d6823
Implement AJAX deletion in /pages in order to remove redirect in /delete route.
2018-10-19 21:04:31 +02:00
Dawa Ometto
78289a53bb
Implement header counting using YAML frontmatter. Resolves #908 ( #1330 )
2018-10-19 16:09:23 +02:00
Dawa Ometto
303796c773
Merge pull request #1335 from lpbearden/5.x
...
Updated print.scss to remove footer when printing. Resolves #1333
2018-10-18 12:22:24 +02:00
Bart Kamphorst
825f43c429
Remove debug statements.
2018-10-17 22:24:05 +02:00
Bart Kamphorst
454b5e94dc
Unify deletion routes. Closes #1332 .
2018-10-17 22:18:23 +02:00
Lucas Bearden
7ddbab76c1
updated print.scss to remove footer when printing
2018-10-17 12:50:07 -04:00
Bart Kamphorst
6475394133
Use new view helper method in /pages. Add /deleteFile route to helpers. Fix bug in breadcrumb of /Home.
2018-10-17 14:47:35 +02:00
Dawa Ometto
874c20e69f
Update README.md
...
💄
2018-10-15 10:44:32 +02:00
Dawa Ometto
b93083667d
Update README.md
2018-10-15 10:43:23 +02:00
Dawa Ometto
8f7108c56f
Update README.md
...
Remove bit about building gem from source.
2018-10-15 10:40:53 +02:00
Dawa Ometto
a6167d88cd
Fix base_path bugs in bin/gollum ( #1329 )
2018-10-14 17:54:39 +02:00
Dawa Ometto
197a2bd57b
Namespace ( #1328 )
...
* CSS to SCSS
* Use sprockets
* Use Sprockets helpers
* Fix gollum.editor.js error when changing language
* Add keybinding files required by ace and some ace ext files that are required or might be useful.
* Move app paths to /gollum namespace, add route helpers for view templates
* Use path helper for links in page view
* Use path helper methods in javascript assets
* Refactored sprockets helpers for mustache
* Remove debugging
2018-10-14 15:46:10 +02:00
Bart Kamphorst
fd73eb6d05
Minor speed improvements.
2018-10-11 09:57:18 +02:00
Bart Kamphorst
963eb24fce
Merge pull request #1318 from onewhaleid/non-image-uploads
...
Handle non-image uploads correctly
2018-10-07 14:40:43 +02:00
Bart Kamphorst
5c5bfc71bd
Merge pull request #1326 from gollum/fix_pages_view_urls
...
Fix url generation in pages view.
2018-10-07 14:39:33 +02:00
Bart Kamphorst
3b9af34e0d
Fix url generation in pages view. Show full filename with extension for pages. Distinguish in HTML between file and pages.
2018-10-05 14:48:42 +02:00
Dawa Ometto
daaa82fab5
Merge pull request #1324 from repotag/secure_customs
...
Secure custom JS and CSS. Resolves #665
2018-10-03 22:27:05 +02:00
Dawa Ometto
ff52933320
Improve error message
2018-10-03 22:19:39 +02:00
Dawa Ometto
84c01bb69b
Improve regexps
2018-10-03 22:13:38 +02:00
Dawa Ometto
eb9b71e94a
Merge pull request #1325 from repotag/update_kramdown
...
Update kramdown
2018-10-03 13:30:40 +02:00
Dawa Ometto
1080e776a3
Update kramdown
2018-10-03 12:39:50 +02:00
Dawa Ometto
f8673f565a
Lockdown write access to custom.css and js
2018-10-02 23:56:46 +02:00
Dawa Ometto
6d4f97fdc4
Add custom.css and custom.js files to example repo
2018-10-02 23:56:16 +02:00
Dawa Ometto
c85e14336e
Lockdown access to custom css and js files in repo
2018-10-02 23:31:07 +02:00
Bart Kamphorst
b1cdf91789
Merge pull request #1322 from gollum/enhance_pages_view
...
Implement basic file deletion for /pages view.
2018-10-02 15:25:11 +02:00
Bart Kamphorst
fd9156821c
Resolve minor issue to fix tests.
2018-10-02 14:21:00 +02:00
Bart Kamphorst
feb098bf45
Implement basic file deletion for /pages view.
2018-10-02 14:03:26 +02:00
Dawa Ometto
b0ad3265e7
Announce Hacktober
2018-10-01 18:51:41 +02:00
Dawa Ometto
02fd12339f
Release 4.1.4
2018-10-01 13:30:14 +02:00
Dawa Ometto
9048d6a03d
Depend on newest gollum-lib for patched sanitize version
2018-10-01 13:30:07 +02:00
Dawa Ometto
b5eed33932
Add warbler to Gemfile and update gemspec. Depend on gollum-lib@master and adapters@master for dev purposes.
2018-10-01 13:09:13 +02:00
Dawa Ometto
c660222300
Update README.md
2018-09-27 19:58:14 +02:00
Dawa Ometto
93f6b0373a
Update README.md
...
Update supported rubies.
2018-09-24 19:41:36 +02:00
Dawa Ometto
43d3271b4e
Update .gitattributes
...
Make github-linguist ignore files that aren't our own
2018-09-24 18:40:08 +02:00
Dawa Ometto
66d09b76c7
Update README.md
...
Remove badges that aren't working.
2018-09-24 18:34:14 +02:00
Dawa Ometto
90043a66cb
Update README.md
...
Update badges
2018-09-24 18:11:50 +02:00
README Bot
317ccef7c8
Add CodeTriage badge to gollum/gollum ( #1291 )
...
Adds a badge showing the number of people helping this repo on CodeTriage.
2018-09-24 17:34:40 +02:00
Bart Kamphorst
ef6bd9b538
Merge pull request #1320 from gollum/remove_file_view
...
Remove fileview from gollum and rely on /pages.
2018-09-24 14:30:29 +02:00
Bart Kamphorst
012f1fcd47
Remove fileview from gollum and rely on /pages.
2018-09-23 14:38:09 +02:00
Bart Kamphorst
e46861f827
Merge branch '5.x' of https://github.com/gollum/gollum into 5.x
2018-09-22 21:16:44 +02:00
Bart Kamphorst
4549fdb9c5
Redirect broken links to 404 when --no-edit mode is enabled. Resolves #1197 .
2018-09-22 21:16:01 +02:00
Bart Kamphorst
f5ad5e397e
Merge pull request #1319 from onewhaleid/editor-hover-text
...
Add hover text to editor buttons
2018-09-19 16:06:18 +02:00
Dan Howe
f64ecd340b
Add hover text to editor buttons
2018-09-19 23:09:21 +10:00
Dan Howe
3060a3576f
Handle non-image uploads correctly
2018-09-19 22:48:09 +10:00
Dawa Ometto
771ca331e9
Create ISSUE_TEMPLATE.md
2018-09-17 22:44:09 +02:00
Bart Kamphorst
92e42236f5
Add --versions flag to the gollum binary that outputs the version numbers of auxiliary gems. Resolves #1022 .
2018-09-17 22:41:31 +02:00
Dawa Ometto
7ada448bce
Release 4.1.3
2018-09-17 22:29:34 +02:00
Dawa Ometto
c2258c449e
Added necessary escaping
2018-09-17 22:20:38 +02:00
Bart Kamphorst
051b88fe70
Drop support for ruby =< 2.2 on Travis (due to Sinatra upgrade to 2.0).
2018-09-17 21:25:24 +02:00
Bart Kamphorst
25578961c0
Merge branch '5.x' of https://github.com/gollum/gollum into 5.x
2018-09-17 21:12:39 +02:00
Bart Kamphorst
b47db5611b
Upgrade Sinatra to v.2.0 or higher. Closes #1193 (Rails 5 compatibility).
2018-09-17 21:12:30 +02:00
Dawa Ometto
efe1df769b
Remove legacy git_adapter helper method
2018-09-17 17:09:19 +02:00
Bart Kamphorst
812cd311c3
Fix conditional check on git adapter for String extension library.
2018-09-17 16:53:07 +02:00
Bart Kamphorst
676fb474b9
Merge pull request #1293 from ProgramFan/5.x
...
Upgrade bundled ACE editor to 1.3.1
2018-09-17 11:47:18 +02:00
Dawa Ometto
612267d322
Update CONTRIBUTING.md
...
Add GPG key
2018-08-14 09:36:26 +02:00
Yang Zhang
167b5c4b1f
Upgrade bundle ACE editor to 1.3.1
2018-02-18 11:15:02 +08:00
Bart Kamphorst
d87a481ffb
Add cancel button to editor. Resolves issue #1282 .
2018-02-05 16:44:55 +01:00
Bart Kamphorst
6f54af5556
Merge branch '5.x' of https://github.com/gollum/gollum into 5.x
2018-02-05 15:18:29 +01:00
Bart Kamphorst
ddea445a28
Refactor create view. Fixes create with file extension. Fixes automatic selection of format in editor.
2018-02-05 15:15:54 +01:00
Bart Kamphorst
e82bf4ce46
Merge pull request #1290 from gollum/fix_1274
...
Pagename() function no longer returns file extension. Fixes #1274 .
2018-02-05 13:29:11 +01:00
Bart Kamphorst
f75037db42
Pagename() function no longer returns fill extension. Fixes #1274 .
2018-02-05 12:24:29 +01:00
Bart Kamphorst
01c7b5f380
Merge pull request #1287 from gollum/update_version
...
Change gollum version to 5.0.1b to prevent confusion during development. Closes #1278 .
2018-01-17 17:12:03 +01:00
Bart Kamphorst
0b906dd952
Change gollum version to 5.0.1b to prevent confusion during development. Closes #1278 .
2018-01-17 16:58:58 +01:00
Dawa Ometto
dac91e9998
CSS to SCSS ( #1247 )
...
* CSS to SCSS
* Fix travis
* Use sprockets
* Use Sprockets helpers
* Fix gollum.editor.js error when changing language
* Fix fileview styles, use same style as Pages View.
* Add keybinding files required by ace and some ace ext files that are required or might be useful.
2018-01-14 16:47:47 +01:00
Dawa Ometto
6de0914788
Release 4.1.2
2017-08-07 17:54:00 +02:00
Dawa Ometto
e4f702d1e2
Lock to newer gollum-lib to avoid falling back to unsafe nokogiri
2017-08-07 17:40:49 +02:00
Thomas KUNTZ
a75b003c78
Update Mousetrap and use new 'mod' helper ( #1245 )
...
* Fix page list for files that have regexp special chars.
The page list collection logic was using the filename without any
scaping to create a regexp. This not only breaks for some names it might
even be a security problem by introducing bad regular expression as
filenames.
* Add another video to README.
* Test on Ruby 2.4
* Pass non-empty commit author details in transliteration test
Empty name or email are not allowed by libgit2 and cause a test failure
when the test suite is run against rugged_adapter.
* Solve bug when folder contain non-ascii character
When you create a file in a folder with non-ascii character, for exemple "Réseau", after creating the page, it throwed an "URI::InvalidURIError", given the fact that the url returned was "/Réseau/H%C3%A9y", only the part with the name of the file was correctly encoded.
So I propose to encode every part of the url to solve this issue
So I just
* readme: Use --document in place of deprecated options
* Release 4.1.0
* Skip tests for transliteration for adapters different than grit
* Fix date. Closes #1211
* Set bar_side for versioned pages. Closes #1226
* Update gemijione dependency. Closes #1227
* Release 4.1.1
* Update Mousetrap and use new 'mod' helper
Since version 1.4, a generic 'mod' helper can be used for cross
platform shortcuts. I updated Mousetrap to latest v1.6.1 and
used 'mod+s' instead of ['ctrl+s', 'command+s'] for the editor's
keyboard shortcut.
See https://craig.is/killing/mice#api.bind.combo
2017-08-07 00:29:08 +02:00
Dawa Ometto
08d822a3ff
Merge pull request #1248 from repotag/fix_yaml
...
Fix potential bug in YAML rendering: convert object to string before escaping
2017-07-31 18:35:00 +02:00
Dawa Ometto
2f864c5e15
Stop support for ruby 2.0.0 because it is not compatible with a safe nokogiri. See https://github.com/gollum/gollum-lib/issues/278
2017-07-31 18:09:32 +02:00
Dawa Ometto
c9e3e9aa84
Try fix Travis
2017-07-31 18:05:43 +02:00
Dawa Ometto
7139590798
Try fix travis
2017-07-31 18:01:37 +02:00
Dawa Ometto
37c1183515
Fix potential bug in YAML rendering: convert object to string before escaping
2017-05-31 17:18:45 +02:00
Dawa Ometto
935a080152
Merge pull request #1235 from svoop/escape_emojis
...
Document how to escape emoji
2017-04-30 20:49:04 +02:00
Sven Schwyn
6f11ce71c4
Minor rewording
2017-04-30 17:30:10 +02:00
Sven Schwyn
f41a85ced9
Document how to escape emoji
2017-04-30 15:54:55 +02:00
Dawa Ometto
97fab1df14
Mark more Precious::App internal methods as private
2017-04-27 23:54:28 +02:00
Dawa Ometto
f6273ded80
app.rb: mark non-route methods as private.
2017-04-27 23:32:16 +02:00
Dawa Ometto
9b7028a74e
Remove superfluous useragent tests
2017-04-27 23:28:33 +02:00
Dawa Ometto
16894330a9
Merge pull request #1234 from repotag/wssub_fix
...
Found more spurious whitespace substitution.
2017-04-23 11:53:48 +02:00
Dawa Ometto
35f6952519
Found more spurious whitespace substitution.
2017-04-23 11:45:48 +02:00
Dawa Ometto
ca50e87538
Merge pull request #1229 from ProgramFan/feature-5.x/add-keyboard-shortcuts-dialog
...
Add keyboard shortcuts dialog. Closes #505 .
2017-04-17 22:24:48 +02:00
Dawa Ometto
0870655455
Release 4.1.1
2017-04-17 11:20:06 +02:00
Dawa Ometto
ba24a7bb8c
Update gemijione dependency. Closes #1227
2017-04-17 11:01:50 +02:00
Yang Zhang
56ad3251fd
Add keyboard shorts dialog and enable Ctrl+S in the editor
2017-04-14 22:25:39 +08:00
Dawa Ometto
f32d7465a2
Set bar_side for versioned pages. Closes #1226
2017-04-14 00:31:09 +02:00
Dawa Ometto
750e2ee677
Fix syntax error in bin/gollum
2017-04-14 00:28:44 +02:00
Dawa Ometto
cc273f30e9
Merge pull request #1224 from repotag/remove_livepreview
...
Remove livepreview
2017-04-13 20:14:27 +02:00
Dawa Ometto
64fd56e8ef
Merge branch '5.x' into remove_livepreview
2017-04-13 20:00:59 +02:00
Dawa Ometto
0fa47047f3
Merge pull request #1225 from repotag/follow_renames
...
Follow page renames in history view. Close #565
2017-04-13 19:59:59 +02:00
Dawa Ometto
6e2559f77a
Merge pull request #1223 from repotag/expose_page_sha
...
Expose page's SHA id in Page view. Closes 1222.
2017-04-13 01:01:30 +02:00
Dawa Ometto
cabe9f353b
Fix tests
2017-04-13 00:24:06 +02:00
Dawa Ometto
5aa5bccda3
Remove livepreview
2017-04-12 23:03:11 +02:00
Dawa Ometto
16ea6245e3
Follow page renames in history view
2017-04-12 23:00:07 +02:00
Dawa Ometto
df9382bbc3
Add test for Page view #sha. Fix h1 title test.
2017-04-12 19:50:40 +02:00
Dawa Ometto
39aa290ea6
Expose page's SHA id in Page view. Closes 1222.
2017-04-12 19:42:26 +02:00
Dawa Ometto
f9b8b4e8d3
Remove ws subs ( #1220 )
...
* remove unwanted whitespace substitution
* end repression of file extensions
* see also https://github.com/gollum/gollum-lib/pull/249
2017-04-10 14:50:18 +02:00
Dawa Ometto
8aa10fe400
Yaml frontmatter ( #1217 )
...
Render YAML frontmatter
* Fix tests on 5.x
* Update README
* Refactor Page view #table
* Minor refactor
* Refactor
2017-04-09 19:26:04 +02:00
Dawa Ometto
e202698bf1
Merge pull request #1189 from nimag42/patch-1
...
Solve bug when folder contains non-ascii character
2017-04-09 11:49:54 +02:00
Zhang YANG
c1f94d2deb
Replace the editor body with Ace editor ( #1173 )
...
* Replace editor's content editor with Ace Editor
* Bundle ace 1.2.5
* Give the ace editor body a name
* Changeing edit mode now changes Ace's editor mode
* Move Ace interface into gollum.editor.js and implement drag and drop uploading
* Make editor bottons work (mostly)
* Fix edit mode mapping
* Fix mode selection for empty editor
* Make the ace editor vertically resizable
* Add org-mode and reStructuredText mode mapping
* Add missing jquery.resize.js
* Change keybinding from vim to emacs
* Makes ace resizable on Chrom
* Fix accidental change of resize
* Add keyboard selector and fix commit message updating
* Add visual aid in editor to signal unavailable formats
* Hide line number by default
2017-04-09 10:48:22 +02:00
Dawa Ometto
11c2bf7dae
Fix date. Closes #1211
2017-04-05 23:05:24 +02:00
Dawa Ometto
159a2e13ad
Merge pull request #1213 from repotag/remove_ruby18
...
Remove unicode support on deprecated ruby 1.8
2017-04-04 14:31:08 +02:00
Dawa Ometto
1e53d7ba53
Remove unicode support on deprecated ruby 1.8
2017-03-28 22:12:01 +02:00
Dawa Ometto
53cf0e1148
Merge pull request #1201 from adamniedzielski/skip-transliteration-tests-rugged
...
Skip tests for transliteration for adapters different than grit
2017-03-11 20:35:53 +01:00
Adam Niedzielski
2d1e49e3f2
Skip tests for transliteration for adapters different than grit
2017-03-11 19:28:31 +01:00
Dawa Ometto
199161f611
Merge pull request #1188 from adamniedzielski/pass-non-empty-author-details
...
Pass non-empty commit author details in transliteration test
2017-03-10 12:00:57 +01:00
Dawa Ometto
ece5c775f1
Release 4.1.0
2017-03-09 17:34:37 +01:00
Dawa Ometto
895d2eb97e
Merge pull request #1198 from QuaeNocentDocent/template_page
...
Template page
2017-03-09 16:29:44 +01:00
Dawa Ometto
3121c43b71
Merge pull request #1180 from bogado/issue#1179
...
Fix page list for files that have regexp special chars.
2017-03-09 16:22:40 +01:00
Daniele Grandini
c5f3270ff6
final before pull request
2017-02-24 13:54:29 +01:00
Daniele Grandini
318a4717d1
rebasing
2017-02-24 13:50:38 +01:00
Daniele Grandini
37a11546fa
rebasing
2017-02-24 13:49:28 +01:00
Daniele Grandini
643a42aea6
Merge branch 'template_page' of https://github.com/QuaeNocentDocent/gollum into template_page
...
rebasing
2017-02-24 13:43:42 +01:00
Daniele Grandini
2b8497531d
rebasing
2017-02-24 13:41:52 +01:00
Daniele Grandini
fdbde7840d
mv template load in page create and added tests
2017-02-24 13:32:20 +01:00
Daniele Grandini
d702026134
final
2017-02-24 13:32:20 +01:00
Jérémie Astori
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
Horacio Sanson
72c8e1aff3
Add option to configure PlantUML endpoint
2017-02-24 13:32:20 +01:00
Bart Kamphorst
51e8caf369
Merge pull request #1191 from polyzen/patch-1
...
readme: Use --document in place of deprecated options
2017-02-16 16:05:35 +01:00
Daniel M. Capella
e7e7937678
readme: Use --document in place of deprecated options
2017-02-02 14:26:32 -05:00
Jacquin Théo
a0f5a60ea0
Solve bug when folder contain non-ascii character
...
When you create a file in a folder with non-ascii character, for exemple "Réseau", after creating the page, it throwed an "URI::InvalidURIError", given the fact that the url returned was "/Réseau/H%C3%A9y", only the part with the name of the file was correctly encoded.
So I propose to encode every part of the url to solve this issue
So I just
2017-01-29 00:39:39 +01:00
Adam Niedzielski
af29c6e441
Pass non-empty commit author details in transliteration test
...
Empty name or email are not allowed by libgit2 and cause a test failure
when the test suite is run against rugged_adapter.
2017-01-27 15:15:50 +01:00
Dawa Ometto
00dfecb1c7
Merge pull request #1185 from connorshea/ruby-24
...
Test on Ruby 2.4
2017-01-20 23:30:24 +01:00
Dawa Ometto
cc249bef15
Merge pull request #1182 from bjoernalbers/master
...
Add another video to README.
2017-01-19 15:14:11 +01:00
Connor Shea
9a2231804d
Test on Ruby 2.4
2017-01-14 19:10:17 -05:00
Björn Albers
1edcf15bcd
Add another video to README.
2017-01-10 18:26:56 +01:00
Victor Bogado
0190e08763
Fix page list for files that have regexp special chars.
...
The page list collection logic was using the filename without any
scaping to create a regexp. This not only breaks for some names it might
even be a security problem by introducing bad regular expression as
filenames.
2017-01-01 19:55:18 -08:00
Bart Kamphorst
6b20c5df71
Merge pull request #1176 from svoop/5.x
...
Update gemojione to 3.2
2016-12-31 10:52:01 +01:00
Sven Schwyn
8da809f22c
Update gemojione to 3.2
...
https://github.com/gollum/gollum-lib/issues/226
2016-12-28 23:49:39 +01:00
Daniele Grandini
54ece4e432
mv template load in page create and added tests
2016-08-27 15:51:18 +02:00
Daniele Grandini
a50fcd31e2
final
2016-08-25 10:11:22 +02:00
Dawa Ometto
d3cc5a69c4
Merge branch 'rc'
2016-08-07 21:36:51 +02:00
Dawa Ometto
07ca53a778
Merge branch 'rc' into master
...
Conflicts:
bin/gollum
2016-08-07 21:36:13 +02:00
Dawa Ometto
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
Dawa Ometto
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
Dawa Ometto
435a3e62ba
Remove calls to Page#last_version, replace with AJAX-lookup of version info.
2016-08-07 20:09:01 +02:00
Bart Kamphorst
f02c934ad7
Merge pull request #1154 from maarten/#855-delete-files
...
Fixes #855 Adds file deletion fuctionality.
2016-08-07 19:46:55 +02:00
Maarten Engelen
236680aab9
Add file deletion functionality
...
Adds route for file deletion
Add styles and images for this
2016-08-07 17:18:36 +02:00
Dawa Ometto
6316f97c06
Update CONTRIBUTING.md
2016-08-07 12:50:48 +02:00
Dawa Ometto
14830af306
Update CONTRIBUTING.md
2016-08-07 12:50:18 +02:00
Dawa Ometto
b620decde7
Add contributing guidelines
2016-08-07 12:48:07 +02:00
Bart Kamphorst
b08ca620a0
Merge pull request #1148 from astorije/patch-2
...
Remove deprecated github-markdown markup
2016-07-11 21:44:02 +02:00
Jérémie Astori
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
Jérémie Astori
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
Dawa Ometto
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
Dawa Ometto
330f7b4002
Add Safari to livepreview-enabled browsers. Fixes #503
2016-06-16 12:58:22 +02:00
Dawa Ometto
def0fc8866
Merge pull request #1126 from svoop/emoji
...
Support for emoji
2016-06-09 16:43:52 +02:00
Sven Schwyn
fa1bcf9608
Add support for emojione
2016-05-19 20:33:25 +02:00
Bart Kamphorst
5a5e56a47b
Merge pull request #1111 from jhominal/master
...
Unconditionally add 'test-unit' dependency.
2016-02-24 02:28:24 +01:00
Jean Hominal
e64f40eaa3
Unconditionally add 'test-unit' dependency.
...
Fixes #1110
2016-02-23 22:52:07 +01:00
Dawa Ometto
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
Jean Hominal
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
Bart Kamphorst
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
Bart Kamphorst
6bd2f3bff5
Drop 1.9.3 testing on Travis, add 2.3.0.
2016-01-10 15:28:23 +01:00
Bart Kamphorst
8c3c519679
Adds links to youtube videos in README.
2016-01-10 11:49:34 +01:00
Dawa Ometto
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
André Luis Leal Cardoso Junior
5a53c58b04
Sanitize basepath options when adding with more than one / at the start. Fixes #1066
2015-12-05 23:23:22 -02:00
Bart Kamphorst
a61d1e3d10
Merge pull request #1094 from repotag/master
...
Update kramdown and useragent dependencies.
2015-11-30 11:26:51 +01:00
Bart Kamphorst
1a50f99189
Merge branch 'master' of https://github.com/gollum/gollum
2015-11-30 00:28:30 +01:00
Bart Kamphorst
6caacbf388
Update kramdown and useragent dependencies.
2015-11-30 00:28:01 +01:00
Dawa Ometto
f876aa7d0f
Merge pull request #1077 from mpnowacki/renaming
...
fixed file renaming issues with page_file_dir
2015-11-02 11:42:50 +01:00
Dawa Ometto
31e1281600
Merge pull request #1086 from ngyuki/fix-preview-sidebar
...
Fix position of sidebar in preview
2015-11-02 11:42:25 +01:00
ngyuki
90072a9332
Fix position of sidebar in preview
2015-11-02 12:45:30 +09:00
Dawa Ometto
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
SkyCrawl
7362fd859b
Fixing the "running" section
2015-10-25 13:12:36 +01:00
mpnowacki
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
Dawa Ometto
ab42c0c0df
Release 4.0.1
2015-09-20 14:48:32 +02:00
Bart Kamphorst
de5aed2f6a
Merge pull request #1069 from repotag/master
...
Added security check.
2015-09-20 14:31:14 +02:00
Bart Kamphorst
ce68a88293
Added security check.
2015-09-20 13:53:02 +02:00
Dawa Ometto
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
Dawa Ometto
8528dd0c7f
Merge pull request #1067 from SkyCrawl/master
...
Fixing the link to Windows support meta issue
2015-09-14 17:55:18 +02:00
SkyCrawl
e0f35eceab
Fixing the link to Windows support meta issue
2015-09-14 17:31:25 +02:00
Dawa Ometto
7e36517a79
Merge pull request #1054 from SkyCrawl/master
...
Config files restored + BIN enhancements + BIN/README sync
2015-09-14 12:40:22 +02:00
Dawa Ometto
69327766bb
Merge pull request #1061 from rgroux/gollum-with-cas-sso
...
README add link to wiki about CAS SSO
2015-09-14 12:38:35 +02:00
Nils Steinger
9ecf8a61ba
Added init script for Debian's SysV-style init system
...
Adapted from the OpenRC init script in contrib/openrc/init.d/gollum.
2015-09-14 05:03:06 +02:00
Richard Groux
2323506c82
Update README.md
2015-09-10 18:14:59 +02:00
Bart Kamphorst
caa1a55e7a
Merge pull request #1062 from mortonfox/patch-1
...
Fix github-markup link in readme.
2015-08-26 09:49:56 +02:00
Morton Fox
2ce44c157a
Fix github-markup link
2015-08-25 23:48:53 -04:00
rgroux
e17778190d
README add link to wiki about CAS SSO
2015-08-25 17:06:36 +02:00
SkyCrawl
d1d81a0043
Syncing BIN with README + fixes & enhancements
2015-08-23 14:44:18 +02:00
SkyCrawl
ddb5ced3d5
Updating gemspec to reflect recent changes
2015-08-23 14:43:46 +02:00
Bart Kamphorst
9cebe655fd
Merge pull request #1060 from mchill/custom-template
...
Fix custom.x path when page-file-dir is not set
2015-08-21 14:11:02 +02:00
Matt Hill
51b5a11a54
Fix custom.x path when page-file-dir is not set
2015-08-20 23:19:25 -04:00
Bart Kamphorst
f3405851a7
Merge pull request #1055 from repotag/webrick_fix
...
Add webrick as development dependency. Fixes #1053 .
2015-08-14 11:42:17 +02:00
Bart Kamphorst
5b6870d610
Add webrick as development dependency. Fixes #1053 .
2015-08-14 11:06:17 +02:00
SkyCrawl
c3dceaff5c
Adding reference to the "Troubleshoot" wiki page
2015-08-12 22:26:59 +02:00
SkyCrawl
0a9b35c039
Restoring config files to repo root
2015-08-12 22:26:20 +02:00
Dawa Ometto
dc32997f45
Merge pull request #1051 from SkyCrawl/master
...
Docs update
2015-08-09 20:30:21 +02:00
SkyCrawl
67c64c17d5
README makeover
2015-08-09 19:22:16 +02:00
Dawa Ometto
9cc02982be
Merge pull request #973 from hsanson/add-plantuml-opt
...
Add option to configure PlantUML endpoint
2015-08-09 19:15:02 +02:00
SkyCrawl
b4c70a62a9
Removing Home.md due to being a mere lorem ipsum
2015-08-08 15:21:30 +02:00
SkyCrawl
c9d5921f4e
Moving docs/sanitization.md to the wiki
2015-08-08 15:21:00 +02:00
SkyCrawl
0f47a4de5d
Removing config.rb due to being pointless
2015-08-08 15:20:35 +02:00
Dawa Ometto
0ba5e4d3c7
Merge pull request #1047 from benubird/custom-template
...
Changed layout template, to handle custom.x with page-file-dir
2015-08-05 14:51:51 +02:00
Joshua Swanson
73e61dbcff
Changed layout template, to correctly handle custom.js when --page-file-dir is set
2015-08-05 13:26:19 +01:00
Bart Kamphorst
ba142e3b19
Merge pull request #1038 from rgroux/development
...
upgrade/update a number of dependencies.
2015-07-27 22:14:55 +02:00
GROUX Richard
f651a401e8
deps(update): test with ruby 2.2.2
...
need to add `test-unit` gem when using ruby >= 2.2.0
2015-07-27 13:49:03 +02:00
GROUX Richard
3301252fb2
deps(update): twitter_cldr update to > 3.2
...
Changelog is
[there](https://github.com/twitter/twitter-cldr-rb/blob/master/History.txt )
2015-07-27 13:20:50 +02:00
GROUX Richard
fe77e2b0d3
deps(update): upgrade the mocha version to 1.1
...
Changelog is
[there](https://github.com/freerange/mocha/blob/master/RELEASE.md )
2015-07-27 13:16:29 +02:00
GROUX Richard
d586567c3b
deps(update): upgrade the useragent version to 0.14
2015-07-27 13:15:50 +02:00
GROUX Richard
211178d39e
deps(update): upgrade the kramdown version to 1.8
...
Changelog of kramdown is [there](http://kramdown.gettalong.org/news.html )
2015-07-27 13:12:48 +02:00
Dawa Ometto
d8354faa49
Merge pull request #1035 from rgroux/search
...
Search default query to ''
2015-07-26 20:23:09 +02:00
GROUX Richard
f9e5c05046
Fix search without querry
...
App crash when we try to get /search
Add an empty querry '' as default
2015-07-21 19:35:45 +02:00
Dawa Ometto
596afe9451
Merge pull request #1034 from mehulkar/patch-1
...
Fix a typo in the readme
2015-07-16 23:35:51 +02:00
Mehul Kar
f7b5de986a
Fix a typo in the readme
2015-07-16 13:57:11 -07:00
Bart Kamphorst
ee9262472b
Merge pull request #1032 from techwiz24/iss1030-ie-cache
...
Fix #1030 : Disable AJAX Cach in Live Editor
2015-07-12 19:09:04 +02:00
Nathan Lowe
8a6a8db730
Fix #1030 : Disable AJAX Cach in Live Editor
...
Internet Explorer caches all AJAX get requests and decides when to expire
them in the cache. This commit disables caching on the GET request to
/data/<PAGE NAME>, which fixes IE displaying old page data when using the
live editor.
See http://www.dashbay.com/2011/05/internet-explorer-caches-ajax/ and
https://stackoverflow.com/questions/4303829/how-to-prevent-a-jquery-ajax-request-from-caching-in-internet-explorer
2015-07-03 17:28:43 -04:00
Bart Kamphorst
3642370f11
Merge pull request #1014 from techwiz24/iss/1012-pages-view
...
Fix #1012 : /Pages View should list folders first, then files, all alphabetically.
2015-05-21 02:15:57 +02:00
Nathan Lowe
2db2cfb81c
Update test coverage to account for #1012
...
The existing 'files_folders' test only covered the /Mordor subdirectory,
which does not include a diverse enough set of pages and folders to account
for the new rendering logic.
This test uses the results from the root of the lotr.git example repository
as it exists at this point in time. The mock '@results' are not passed as a
sorted array in order to test the sorting logic.
The existing 'files_folders' test has been renamed to 'files_folders from subdir'
because the 'files_folders' function should be tested in a situation when
viewing /pages from a subdirectory to ensure proper functionality.
2015-05-20 18:58:24 -04:00
Nathan Lowe
279b028c5e
Fix #1012 : /Pages should render Folders First, then files, alphabetically
2015-05-20 18:58:10 -04:00
Dawa Ometto
f268827a2e
Merge pull request #995 from tfogo/html-cleanup
...
Remove extraneous li tags
2015-04-26 19:05:00 +02:00
Dawa Ometto
d8bc065057
Merge pull request #1003 from akston/readme_typo
...
Fix typo in README
2015-04-26 19:04:26 +02:00
Conor Schaub
6301bbbb66
Fix typo in README
2015-04-25 15:32:30 -07:00
Dawa Ometto
3ad65eaef8
Update README.md
2015-04-11 11:53:59 +02:00
Dawa Ometto
3d1bc7949d
Update README.md
2015-04-11 11:43:40 +02:00
Dawa Ometto
26e092fd20
Update HISTORY.md
2015-04-11 11:42:21 +02:00
Dawa Ometto
be7ddec1b0
Update README.md
2015-04-11 11:40:43 +02:00
Dawa Ometto
5781ac6bbd
Release 4.0.0
2015-04-11 11:32:03 +02:00
Dawa Ometto
a51bc4427a
Merge pull request #994 from repotag/kramdown
...
Move to Kramdown and support JRuby
2015-04-11 11:07:34 +02:00
Dawa Ometto
80854584bb
Make test regex more lenient
2015-04-11 01:29:08 +02:00
Tim Fogarty
93af289d3b
Remove extraneous li tags
2015-04-06 02:40:02 -04:00
Dawa Ometto
a27b882493
Test on jruby
2015-04-06 00:57:18 +02:00
Dawa Ometto
ba6f957692
Move to Kramdown
2015-04-06 00:28:31 +02:00
Dawa Ometto
ec0e1bf26f
Merge pull request #992 from kirat-singh/fix-upload-file-url
...
prepend baseUrl to /uploadFile
2015-04-05 23:34:07 +02:00
Kirat Singh
e4df298bb4
prepend baseUrl to /uploadFile
2015-04-05 14:22:41 -04:00
Dawa Ometto
804d21e31d
Release 3.1.3
2015-04-04 11:45:17 +02:00
Dawa Ometto
6d33687866
Merge pull request #990 from repotag/issue940
...
Block on no-edit without using middleware
2015-04-03 17:32:20 +02:00
Dawa Ometto
21bb1efb46
Block on no-edit without using middleware
2015-04-03 17:22:51 +02:00
Dawa Ometto
9d0986f1ca
Merge pull request #964 from simonzack/mathjax_livepreview
...
Enable mathjax in live preview
2015-04-02 13:13:25 +02:00
Bart Kamphorst
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
Andrew Arrow
09364850ee
adding template dir logic to app.rb vs. just the bin
2015-03-27 15:13:55 -07:00
Dawa Ometto
4d3a8bad4c
Merge pull request #985 from uraimo/patch-1
...
Fixed two broken links in README.md
2015-03-13 14:40:19 +01:00
Umberto Raimondi
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
Horacio Sanson
1cceb7d4b4
Add option to configure PlantUML endpoint
2015-02-05 01:10:12 +09:00
Dawa Ometto
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
Dawa Ometto
af6d690fc8
Add root slash to drag-and-drop upload path. Resolves #969 .
2015-01-30 22:06:31 +01:00
Dawa Ometto
eea5152444
Update README.md
2015-01-30 18:34:18 +01:00
Dawa Ometto
1ca38b625b
Update README.md
2015-01-30 18:33:52 +01:00
Sunny Ripert
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
simonzack
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
simonzack
f9a9b90ed7
enable mathjax in live preview
2015-01-28 18:00:35 +11:00
Dawa Ometto
1f2917ac22
Merge pull request #959 from simonzack/ace_update
...
Updated ace so markdown highlights better.
2015-01-27 17:51:47 +01:00
simonzack
fe1a8569f6
updated ace
2015-01-27 22:46:30 +11:00
simonzack
33e8d4f328
added an initAce hook to allow configuration of the live editor
2015-01-27 21:16:05 +11:00
Dawa Ometto
e183260d0a
Merge pull request #956 from repotag/issue_955
...
Resolves #955 .
2015-01-26 23:16:50 +01:00
Dawa Ometto
b4023942b4
Remove page file dir from upload path
2015-01-26 23:10:28 +01:00
Dawa Ometto
c10c24d90d
Merge pull request #953 from simonzack/master
...
Resolves #952 .
2015-01-25 18:45:17 +01:00
simonzack
915f63cac4
pixel tweaks so the left scrollbar is selectable and the viewport takes the whole page
2015-01-26 04:15:14 +11:00
Dawa Ometto
5c30ff4d3e
Release 3.1.2
2015-01-23 00:27:04 +01:00
Dawa Ometto
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
Dawa Ometto
e5c2e3b3eb
Set the allow_editing wiki option to true by default.
2015-01-23 00:14:13 +01:00
Dawa Ometto
77f4aee0af
Fix test related to gollum-lib TOC update
2015-01-23 00:00:01 +01:00
Dawa Ometto
868cbdfc7b
Merge pull request #936 from techwiz24/iss922-sort-pages
...
Sort `/pages` alphabetically. Resolves #922 .
2015-01-13 10:18:51 +01:00
Nathan Lowe
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
Dawa Ometto
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
Dawa Ometto
355db16d2c
Allow utf-8 page names when not using grit.
2015-01-04 12:20:25 +01:00
Dawa Ometto
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
Janusz Lewandowski
afb7d4c9d1
Encode the page title in the URL of a diff page.
2015-01-03 17:56:51 +01:00
Dawa Ometto
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
Geoffrey Roberts
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
Dawa Ometto
3b1b4a0a96
Update README.md
2014-12-22 20:28:50 +01:00
Dawa Ometto
10b45cb54d
Add --bare command line option (see #811 ).
2014-12-22 20:20:57 +01:00
Dawa Ometto
9d289e571b
Describe important security update.
2014-12-18 16:44:23 +01:00
Dawa Ometto
cce871c30e
Allow running tests with alternative adapter
2014-12-08 01:44:01 +01:00
Dawa Ometto
c2b605a90f
Release 3.1.1
2014-12-04 14:06:57 +01:00
Dawa Ometto
09149592b5
Set allow_editing in Precious::App to true by default. Closes #911
2014-12-04 13:53:58 +01:00
Dawa Ometto
e7410e551b
Bring rake dependency up to date.
2014-11-28 14:13:40 +01:00
Dawa Ometto
9d77bc4192
Release 3.1.0
2014-11-28 14:06:36 +01:00
Dawa Ometto
537fa0c423
Merge branch 'rc'
2014-11-28 13:38:33 +01:00
Dawa Ometto
c78dbc8bc1
Merge branch 'master' into rc
...
Conflicts:
README.md
lib/gollum/app.rb
2014-11-28 13:36:21 +01:00
Dawa Ometto
249eed5c2c
Update HISTORY.md
2014-11-28 13:26:47 +01:00
Dawa Ometto
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
Étienne Charignon
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
Dawa Ometto
9f8a90c0ac
Merge pull request #875 from ut7/latest-changes
...
Add a "latest changes" button and page
2014-11-27 19:22:42 +01:00
Dawa Ometto
861dc935cb
Configure git on Travis
2014-11-27 19:12:54 +01:00
Dawa Ometto
96ef8cacea
Merge pull request #899 from repotag/gollum-lib-112
...
Fix tests, see https://github.com/gollum/gollum-lib/issues/112
2014-11-27 14:11:01 +01:00
Dawa Ometto
5f3ecc8713
Merge pull request #901 from repotag/prepare-release
...
Prepare new release.
2014-11-27 13:58:24 +01:00
Dawa Ometto
8b8ef0eb46
Prepare new release.
2014-11-27 13:51:02 +01:00
Dawa Ometto
2dbea54c84
Merge pull request #900 from repotag/adapter-flag
...
Implement git adapter CLI flag.
2014-11-26 00:47:39 +01:00
Dawa Ometto
a776d9fb6f
Implement git adapter CLI flag.
2014-11-26 00:33:03 +01:00
Dawa Ometto
57b7bbff5a
Update README.md
...
Updated command line options.
2014-11-25 23:43:42 +01:00
Dawa Ometto
a832b0ed54
Fix tests, see https://github.com/gollum/gollum-lib/issues/112
2014-11-25 19:54:31 +01:00
Dawa Ometto
3ec75b84ae
Merge pull request #898 from bambycha/editable
...
Disable editing from UI
2014-11-22 12:15:24 +01:00
Roman Bambycha
b932763080
add function to disable editing, resolves #879
2014-11-17 19:46:46 +02:00
Étienne Charignon
374f8f2f69
First attempt at a global latest changes overview.
...
- uses a wiki_options entry named :latest_changes_count instead of a
constant
- lists modified pages with links
2014-11-11 22:43:34 +01:00
Dawa Ometto
226c253d5a
Merge pull request #895 from repotag/rc_fix_sidebar
...
Fix sidebar, header, and footer, and add regression test.
2014-11-10 22:54:05 +01:00
Dawa Ometto
c78a9f7950
Fix sidebar, header, and footer, and add regression test.
2014-11-10 22:39:42 +01:00
Bart Kamphorst
7264510ab2
Merge pull request #893 from tuftedocelot/add-systemd
...
Add systemd service file to contrib and move openrc files to contrib directory as well.
2014-11-06 22:03:18 +01:00
Dawa Ometto
3458ec6511
Merge pull request #894 from repotag/892-view-file-revisions
...
Route /filename/[commit-sha] will display specific revision of a file. Resolves #892 .
2014-11-06 21:57:25 +01:00
Dawa Ometto
2c80db6678
Route /filename/[commit-sha] will display specific revision of a file. Resolves #892 .
2014-11-06 21:31:23 +01:00
tuftedocelot
439aa6e4f5
Prepare contrib directory
...
Move openrc files to contrib/ in conjunction with systemd service.
Update gemspec to bundle contrib/ into the gem.
2014-11-06 14:20:33 -06:00
tuftedocelot
adf544dca9
Add systemd service file to contrib
...
Supersedes #887 to add a systemd unit file which will run as a user and
whose gollum path and options can be changed as needed.
2014-11-06 10:33:18 -06:00
Bart Kamphorst
0965269ee9
Merge pull request #890 from repotag/ignore_footer_header_sidebar_if_empty
...
Do not render footers, headers and sidebars if (after formatting) they are empty. Resolves #398 .
2014-11-05 09:10:28 +01:00
Dawa Ometto
19d370c4e9
Merge pull request #891 from repotag/704-showall-files
...
Resolves #704 . Implements the fix proposed by @bdillahu in https://github.com/gollum/gollum/pull/767 and modifies tests accordingly.
2014-11-05 02:48:03 +01:00
Dawa Ometto
cee0f8b652
Change pages display to handle non-wiki file types with --show_all enabled
2014-11-05 02:30:07 +01:00
Bart Kamphorst
37664d3487
Do not render footers, headers and sidebars if (after formatting) they are empty. Resolves #398 .
2014-11-05 02:15:35 +01:00
Dawa Ometto
5a78015d81
Merge pull request #889 from repotag/888-h1-logic
...
Page header now uses h1-title logic. Resolves #888 .
2014-11-04 23:34:42 +01:00
Dawa Ometto
7250962ba3
Page header now uses h1-title logic.
2014-11-04 23:23:46 +01:00
Bart Kamphorst
442120bfdb
Merge pull request #884 from tuftedocelot/issue600-docs
...
add detail to inline help
2014-10-28 20:25:52 +01:00
tuftedocelot
de624d1e54
add detail to inline help
2014-10-27 07:12:43 -05:00
Dawa Ometto
523029cc45
Merge pull request #876 from LEW21/delete-commit-rc
...
Fix the commit information for page deletion. Solves #807 .
2014-10-11 14:21:50 +02:00
Janusz Lewandowski
934affe419
Fix the commit information for page deletion.
...
Now they will be authored by the gollum.author.
2014-10-11 13:15:23 +02:00
Bart Kamphorst
55b9af1589
Merge pull request #869 from lucas-clemente/rc
...
allow uploading files by drag and drop (if uploading files is enabled).
2014-10-05 08:22:40 -04:00
Lucas Clemente
16dd7e46ef
allow uploading files by drag and drop
2014-10-05 14:15:48 +02:00
Dawa Ometto
851c77d8f2
Merge pull request #847 from hardywu/master
...
add --mathjax-config to inject root-repo/mathjax.config.js. Closes #842 .
2014-10-05 12:41:03 +02:00
Hardy
ee55b74898
add --mathjax [CONFIG] to inject root-repo/[CONFIG] file,
...
which is similar to the behavior of --css and --js.
CONFIG is "mathjax.config.js" by default.
2014-10-04 23:09:10 -04:00
Dawa Ometto
13fc1e5c66
Merge pull request #872 from Mogztter/issue-870
...
Resolves #870 .
2014-10-04 13:53:03 +02:00
Dawa Ometto
87112c2942
Merge pull request #873 from Mogztter/issue-871
...
Fix css selector for Asciidoctor h1 html ouptput
2014-10-04 13:47:26 +02:00
Guillaume Grossetie
2664fdca30
Fix css selector for Asciidoctor h1 html ouptput
2014-10-04 12:45:35 +02:00
Guillaume Grossetie
e05f523145
Horizontal scroll when table is too wide
2014-10-04 12:37:21 +02:00
Geoffrey Roberts
1148d29439
Made the Gollum theme responsive.
...
Not a particularly comprehensive change in style, just one that removes all the fixed sizing for browsers below 940px in width.
Closes #831 .
2014-10-02 00:50:29 +02:00
Sunny Ripert
7ba52978d1
Merge pull request #864 from Mogztter/asciidoc-headers
...
Adds headers to the AsciiDoc editor
2014-09-26 15:48:47 +02:00
Sunny Ripert
138a9fee43
Merge branch 'master' into rc
2014-09-24 10:58:10 +02:00
Sunny Ripert
1d522eaf0d
Merge pull request #862 from Mogztter/asciidoctor-1.5.0-syntax
...
Use Asciidoctor 1.5.0 new syntax backtick
2014-09-22 13:51:40 +02:00
Sunny Ripert
b5c5da64c9
Merge pull request #859 from Mogztter/patch-1
...
Update installation procedure for AsciiDoc
2014-09-22 13:49:05 +02:00
Guillaume Grossetie
8466425836
Adds headers to the AsciiDoc editor
2014-09-18 20:03:35 +02:00
Guillaume Grossetie
b774ee5cd0
Use Asciidoctor 1.5.0 new syntax backtick
...
Asciidoctor 1.5.0 is now using backtick for inline code.
Replaces ASCIIDoc by AsciiDoc to respect the case.
2014-09-18 19:50:54 +02:00
Guillaume Grossetie
7e2e0e926b
Update README.md
...
GitHub Markup is now using asciidoctor
2014-09-17 19:09:28 +02:00
Dawa Ometto
30f673c63c
Update README.md with installation instructions
2014-09-13 12:29:39 +02:00
Bart Kamphorst
bb5be728e3
Merge pull request #853 from joscarsson/patch-1
...
Update --allow-uploads help text in README
2014-09-09 17:19:12 +02:00
Jonas Oscarsson
0be5d1c657
Update --allow-uploads help text in README
2014-09-09 16:57:33 +02:00
Sunny Ripert
d143e6be06
Merge pull request #841 from marcusps/mathjax-cdn-fix
...
Fix MathJax CDN URL
2014-07-24 13:52:33 +02:00
Marcus P S
e65a78a5f5
Fix MathJax CDN URL
...
According to the [MathJax Blog](http://www.mathjax.org/changes-to-the-mathjax-cdn/ ), MathJax will retire the `rackcdn` CDN address at the end of this month. Updated the script to used the new CDN URL, and also made it so that the URL is HTTP/HTTPS agnostic, following the [MathJax docs](http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn ).
2014-07-23 11:46:22 -04:00
Dawa Ometto
4f443a3c62
Merge pull request #805 from MrJaeger/respect-dollar-signs
...
Allow for $ characters on front-end editor
2014-06-01 17:54:52 +02:00
bootstraponline
ff82ddea97
Add font awesome link
2014-04-05 14:38:34 -04:00
bootstraponline
2e2d3f5e87
Release 3.0.0
2014-04-05 14:25:55 -04:00
bootstraponline
491b1041f8
Add publish alias. Fix rake release
2014-04-05 14:25:39 -04:00
bootstraponline
ce192d33f7
Add mocha development dependency
2014-04-05 14:12:55 -04:00
bootstraponline
ca1cb64026
Use SVG badges
2014-04-05 13:55:52 -04:00
bootstraponline
71b5f5e469
Update gemspec dependencies
2014-04-05 13:35:11 -04:00
bootstraponline
946567f903
Merge pull request #817 from bootstraponline/test_fixes
...
Use FontAwesome for anchor links. Fix tests
2014-04-05 13:30:58 -04:00
bootstraponline
036e739511
Fix CSS to match github
2014-04-05 13:30:23 -04:00
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
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
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
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
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
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
bootstraponline
4e2856aa64
Update gollum-lib to 1.0.4
2013-07-20 19:24:26 -04:00
Abhijit Menon-Sen
4627a39165
Merge pull request #727 from amenonsen/no-live-preview
...
Disable live preview by default, because it's broken (closes #718 )
2013-07-18 05:39:48 -07:00
bootstraponline
c87cbe83d2
Fix #709
...
Require Ruby >= 1.9
2013-07-18 08:17:17 -04:00
bootstraponline
f05282badf
Drop 1.8.7 support on Travis (It's broken)
...
Don't email me on fail
2013-07-18 08:16:01 -04:00
Abhijit Menon-Sen
957879346e
Merge pull request #726 from amenonsen/fixes
...
Trivial fix: set label.for to the input's id
2013-07-17 18:53:37 -07:00
Abhijit Menon-Sen
87e64f67f3
A tiny patch to disable live preview ( #718 )
2013-07-17 14:24:36 +05:30
Abhijit Menon-Sen
43840d246d
Trivial fix: set label.for to the input's id
2013-07-17 13:31:46 +05:30
bootstraponline
4aeb9af8a7
Release 2.4.15
2013-06-18 22:19:34 -04:00
dekimsey
b37acb8bc6
Merge pull request #711 from cpence/master
...
Add support for file streaming
2013-06-18 19:15:57 -07:00
Charles Pence
433865e927
Require newer gollum-lib.
2013-06-18 22:10:02 -04:00
Charles Pence
5428161e0f
Add support for on-disk file streaming.
2013-06-18 21:49:38 -04:00
Jamie Oliver
db0b536b5b
Release 2.4.14
2013-06-15 17:20:48 +01:00
Jamie Oliver
a4e50908fb
Upgrade gollum-lib
2013-06-15 17:12:46 +01:00
bootstraponline
96b89fe83d
Add version badge
2013-05-31 22:05:23 -03:00
Jamie Oliver
adb131f131
Upgrade gollum-lib
2013-05-31 10:04:01 +01:00
bootstraponline
757ab87e8a
Fix shoulda version
...
Gem::InstallError: shoulda-matchers requires Ruby version >= 1.9.2
Gollum is stuck on 1.8 so use the old version of shoulda.
2013-05-27 16:16:17 -03:00
bootstraponline
f1d1db1159
Update useragent and shoulda
2013-05-27 16:07:24 -03:00
bootstraponline
3942bf60a6
Merge pull request #698 from ddeyoung/improve-page-create
...
Leaving off the leading slash in a page name with a subdirectory will corrupt the repository
2013-05-27 10:47:31 -07:00
Dustin DeYoung
e2c0dcc0da
Ruby 1.8.7 compatible double slash gsub
2013-05-26 16:14:56 -04:00
Dustin DeYoung
f63180d8d8
Correct 1.8.7 negative match assertion.
2013-05-26 11:16:43 -04:00
Dustin DeYoung
999bbf3d50
Regex is 1.8.7 compatible for subpage create tests
2013-05-26 11:10:50 -04:00
Dustin DeYoung
eab612bdd0
Remove temporary change in app test.
2013-05-26 11:03:40 -04:00
Dustin DeYoung
1147186b4c
Page create with a relative path forces an absolute path.
2013-05-26 10:03:23 -04:00
Sunny Ripert
a88314e061
Merge pull request #697 from bitmorse/master
...
Typo in page.mustache
2013-05-17 10:48:56 -07:00
Sam Sulaimanov
9221f5528d
Fix form tag typo in page template.
2013-05-17 18:23:50 +02:00
bootstraponline
520f60cd65
Merge pull request #693 from alecperkins/patch-1
...
Add bottom margin to hr elements
2013-05-08 15:00:55 -07:00
Alec Perkins
84c85774e8
Add bottom margin to hr elements
...
This gives some more consistent spacing.
2013-05-08 18:09:39 -03:00
bootstraponline
1f118deed9
Merge pull request #687 from DirtYiCE/gravatar-fix
...
Fix gravatar url generation
2013-04-13 14:04:20 -07:00
Kővágó, Zoltán
55ce07ae73
Fix gravatar url generation
2013-04-13 22:18:04 +02:00
Sunny Ripert
85677d5e91
README trimming to point to the wiki
...
-> gollum/gollum#1
2013-04-08 20:32:11 +03:00
Jamie Oliver
04f9be15b8
Upgrade minitest-reporters. Fixes #684
2013-04-08 07:24:05 +01:00
Jamie Oliver
09cd72a829
Add license to gemspec. Fixes #681
2013-04-05 17:57:17 +01:00
Jamie Oliver
f5f5ad70e3
Downgrade minitest-reporters. Temporary fix for #684
2013-04-05 16:03:20 +01:00
Jamie Oliver
a0774b320a
Update useragent
2013-04-05 15:00:41 +01:00
bootstraponline
4feea6051a
Release 2.4.13
2013-04-03 19:28:29 -04:00
dekimsey
f548ea757b
Merge pull request #682 from dekimsey/missing-buttons
...
Fix missing new/rename buttons
2013-04-03 08:21:12 -07:00
Daniel Kimsey
abc8ea5280
Fix missing new/rename buttons
2013-04-03 10:41:36 -04:00
bootstraponline
bacd2313fb
Release 2.4.12
2013-04-02 19:56:01 -04:00
bootstraponline
63295d3f9b
Update gollum lib
2013-04-02 20:55:12 -03:00
Daniel Kimsey
9c25eb20cf
Add a title attr to show full date on history log
2013-04-01 15:53:08 -04:00
bootstraponline
7f533f33ae
Merge pull request #677 from uk-ar/fix-dependancy
...
Fix library dependancy issue when running with config.ru
2013-03-29 15:39:35 -07:00
uk-ar
352b4e1ed8
Fix NoMethodError when running with sample config.ru
2013-03-30 05:59:36 +09:00
Sunny Ripert
9a4252b579
Merge pull request #676 from crisman/master
...
Class duplication issues in frontend
2013-03-28 01:37:10 -07:00
Daniel Crisman
ed7011c229
Deduplicate button action-* class names
2013-03-27 14:23:28 -04:00
Daniel Crisman
4ddd6a5207
Merge duplicate class attributes (class="jaws")
2013-03-26 13:47:21 -04:00
bootstraponline
0a74c7cfd2
Merge pull request #675 from uk-ar/fix-error-in-irb
...
Fix error when running with --irb option
2013-03-25 18:18:21 -07:00
uk-ar
d84fdc7599
Fix error when running with --irb option
...
uninitialized constant Gollum::Wiki (NameError)
2013-03-26 04:49:29 +09:00
uk-ar
dac1268266
Update the example of config.ru in the README
2013-03-26 04:25:53 +09:00
bootstraponline
b42db1c7c1
Fix #668
2013-03-22 22:07:57 -03:00
bootstraponline
7a7a27c5c7
Merge pull request #672 from bootstraponline/master
...
Try removing dependencies
2013-03-22 18:06:25 -07:00
bootstraponline
af83186b10
Try removing deps
2013-03-22 21:03:05 -04:00
bootstraponline
a8646f8fe7
Update shoulda
2013-03-22 20:59:40 -03:00
bootstraponline
01c1e30284
Use latest sinatra
2013-03-22 20:49:40 -03:00
bootstraponline
b3980f9e39
Merge pull request #669 from gollum/sinatra1.4
...
Upgrade to sinatra 1.4
2013-03-22 15:26:27 -07:00
Sunny Ripert
c9fd50d23e
Upgrade to sinatra 1.4
2013-03-22 13:45:08 +01:00
Sunny Ripert
ea3544f46d
Syntax highlighting in README
2013-03-22 13:18:30 +01:00
Sunny Ripert
4e04f5f540
README mention of gollum-lib and whitespace fixes
2013-03-22 12:27:20 +01:00
bootstraponline
b1021cf233
Update MathJax docs
2013-03-21 23:23:42 -03:00
bootstraponline
8fa3529123
Merge pull request #667 from cpence/master
...
Tweak TeX math delimiters
2013-03-21 19:13:34 -07:00
Charles Pence
3b494c235a
Tweak TeX math delimiters.
2013-03-21 22:09:01 -04:00
bootstraponline
1641c3e3e8
Update gemspec
2013-03-21 21:53:48 -04:00
bootstraponline
ccd5d850ac
Merge pull request #664 from jamieoliver/feature/gollum-lib
...
Move gollum back end to gollum-lib #647
2013-03-20 16:54:57 -07:00
Jamie Oliver
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
bootstraponline
54e144564c
Merge pull request #660 from simonista/fix-github-links
...
Fix for embedding code from github
2013-03-19 17:25:36 -07:00
bootstraponline
ab8599da6d
Update README.md
2013-03-19 21:11:41 -03:00
bootstraponline
0885702873
Update README.md
2013-03-19 21:10:22 -03:00
bootstraponline
0083bc9302
Merge pull request #661 from simonista/custom-js
...
Add option for custom js (like custom css)
2013-03-19 17:06:38 -07:00
Jamie Oliver
cbc0821928
Merge branch 'master' into feature/gollum-lib
...
Conflicts:
lib/gollum/markup.rb
2013-03-19 23:54:27 +00:00
bootstraponline
7a70169d06
Fix style
2013-03-19 19:35:54 -03:00
bootstraponline
bf2377ac11
Merge pull request #662 from lemonsqueeze/clearfloats
...
[[_]] float clearing tag experiment
2013-03-19 15:35:18 -07:00
Jamie Oliver
1f79126b27
Move gollum back end to gollum-lib #647
2013-03-19 22:11:09 +00:00
lemonsqueeze
624e324383
[[_]] float clearing tag experiment
2013-03-19 18:15:01 +01:00
Simon Williams
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
Simon Williams
e567759935
Fix for embedding code from github
2013-03-17 18:27:40 -06:00
bootstraponline
fe706c184e
Merge pull request #659 from cpence/master
...
Fix symlink base path, don't allow in bare repos
2013-03-16 20:39:00 -07:00
Charles Pence
90bbb8e348
Fix symlink base path, don't allow symlinks in bare repos.
2013-03-16 22:00:19 -04:00
bootstraponline
e21ec540c2
Merge pull request #658 from cpence/master
...
Basic support for symbolic links
2013-03-16 18:08:40 -07:00
Charles Pence
2a4517ced4
Add basic support for symbolic links.
2013-03-16 21:07:05 -04:00
bootstraponline
8c8d151b3e
Update README.md
2013-03-16 20:39:31 -03:00
bootstraponline
44a3cf1934
Merge pull request #652 from simonista/update-references
...
Update references to new project location
2013-03-15 15:04:33 -07:00
Jamie Oliver
5dcd3c8c8f
Merge pull request #651 from simonista/fix-specs
...
Fix tests that depended on old github location
2013-03-15 01:52:46 -07:00
Simon Williams
251bd7cd3d
Update references to new project location
...
* Change 'github/gollum' references to 'gollum/gollum'
2013-03-14 23:22:51 -06:00
Simon Williams
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
bootstraponline
544d499ab1
Merge pull request #646 from bootstraponline/master
...
Fix #645
2013-03-04 19:39:07 -08:00
bootstraponline
8ebc2f7079
Fix #645
2013-03-04 19:32:55 -05:00
bootstraponline
a31ba16070
Merge pull request #644 from dekimsey/empty-commit-612
...
Fix empty commits and non-descript revert messages (For #612 )
2013-03-04 15:31:46 -08:00
Daniel Kimsey
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
bootstraponline
f720a84831
Merge pull request #643 from mattr-/master
...
Update the GFM link in the README
2013-02-28 05:05:33 -08:00
Matt Rogers
b74b2c4399
Update the GFM link in the README
...
github.github.com/github-flavored-markdown shows a different version of
the page for a split second, and then redirects to
https://help.github.com/articles/github-flavored-markdown so let's just
point there directly.
2013-02-27 22:39:06 -06:00
bootstraponline
252aa10d75
Update gemspec
2013-02-26 19:25:58 -05:00
bootstraponline
6f3d362920
Update Gemfile
2013-02-26 19:25:11 -05:00
bootstraponline
9b54e4c79f
Update gollum.gemspec
2013-02-26 19:24:43 -05:00
bootstraponline
f908d0d170
Document how to run the tests
2013-02-26 19:22:44 -05:00
bootstraponline
852ecdd1a9
Update pygments.rb. Fixes #639
2013-02-26 18:57:34 -05:00
bootstraponline
78f5df5e56
Update org-ruby. Fixes #640
2013-02-26 18:25:00 -05:00
bootstraponline
580a61a515
Merge pull request #641 from jamieoliver/bug/new-page-subdirectory
...
Update working directory when creating new page in subdirectory
2013-02-26 15:16:47 -08:00
Jamie Oliver
4faf5a0150
Update working directory when creating new page in subdirectory
2013-02-26 22:43:27 +00:00
bootstraponline
1201d2434a
Merge pull request #637 from jamesdabbs/custom-markup
...
Allow registering custom markup engines
2013-02-25 19:59:18 -08:00
bootstraponline
e1ca392da6
Fix tests
...
0.4.1 and 0.4.2 break gollum's tests
2013-02-25 22:54:32 -05:00
bootstraponline
3ee6d22727
Fix tests
...
org-ruby 0.8.0+ break the tests
2013-02-25 22:48:46 -05:00
bootstraponline
28a0329f65
Notify me on build failure
2013-02-25 21:50:49 -05:00
bootstraponline
2dc696c940
Update pygments
2013-02-25 21:47:32 -05:00
James Dabbs
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
James Dabbs
62601f1adc
Add system for registering new page extensions / markup formats
2013-02-25 21:05:35 -05:00
bootstraponline
982915a22f
Fix #636
...
https://github.com/github/gollum/issues/636
2013-02-23 15:04:29 -05:00
bootstraponline
9f1bbd097f
Merge pull request #634 from jamieoliver/bug/new-rename-dialogs-redirect
...
Fix Create New Page and Rename Page dialogs redirect behaviour
2013-02-19 16:03:59 -08:00
bootstraponline
694bd6e74a
Update gollum.gemspec
2013-02-19 17:43:56 -05:00
Jamie Oliver
394cf0bc8e
Fix Create New Page and Rename Page dialogs redirect behaviour
2013-02-19 21:29:21 +00:00
bootstraponline
09257deaae
Merge pull request #632 from arr2036/master
...
Specify the sidebar side
2013-02-11 15:19:04 -08:00
Arran Cudbard-Bell
21c4b0dd95
Allow the sidebar side to be specified
2013-02-11 17:57:45 -05:00
bootstraponline
3b4662b583
Merge pull request #631 from arr2036/master
...
Fix redirects to index_pages for subdirs
2013-02-06 22:11:11 -08:00
Arran Cudbard-Bell
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
bootstraponline
631a7cccd6
Merge pull request #628 from arr2036/fix_titles
...
Fix page titles for non markdown formats
2013-02-04 15:47:17 -08:00
Arran Cudbard-Bell
2a3d51c7dc
Fix page titles for non markdown formats
2013-02-04 16:12:41 -05:00
bootstraponline
e7e8a17b61
Merge pull request #598 from dekimsey/new-page-in-current-directory
...
New page button now respects current directory
2013-01-30 14:57:07 -08:00
Daniel Kimsey
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
bootstraponline
443c453507
Apply font from #624
...
https://github.com/github/gollum/pull/624
2013-01-20 12:44:53 -05:00
bootstraponline
0495c89ba1
Update HISTORY.md
2013-01-10 18:46:24 -05:00
bootstraponline
78e4dfbece
Fix metadata tests
2013-01-08 17:09:21 -05:00
bootstraponline
1c7a481ed9
Release 2.4.11
2013-01-08 16:59:47 -05:00
bootstraponline
c3dedcbba5
Disable metadata
2013-01-08 16:58:21 -05:00
bootstraponline
1c767a0e9f
Release 2.4.10
2012-12-20 19:43:48 -07:00
bootstraponline
f3b0ba49e0
Fix #612
2012-12-20 19:41:28 -07:00
bootstraponline
31dfcbaa9e
Release 2.4.9
2012-12-20 19:30:04 -07:00
bootstraponline
8e11c5f46d
Fix create
2012-12-20 19:26:26 -07:00
bootstraponline
70793ff559
Release 2.4.8
2012-12-20 19:14:13 -07:00
bootstraponline
6621e71e6c
Fix home #491
2012-12-20 19:12:02 -07:00
bootstraponline
2af164ee9e
Release 2.4.7
2012-12-20 18:11:44 -07:00
bootstraponline
9227f0a195
Fix tests
...
File names do not have spaces.
2012-12-20 18:08:21 -07:00
bootstraponline
f18330b494
Fix #611
2012-12-20 18:02:26 -07:00
bootstraponline
bb32339ab4
Fix spaces in dir #611
2012-12-20 17:45:39 -07:00
bootstraponline
ddf4378dfe
More work on #491
...
@teohm pointed out that add_to_index in gollum/committer.rb already appends @wiki.page_file_dir
2012-12-18 20:07:24 -07:00
bootstraponline
2a607e209b
Fix #491
2012-12-18 19:01:43 -07:00
bootstraponline
a3d85ae8c3
Release 2.4.6
2012-12-18 18:30:17 -07:00
bootstraponline
fef62b63cb
ASCIIDOC tests don't run on Travis
...
Tests that use to be green now fail when rerun. The issue is with the travis configuration and asciidoc.
https://travis-ci.org/github/gollum/jobs/3603171
2012-12-18 18:25:41 -07:00
bootstraponline
93ec80f773
Fix #607
2012-12-18 17:41:57 -07:00
bootstraponline
8e3795c317
Update
2012-12-18 17:20:49 -07:00
bootstraponline
cb1a633dc5
Fix #607
2012-12-14 19:16:19 -07:00
bootstraponline
ace4db6938
Merge pull request #605 from dekimsey/pages-images-now-respect-baseurl
...
Fix /pages css to the correct path for images
2012-12-11 17:35:03 -08:00
Daniel Kimsey
b770062788
Fix /pages css to the correct path for images
2012-12-11 13:00:55 -05:00
bootstraponline
4c4dc5398a
Update 1.8 check
2012-12-10 18:41:01 -07:00
bootstraponline
091945152f
Release 2.4.5
2012-12-10 18:05:38 -07:00
bootstraponline
4838611273
Fix #602
2012-12-07 17:16:25 -07:00
bootstraponline
144f9959c9
Update test #602
2012-12-07 17:02:50 -07:00
bootstraponline
291c6a8fa0
Add test for #602
2012-12-07 16:49:00 -07:00
bootstraponline
d5d3581b78
Update gollum.gemspec
2012-12-06 18:17:41 -07:00
bootstraponline
64d90b027c
Merge pull request #597 from shanebdavis/master
...
altered CSS to more closely match github's markdown css
2012-12-03 16:49:37 -08:00
Shane Brinkman-Davis
a0e9989734
altered CSS to more closely match github's markdown css.
...
Main chaings:
Padding between LIs = 0px
Fixed page-width: 920px
H1, H2, H3: Margin-top: 20px; margin-bottom: 10px
2012-12-01 15:48:28 -08:00
bootstraponline
b81aa923d6
Fix KCODE warning on 1.9
2012-11-30 23:35:01 -07:00
bootstraponline
610925bc5a
Update Ace
...
https://github.com/ajaxorg/ace/commit/f887e6411222ed49683c477ca571460b99f8e59f
2012-11-30 23:34:55 -07:00
bootstraponline
86eda9bb10
Release 2.4.4
2012-11-30 17:28:53 -07:00
bootstraponline
ca06aa9a6f
Merge pull request #595 from jtietema/patch-1
...
Update lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
2012-11-30 16:11:47 -08:00
Jeroen Tietema
ca57d9e83d
Update lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
...
Adjusted the height of the preview window so that it doesn't flow
offscreen. (It was impossible to read the last lines...)
2012-11-30 22:20:36 +01:00
bootstraponline
904f975f0c
Fix comment
2012-11-30 00:02:24 -07:00
bootstraponline
9b9212cf4c
Remove needless conversion
...
The fix for page.rb resolved UTF-8 in headers.
2012-11-30 00:00:28 -07:00
bootstraponline
404419d1c3
Release 2.4.3
2012-11-29 23:57:15 -07:00
bootstraponline
4ee94a6574
Fix UTF-8 header and add test
2012-11-29 23:47:25 -07:00
bootstraponline
f929df0419
Update check_h1
2012-11-29 23:04:40 -07:00
bootstraponline
57587dafbe
Fix UTF-8 in headers
2012-11-29 22:05:29 -07:00
bootstraponline
31a95e81b3
Fix test name
2012-11-29 21:36:04 -07:00
bootstraponline
70a4e9551b
Improve h1 test
2012-11-29 21:27:45 -07:00
bootstraponline
e1a705f975
Fix UTF-8
...
to_html uses source document encoding by default. Set UTF-8.
Add note about KCODE warning.
2012-11-29 20:05:41 -07:00
bootstraponline
9057ec82d8
Release 2.4.2
2012-11-29 19:49:15 -07:00
bootstraponline
1b53e36666
Fix UTF-8
2012-11-29 16:58:47 -07:00
bootstraponline
10fa5c7bd2
Upgrade to stringex 1.5
2012-11-29 16:50:52 -07:00
bootstraponline
06e72a5a60
Release 2.4.1
2012-11-19 17:22:28 -07:00
bootstraponline
8fa62fc300
@css is set in before
2012-11-19 17:16:53 -07:00
bootstraponline
6c345fc508
Update dependencies
2012-11-19 17:14:52 -07:00
bootstraponline
a34eac4ecb
Merge pull request #592 from dekimsey/global-custom-css
...
Fixed custom.css to apply to all views
2012-11-19 16:11:53 -08:00
bootstraponline
10c121e603
Merge pull request #585 from dekimsey/gitcode-embed-any-file
...
Modified gitcode to allow syntax highlighting of arbitrary files
2012-11-19 16:11:21 -08:00
Daniel Kimsey
2b910167f4
Fixed custom.css to apply to all views
2012-11-19 13:21:39 -05:00
Daniel Kimsey
7d5311a075
Modified gitcode to allow syntax highlighting of arbitrary files
2012-11-19 12:59:45 -05:00
bootstraponline
f5581c4b49
Merge pull request #589 from shanebdavis/master
...
Fix #96
2012-11-18 19:25:05 -08:00
Shane Brinkman-Davis
e09f7cd49c
Proposed fix for https://github.com/github/gollum/issues/96
...
(statically hosted content in the images/ folder returns 404s)
(the problem was all content in javascript, css, and images folders was hard-coded to return 404s)
2012-11-18 09:53:27 -08:00
bootstraponline
4dab03b61b
Merge pull request #588 from sunnyone/fix_host_option
...
Pass the value of --host parameter to Rack::Server
2012-11-17 13:04:38 -08:00
Yoichi Imai
2b5e017aa1
Pass the value of --host parameter to Rack::Server
2012-11-17 19:42:28 +09:00
bootstraponline
8b3d944fd2
Fix #586
...
Place ASCIIDOC test behind ENV var
2012-11-16 19:08:45 -07:00
bootstraponline
2d886fd38a
Fix tests #587
2012-11-16 18:13:38 -07:00
bootstraponline
80088832b9
Fix #587
...
The default behavior prevented linking to header anchors. id_prefix
can still be set to 'wiki-' however it is no longer the default.
2012-11-16 17:45:56 -07:00
bootstraponline
be1883f317
Use HTTPS rubygems
...
Update gemspec
2012-11-16 17:07:38 -07:00
bootstraponline
30119e0c77
Fix tests
2012-11-16 17:03:18 -07:00
bootstraponline
c90c3b1544
Support git code syntax in live preview
...
Add autocrlf values for Windows, Linux, and OS X.
2012-11-16 16:57:39 -07:00
bootstraponline
578386f083
Add dir support to write_page
2012-11-16 16:43:43 -07:00
bootstraponline
3d21ed362e
Add history view test
2012-11-14 21:03:24 -07:00
bootstraponline
9cf469b035
Fix ruby bits #574
2012-11-14 00:45:28 -07:00
bootstraponline
462c93ae43
Fix crash #574
2012-11-13 23:12:22 -07:00
bootstraponline
bda3b7b24d
Fix --user-icons
2012-11-13 22:56:30 -07:00
bootstraponline
d861a22cdd
Fix line endings
2012-11-13 22:55:57 -07:00
bootstraponline
0de1a182da
Validate user_icons
2012-11-13 22:48:37 -07:00
bootstraponline
b030554348
Fix default
2012-11-13 22:43:05 -07:00
bootstraponline
858bfa9ccd
Merge pull request #574 from dekimsey/local-gravatar-identicons
...
Extendable user-icons with optional identicon js library.
2012-11-13 21:42:15 -08:00
Daniel Kimsey
ee8ec78da7
Add --user-icons option: none, gravatar, and identicon.
2012-11-13 21:17:23 -05:00
bootstraponline
c8f684895c
Merge pull request #581 from dekimsey/log-opt-author
...
Changed history date to use authored date instead.
2012-11-13 16:54:14 -08:00
bootstraponline
138a155ba4
Merge pull request #582 from dekimsey/set-focus-buttons
...
On window popup, focus the first text-field, if any.
2012-11-13 16:53:34 -08:00
Daniel Kimsey
ad749bf345
On window popup, focus the first text-field, if any.
2012-11-13 17:25:36 -05:00
Daniel Kimsey
ff0d59c16b
Changed history date to use authored date instead.
2012-11-13 15:02:55 -05:00
bootstraponline
df75d2d60c
Release 2.4.0
2012-11-11 15:08:45 -07:00
bootstraponline
2713aabeaf
Update gemspec
2012-11-11 15:08:21 -07:00
bootstraponline
796d1b44c2
Update README.md
2012-11-11 14:46:58 -07:00
bootstraponline
470a7b8f52
Fix #579
2012-11-11 14:40:47 -07:00
bootstraponline
f699b82a9f
Fix #539
2012-11-11 14:18:14 -07:00
bootstraponline
44edb8c7da
Merge pull request #576 from roman-zaharenkov/title_control
...
Page title control
2012-11-11 12:29:37 -08:00
bootstraponline
bc4fc0edd9
Fix gitcode test
2012-11-11 13:14:25 -07:00
Roman Zaharenkov
6545fa691b
Adjust page header / title generation.
...
Now page header can be generated by first h1 header from page content. But page title generated by URL is it was before.
2012-11-11 13:22:10 +03:00
Roman Zaharenkov
4954553927
Page title control
...
Allow to set page title by setting header inside page body. It will use header as title If header is present and page URL otherwise.
2012-11-11 13:20:14 +03:00
bootstraponline
9c50ba9eeb
XSLT was never used
2012-11-10 17:02:27 -07:00
bootstraponline
9a67da145a
Merge pull request #578 from github/fileview-hover-fix
...
Fileview hover fix
2012-11-10 15:59:28 -08:00
bootstraponline
ca7d82278c
Pretty print with nokogiri
2012-11-10 16:34:37 -07:00
bootstraponline
f6245c53dd
Add .gitattributes
2012-11-10 12:15:20 -07:00
bootstraponline
6888420cc6
Update file_view output
2012-11-10 12:15:19 -07:00
Daniel Kimsey
c5631f5b7d
Fixed a:hover not highlighting the a block correctly
2012-11-10 12:15:19 -07:00
Daniel Kimsey
34e0b49d72
Refactored the template generator to use new_page method
2012-11-10 12:15:19 -07:00
Daniel Kimsey
bd072264ef
Line-ending fix for _styles.css
2012-11-10 12:15:19 -07:00
bootstraponline
cfb2d24c71
Merge pull request #577 from dekimsey/fix-page-metadata
...
Renamed page.meta_data => page.metadata
2012-11-09 18:03:12 -08:00
Daniel Kimsey
fe0eb72fa3
Renamed page.meta_data to page.metadata for consistency with views
2012-11-09 18:29:49 -05:00
Daniel Kimsey
2783257f06
Added page.meta_data to tests
2012-11-09 18:25:33 -05:00
bootstraponline
cc11cb866c
Add css note
...
#572
2012-11-08 18:51:57 -07:00
bootstraponline
6a02643bda
Merge pull request #573 from dekimsey/license-guidelines
...
Added bootstraponline's comment about licensing guidelines
2012-11-08 16:12:40 -08:00
Daniel Kimsey
7f269c8da3
Added bootstraponline's comment about licensing guidelines
2012-11-08 16:46:49 -05:00
bootstraponline
ef7f7cebd1
Release 2.3.12
2012-11-07 20:37:50 -07:00
bootstraponline
05c24fd5e3
Fix #570
...
Fix #571
2012-11-07 20:35:57 -07:00
bootstraponline
b08b97bd28
Release 2.3.11
2012-11-07 20:18:43 -07:00
bootstraponline
dbb6ce2f71
Fix #570
...
Error in gollum.js broke new page button.
2012-11-07 20:17:50 -07:00
bootstraponline
f66f14b593
Release 2.3.10
2012-11-07 19:47:09 -07:00
bootstraponline
8a52315dee
Add base url to custom css
2012-11-07 19:46:27 -07:00
bootstraponline
7c4052906c
Add custom css
2012-11-07 19:40:52 -07:00
bootstraponline
3a56f39f6a
Fix readme
2012-11-07 19:17:49 -07:00
bootstraponline
6585ca5dd0
Fix space
2012-11-07 19:13:57 -07:00
bootstraponline
792abae07e
Release 2.3.9
2012-11-07 19:11:04 -07:00
bootstraponline
74ce648c59
Options.fetch
2012-11-07 19:04:36 -07:00
bootstraponline
2686e96046
Release 2.3.8
2012-11-07 18:50:37 -07:00
bootstraponline
213e2bb432
Add config example
2012-11-07 18:48:07 -07:00
bootstraponline
79bb5c10ab
Remove lib.so note
2012-11-07 18:46:36 -07:00
bootstraponline
7ea012d786
Fix code style
2012-11-07 18:45:20 -07:00
bootstraponline
43591f75de
Merge pull request #570 from dekimsey/only-alert-on-changes
...
Only alert on changes
2012-11-07 17:39:30 -08:00
Daniel Kimsey
05d82c0569
Attach unsaved changes warning to trigger only after changes are made
2012-11-07 17:51:36 -05:00
Daniel Kimsey
76c8d3206c
Consolidated create and edit page's javascript into the global gollum.js
2012-11-07 17:50:12 -05:00
bootstraponline
00751d05b4
Release 2.3.7
2012-11-06 18:27:05 -07:00
bootstraponline
b5be5df11a
Fix test name
2012-11-06 18:26:49 -07:00
bootstraponline
7d159273fc
Merge pull request #569 from dekimsey/issue-568
...
Fixed #568 , triple tilde without language causes Gollum to crash
2012-11-06 17:11:08 -08:00
Daniel Kimsey
70127922ab
Added test for #568
2012-11-06 15:49:47 -05:00
Daniel Kimsey
b95df93775
Fixes #568 , triple-tilde without language causes crash
2012-11-06 15:39:39 -05:00
bootstraponline
dc06edcf5b
Add x.y.z
2012-11-05 17:30:01 -07:00
bootstraponline
fdc437dcd5
Release 2.3.6
2012-11-05 17:28:51 -07:00
bootstraponline
f6873c9612
Merge pull request #566 from dekimsey/deterministic-search
...
Gollum search results now displayed in a deterministic order
2012-11-05 16:17:40 -08:00
Daniel Kimsey
93754ab32d
Sort by filename in addition to count
2012-11-05 18:01:50 -05:00
Daniel Kimsey
5759334635
Gollum search results are displayed in a deterministic order
2012-11-05 17:02:19 -05:00
bootstraponline
f2f543b72d
Release 2.3.5
2012-10-31 20:14:15 -06:00
bootstraponline
598b052be3
Fix clean
...
Duplicate slashes must be removed everywhere.
2012-10-31 20:11:23 -06:00
bootstraponline
a746062422
Merge pull request #564 from nikitug/patch-1
...
Update README to new Sequence diagram markup style
2012-10-31 19:09:45 -07:00
Nikita Afanasenko
c8868d369f
Update README to new Sequence diagram markup style
2012-10-31 18:02:28 +04:00
bootstraponline
52c6e7474c
Release 2.3.4
2012-10-28 20:59:06 -06:00
bootstraponline
be81f09b0e
Update gemspec
2012-10-28 12:43:51 -06:00
bootstraponline
6fa4504e31
Fix #551
2012-10-28 12:37:02 -06:00
bootstraponline
992ba01a12
Fix page file dir
2012-10-28 11:57:25 -06:00
bootstraponline
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
bootstraponline
919f41a0f1
Fix #559
2012-10-27 23:44:11 -06:00
bootstraponline
785921cb0f
Fix toc generation
2012-10-27 21:46:30 -06:00
bootstraponline
8c8cda5e7d
Fix comment
2012-10-27 21:05:56 -06:00
bootstraponline
64ef74e7e9
Add preview button to live preview
2012-10-27 20:52:54 -06:00
bootstraponline
776df4e6ee
Fix nokogiri rendering
...
https://github.com/sparklemotion/nokogiri/issues/782
2012-10-27 19:52:26 -06:00
bootstraponline
68465a8651
Set indent and encoding
2012-10-27 18:12:32 -06:00
bootstraponline
fa16c8960c
Fix #560
2012-10-27 17:58:14 -06:00
bootstraponline
2c57915781
Refactor fileview
2012-10-23 23:27:31 -06:00
bootstraponline
d0527f1aeb
Release 2.3.3
2012-10-23 22:58:41 -06:00
bootstraponline
75083c5b56
Fix collapse tree
2012-10-23 22:36:17 -06:00
bootstraponline
82526594db
Add attr reader for collapse tree
2012-10-23 22:22:56 -06:00
bootstraponline
941d39800c
Merge pull request #556 from adiknoth/fileview
...
Documentation and usability enhancement of recent fileview fix
2012-10-23 21:20:28 -07:00
bootstraponline
a1ae2e8bc0
Fix #554
2012-10-23 22:14:45 -06:00
bootstraponline
4af6f366ca
Fix show_all /pages
2012-10-23 22:09:27 -06:00
Adrian Knoth
c7a9534ed9
Add --collapse-tree command line option
2012-10-23 14:27:15 +02:00
Adrian Knoth
00bcbbf72b
File View: Add option to collapse file trees.
...
For potentially large repositories, starting with a collapsed tree may
be beneficial.
2012-10-23 14:27:12 +02:00
Adrian Knoth
ed2254ff9f
Add missing documentation for --show-all
2012-10-23 14:22:54 +02:00
bootstraponline
b6633f0ecb
Release 2.3.2
2012-10-22 19:21:10 -06:00
bootstraponline
e08d2d3052
Enable show_all for /pages
2012-10-22 19:10:40 -06:00
bootstraponline
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
bootstraponline
a9807bd1e1
Update math note
2012-10-21 17:22:31 -06:00
bootstraponline
554b80b39d
Add MathJax examples
2012-10-21 17:21:24 -06:00
bootstraponline
99e74bf00b
Release 2.3.1
2012-10-21 17:16:40 -06:00
bootstraponline
f48e923f28
Fix release
2012-10-21 17:15:09 -06:00
bootstraponline
5400b4bfdd
Support inline and display math.
...
$$2^2$$
$2^2$
\\(2^2\\)
[2^2]
2012-10-21 17:15:09 -06:00
bootstraponline
f68bebe0f6
Update math note
2012-10-21 16:26:35 -06:00
bootstraponline
4c6019b439
Update math note
2012-10-21 16:23:58 -06:00
bootstraponline
66e08a6b17
Release 2.3.0
2012-10-21 16:19:05 -06:00
bootstraponline
7898db70ed
Auto load all MathJax extensions
...
Fix #549
2012-10-21 16:14:04 -06:00
bootstraponline
7c357116ff
Remove TeX
...
As discussed with @vmg
MathJax is available via a flag for those self hosting gollum
2012-10-18 23:36:05 -06:00
bootstraponline
69ce0eb0d0
Update rake
2012-10-17 21:04:20 -06:00
bootstraponline
4db31a297b
Update rake
...
Jekyll uses rake ~> 0.9
2012-10-17 21:03:29 -06:00
bootstraponline
e1fca457e4
Restore gemnasium
...
Gemnasium fixed the missing pygments.rb issue.
https://github.com/laserlemon/gemnasium-parser/commit/c9b3e43c3021967d5c1bb115e7dd1555e01c6444
2012-10-17 20:54:01 -06:00
bootstraponline
7f8485ce80
Improve system requirements language
2012-10-16 22:31:25 -06:00
bootstraponline
290061fd11
Add system requirements to readme
2012-10-16 22:15:26 -06:00
bootstraponline
a507836936
Update dependencies
2012-10-16 21:39:22 -06:00
bootstraponline
6524d20a96
Use pygments.rb 0.3.2
2012-10-16 21:36:37 -06:00
bootstraponline
f1c523aa30
Release 2.2.9
2012-10-14 22:26:17 -06:00
bootstraponline
87c08f5613
Escape " in headers
2012-10-14 22:21:00 -06:00
bootstraponline
82913cea20
Improve base path note
2012-10-14 21:42:25 -06:00
bootstraponline
2ad743e4bd
Release 2.2.8
2012-10-14 21:28:43 -06:00
bootstraponline
fa97b57a96
Define default map as suggested on #460
...
Base path now sets a default map without having to use an external config.ru.
2012-10-14 20:57:27 -06:00
bootstraponline
1b952b6d56
Release 2.2.7
2012-10-14 17:24:33 -06:00
bootstraponline
90cc512bd1
Fix home loop with page-file-dir #491
2012-10-14 15:45:26 -06:00
bootstraponline
b82556c9c0
Fix #460
2012-10-14 15:42:06 -06:00
bootstraponline
fbe3b4bb3b
Fix #460
2012-10-14 15:23:52 -06:00
bootstraponline
5ffd98ad31
Fix #491
2012-10-14 15:15:55 -06:00
bootstraponline
cb9dd4d228
Fix formatting
2012-10-14 14:31:40 -06:00
bootstraponline
cd823bf10c
Add doc from wiki.rb
2012-10-14 14:31:00 -06:00
bootstraponline
5560ec52c2
Add base_path doc
2012-10-14 14:27:08 -06:00
bootstraponline
065151a77f
Add base_path disclaimer
2012-10-14 14:25:27 -06:00
bootstraponline
23454f556c
Release 2.2.6
2012-10-14 13:14:08 -06:00
bootstraponline
a2b3ddf931
Update tests to XHTML
2012-10-14 13:07:18 -06:00
bootstraponline
44b0d2fcfc
Remove old comment
2012-10-14 12:26:23 -06:00
bootstraponline
aed4cc590a
Fix unicode characters
...
Fix #547
Update test
2012-10-14 12:21:31 -06:00
bootstraponline
72ee08b5ab
Release 2.2.5
2012-10-14 11:21:56 -06:00
bootstraponline
45547624e4
Improve tilde fence support
...
More than 3 tildes can be used. The code block must end with the same amount of tildes used to open the code block.
Fix #537
http://johnmacfarlane.net/pandoc/README.html#delimited-code-blocks
2012-10-14 11:02:45 -06:00
bootstraponline
f928cfa8be
Don't ship Lorem ipsum in gem
2012-10-13 20:21:08 -06:00
bootstraponline
988984846a
Release 2.2.4
2012-10-13 20:01:57 -06:00
bootstraponline
1149618653
Fix #537
2012-10-13 19:53:41 -06:00
bootstraponline
168a033903
Remove old comment
2012-10-13 14:59:42 -06:00
bootstraponline
6a765c9791
Fix #537
2012-10-13 14:52:28 -06:00
bootstraponline
e16ae7b511
Travis is having a bad day
...
E: There are problems and -y was used without --force-yes
before_install: 'sudo apt-get install -y asciidoc' returned false.
Done. Build script exited with: 1
2012-10-13 14:07:15 -06:00
bootstraponline
174334ea44
Remove comment
2012-10-13 13:58:56 -06:00
bootstraponline
dbdf06930d
Fix
2012-10-13 13:55:20 -06:00
bootstraponline
c93e65ddc3
Merge branch 'master' of github.com:github/gollum
2012-10-13 13:32:19 -06:00
bootstraponline
56101ed264
Fix #535 and add test
2012-10-13 13:32:08 -06:00
bootstraponline
8269c8e574
TOC doesn't require '
2012-10-13 13:11:31 -06:00
bootstraponline
2246419d1e
Fix spacing
2012-10-13 13:09:20 -06:00
bootstraponline
118a0c318b
Update comment
2012-10-13 13:06:15 -06:00
bootstraponline
5401cf2910
Fix #542
2012-10-13 13:04:51 -06:00
bootstraponline
432f9b8d2f
Add test for #542
2012-10-13 12:57:58 -06:00
bootstraponline
66fc8a2d31
Revert "Fix #542 "
...
This reverts commit 2f3dd3d227 .
2012-10-13 12:55:43 -06:00
bootstraponline
2f3dd3d227
Fix #542
...
Page link may contain duplicate starting forward slashes.
//page points to http://page/ when what we want is
/page pointing to http://localhost:1234/page
2012-10-13 09:53:25 -06:00
bootstraponline
c43fd9fa6c
Update language comment
2012-10-12 21:19:24 -06:00
bootstraponline
868518e0f5
Bash is Ace mode sh
2012-10-12 20:58:05 -06:00
bootstraponline
039b5cce98
Try to fix Travis
...
FFI is no longer used in the new pygments.rb.
apt-get update may resolve the asciidoc install failure.
2012-10-12 20:24:31 -06:00
bootstraponline
4a421842d5
https://github.com/travis-ci/travis-ci/issues/725
...
Modified README to trigger a Travis CI build. It's currently broken.
2012-10-12 20:22:10 -06:00
bootstraponline
cfbb124f81
Update README.md
2012-10-12 20:16:43 -06:00
bootstraponline
dcb147cde2
Ensure declaredLanguage is lower case
2012-10-10 20:20:33 -06:00
bootstraponline
8d06b5e67e
Fix pygments language to Ace mode translation
2012-10-10 20:16:04 -06:00
bootstraponline
4776d0b422
Use rake release in readme
2012-10-10 19:45:42 -06:00
bootstraponline
58bb340c33
Release 2.2.3
2012-10-10 19:43:30 -06:00
bootstraponline
ee790a9b7c
Add rake bump to readme
2012-10-10 19:38:53 -06:00
bootstraponline
ac432aad78
Add bump task to Rakefile
2012-10-10 19:35:04 -06:00
bootstraponline
30207e0a39
Merge pull request #533 from wrs/wrs_syntaxfixes
...
Two little syntax highlighting fixes
2012-10-10 16:56:37 -07:00
Walter Smith
d98547a33c
Fix lack of CoffeeScript livepreview
...
Pygments calls it coffeescript, but Ace calls it coffee.
2012-10-10 14:20:50 -07:00
Walter Smith
b7cdeabbf6
Catch all Pygments errors
...
An unrecognized language was generating a MentosError rather than a
PythonError. Just catch anything that goes wrong in Pygments.
2012-10-10 14:20:50 -07:00
bootstraponline
be9907a0cc
v2.2.2
2012-10-04 18:17:24 -06:00
bootstraponline
30f42c50a9
Fix #528
2012-10-04 17:18:47 -06:00
bootstraponline
7cba65b138
Gemnasium is not including all deps.
...
pygments.rb is missing for example. Will restore once Gemnasium has fixed the issue.
2012-10-01 23:50:35 -06:00
bootstraponline
f34a78b336
Proc.new instead of lambda.
2012-10-01 23:45:04 -06:00
bootstraponline
e1942dda03
Merge pull request #513 from bootstraponline/embed_code
...
Embed code. #508 .
2012-10-01 22:36:25 -07:00
bootstraponline
7142e284fa
.call instead of .() for 1.8.7
2012-10-01 23:29:15 -06:00
bootstraponline
3c1c588953
Restore wiki_factory.
2012-10-01 23:23:40 -06:00
bootstraponline
52cc6bae34
Update dependencies.
2012-09-29 13:50:11 -06:00
bootstraponline
955c608115
Update rake.
2012-09-29 13:40:02 -06:00
bootstraponline
2e00cf312c
Merge pull request #524 from osener/patch-1
...
Update org-ruby
2012-09-29 12:17:59 -07:00
Ozan Sener
09bbc144d1
Update org-ruby
...
Fixes #81
2012-09-29 11:19:09 +03:00
bootstraponline
d02b63a434
Fix test.
2012-09-26 00:08:11 -06:00
bootstraponline
9b63c67d8c
Try to fix tests.
2012-09-25 23:57:35 -06:00
bootstraponline
05c4bf3374
Add local file support.
...
Example of absolute path to local file.
```html:/home```
Example of relative path to local file.
```html:home```
1.8.7 string fix. 's'[0..0] instead of 's'[0]
Fix regex.
Add absolute and relative tests.
2012-09-25 23:31:58 -06:00
bootstraponline
424b4d3f4e
Remove debug statements.
2012-09-25 23:31:25 -06:00
bootstraponline
f9a6187fab
Fix undefined method `[]' for nil:NilClass
2012-09-25 23:31:08 -06:00
Henrik
d406472882
1.8.7 fixes
2012-09-25 23:29:11 -06:00
Henrik
749b5a5ff8
Adding functionality for fetching code from github
...
hack for 1.8.7
Don't miss test_markup's relative require
need some food now
2012-09-25 23:29:08 -06:00
bootstraponline
091d5fe750
Update multibyte caracters.
2012-09-25 22:58:07 -06:00
bootstraponline
c8894fb465
New pygments.rb works correctly.
...
The expected output from the tests differs only in newlines.
git diff makes it seem like everything changed. bzr qdiff has a better default diff. git doesn't do per char diffs.
Revert "New pygments has issues."
This reverts commit 2dd41cbfac .
2012-09-25 22:45:57 -06:00
bootstraponline
2dd41cbfac
New pygments has issues.
...
Revert "Update pygments. Solves #225 #490 #517 "
This reverts commit c0c77c5ba7 .
Revert "Fix pygments.rb tests."
This reverts commit 1f2165e68b .
2012-09-25 21:54:49 -06:00
bootstraponline
1f2165e68b
Fix pygments.rb tests.
2012-09-25 21:47:24 -06:00
bootstraponline
e9b6bdbdd7
Add dependency status.
2012-09-25 21:38:09 -06:00
bootstraponline
c0c77c5ba7
Update pygments. Solves #225 #490 #517
2012-09-25 21:36:37 -06:00
Corey Donohoe
12403172ac
Merge pull request #521 from Vanuan/update_nokogiri
...
Update nokogiri
2012-09-25 12:16:50 -07:00
John Yani
3b41ab8d75
Update nokogiri
2012-09-25 22:04:43 +03:00
bootstraponline
7bcf35f5b1
Fix #517 . Thanks @roa
2012-09-23 16:26:48 -06:00
bootstraponline
9a7e1c94c7
Merge pull request #515 from realmacsoftware/master
...
Populate author details using the session.
2012-09-16 10:32:33 -07:00
Keith Duncan
30c2e675da
Test that author details from the session are committed into the repository
2012-09-16 16:49:17 +01:00
Keith Duncan
ac405803e8
Add notes on providing author details to the Rack documentation section
2012-09-16 16:25:09 +01:00
Keith Duncan
7dee787a92
Add documentation for where the commit_message parameters are passed and where they're source from
2012-09-16 15:59:49 +01:00
Keith Duncan
ae4b1cdeca
Add support for author parameters coming in from the session, to be set by rack middleware further up the stack
2012-09-15 21:06:08 +01:00
bootstraponline
572982cbf9
Use a professional right left button.
2012-09-09 21:11:16 -06:00
bootstraponline
74290874f9
Fix #383 test.
2012-09-09 14:05:10 -06:00
bootstraponline
847f08d952
Use block form of gsub to avoid regexp backref interpolation
...
The content of this commit message is from @kislyuk's comments on the below two issues.
Fix #383
Fix #511
`gsub!(pattern, replacement) interpolates` regexp backreferences
`gsub!(pattern) do block` doesn't
http://stackoverflow.com/questions/2082457/ruby-gsub-problem-when-using-backreference-and-hashes
2012-09-09 12:22:56 -06:00
Neal Pisenti
0bcd616668
fix mathjax option, fixes #509
2012-09-09 11:50:48 -06:00
bootstraponline
9dd701ccc4
Grit is broken. #508 #356
2012-09-04 17:52:56 -06:00
bootstraponline
56a5a7d92b
Fix #507
2012-09-04 16:24:16 -06:00
bootstraponline
0cf0fad50e
Finish removing MathJax from Live Preview.
2012-09-02 15:27:32 -06:00
bootstraponline
5f9e91656e
Fix LaTeX tests.
2012-09-02 15:03:56 -06:00
Vicent Marti
a7a2479f85
Release 2.2.1
2012-09-02 22:43:50 +02:00
Vicent Marti
a8b230a490
Properly escape TeX data.
2012-09-02 22:27:04 +02:00
bootstraponline
041b01f171
Fix #490
2012-09-01 12:33:08 -06:00
Vicent Marti
1c475f3215
Release 2.2.0
2012-09-01 12:24:17 +02:00
Vicent Marti
ab699d94b0
Do not render LaTeX locally
...
Offload the rendering service to MathTran.org, the free and open-source
LaTeX rendering engine.
2012-09-01 12:23:02 +02:00
bootstraponline
942d32c9b6
Fix uninstall command
2012-08-30 21:36:11 -06:00
bootstraponline
97f15f0b18
Add edit hotkey. #496
2012-08-30 21:07:57 -06:00
bootstraponline
ed49358c50
Add h1-3 shortcuts. #496
2012-08-30 20:54:20 -06:00
bootstraponline
85eeecd140
Add save hotkey.
2012-08-30 20:48:44 -06:00
bootstraponline
30fd40fbe5
Fix #498
...
Ruby 1.8.7 and ri can't deal with <!-- appearing in documentation.
Please upgrade to the latest Ruby if you're able to.
2012-08-30 20:29:53 -06:00
bootstraponline
2ed262cacd
v2.1.9
2012-08-30 20:12:28 -06:00
bootstraponline
29a1ef8f8a
Skip doc on install
2012-08-30 20:04:20 -06:00
bootstraponline
772d18ee62
Fix uninstall command
2012-08-30 20:00:54 -06:00
bootstraponline
dd604d9942
Fix #498
2012-08-30 19:57:20 -06:00
bootstraponline
85abc83427
v2.1.8
2012-08-30 19:41:54 -06:00
bootstraponline
6d8220629c
Fix #500
2012-08-30 19:37:57 -06:00
bootstraponline
6ff7ada096
Fix #495
2012-08-30 18:31:35 -03:00
bootstraponline
8575049de5
Update get /data
...
Remove leading slash from page
Fix edge case with path set to '/'
2012-08-30 11:40:07 -03:00
bootstraponline
bb6fb0c253
pathName is undefined when not found instead of 0
2012-08-30 11:18:02 -03:00
bootstraponline
eb2ad9f840
Fix path
...
.key now returns undefined on failure so path can be 0.
If path is undefined then use an empty string.
2012-08-30 11:14:24 -03:00
bootstraponline
d0dd23fc11
Fix path
2012-08-30 11:09:44 -03:00
bootstraponline
7ae4acbdb0
Fix #497 #492
...
Data url now includes path.
2012-08-30 11:03:11 -03:00
bootstraponline
881590ab37
Merge pull request #494 from releu/fix-requiring-uri-encoding-components
...
Move require "uri_encode_component"
2012-08-28 18:33:18 -07:00
Jan Bernacki
5e479dc5d9
move require
2012-08-28 22:44:09 +04:00
bootstraponline
7db9c2e762
Merge pull request #487 from jm/master
...
Fix bug with missing variable 'ext'
2012-08-27 11:08:19 -07:00
bootstraponline
ce6b0ac095
v2.1.7
2012-08-25 19:21:13 -06:00
bootstraponline
420bb06988
Fix create test.
2012-08-25 18:58:20 -06:00
bootstraponline
20566f8acf
Fix #484
2012-08-25 18:54:07 -06:00
bootstraponline
1d5f69704a
Clean paths so they start with one slash.
2012-08-25 18:41:13 -06:00
bootstraponline
0da664299e
Fix edit.
2012-08-24 13:47:17 -06:00
bootstraponline
6e8fb2b457
Disable exact on edit for now.
2012-08-24 13:38:34 -06:00
bootstraponline
d1c72a4ff3
Fix #483 and #481
...
Exact matching of requested pages
- /page is no longer the same as /a/page
- Deleting /page only deletes /page (before it would delete /a/page instead of /page)
- Edit currently breaks the unit tests if exact matching is enabled
- Fix redirect on create
- Add @giga's checked_dir = '' fix https://github.com/giga/gollum/commit/936958b47324a09c683cb90a2560484b47e09529
- Fix create unit test
2012-08-24 13:35:37 -06:00
bootstraponline
0bf05392e4
Redirect to correct path. #481
2012-08-24 12:26:59 -06:00
bootstraponline
7ecef0c045
Fix #479
2012-08-23 14:11:28 -06:00
bootstraponline
33ca329253
Handle nil slash.
2012-08-23 12:30:08 -06:00
bootstraponline
01fa4770cb
Fix page lookup. #473
2012-08-23 12:16:40 -06:00
bootstraponline
b76257c49c
Restore foward slash.
2012-08-23 11:59:56 -06:00
bootstraponline
e2fbf22f38
Fix #473 .
2012-08-23 11:51:20 -06:00
bootstraponline
134432d029
v2.1.6
2012-08-23 11:33:00 -06:00
bootstraponline
8d4d6e80b8
Fix #475 .
2012-08-23 11:27:40 -06:00
bootstraponline
85e6ef3dca
v2.1.5
2012-08-22 19:57:22 -06:00
bootstraponline
60f1467229
Fix encoding for 1.8.
2012-08-22 18:51:41 -06:00
bootstraponline
1757242382
Don't unpack Fixnum.
2012-08-22 17:40:53 -06:00
bootstraponline
55df7bb9c4
Use encodeURIComponent instead of CGI::escape when output is sent to browser.
2012-08-22 17:30:46 -06:00
bootstraponline
686b8acd38
Fix encodeURIComponent on Ruby 1.8.
...
Replace .ord with .unpack('U')[0]
2012-08-22 17:23:08 -06:00
bootstraponline
a5f9df6170
Restore CGI::escape.
2012-08-22 16:57:24 -06:00
bootstraponline
27f61a870a
Merge pull request #477 from LuminosoInsight/master
...
Fix titles created with the "New" button.
2012-08-22 15:54:23 -07:00
bootstraponline
a48e8d1c5c
New editor style.
...
Disable MathJax in live preview. Parser isn't MathJax aware.
Performance of MathJax in live preview is not great.
Auto hide editor overflow.
2012-08-22 16:50:57 -06:00
bootstraponline
b80f74bccd
Remove protocol and host.
2012-08-22 13:32:18 -06:00
bootstraponline
1e768734ef
Disable MathJax by default.
...
GitHub.com doesn't support MathJax. The parser is not MathJax aware which causes problems.
--mathjax enables MathJax.
2012-08-22 13:31:21 -06:00
bootstraponline
11c9cabeb3
Fix edit baseUrl.
2012-08-22 13:21:01 -06:00
bootstraponline
3a14ab92f0
Fix new page when using map '/wiki' in config.ru.
2012-08-22 13:15:18 -06:00
bootstraponline
62d5f52398
Fix anchor for Firefox.
2012-08-22 13:10:11 -06:00
Rob Speer
2b4848566c
Fix names created with the 'New' button.
...
Previously, a page created with the 'New' button would get all of its
spaces turned into the + symbol when submitted, which Gollum would then
convert into "-plus-" in the title. So, for example, a request to create
a page called "Test page" would instead get "test plus page".
This change changes + to - in the parameter received by /create/.
2012-08-22 14:15:20 -04:00
bootstraponline
7c825e877c
Remove protocol + host.
2012-08-20 15:51:07 -06:00
bootstraponline
8417c277e6
Fix delete link when using baseUrl.
2012-08-20 15:23:07 -06:00
bootstraponline
9cef423908
Remove default value in new page.
2012-08-19 14:25:02 -06:00
bootstraponline
e73c84490e
Remove prefix. #470 .
2012-08-16 12:01:03 -06:00
bootstraponline
6cfc807db0
Revert still broken in Grit.
2012-08-15 12:22:03 -06:00
bootstraponline
be366f8103
v2.1.4
2012-08-15 12:06:12 -06:00
bootstraponline
2d13bd796f
Improve #470 fix.
2012-08-15 12:03:48 -06:00
bootstraponline
523f8f80ca
Fix #470 .
2012-08-15 11:48:17 -06:00
bootstraponline
b76fef9143
Update version to 2.1.3
2012-08-13 11:37:56 -06:00
bootstraponline
e935af83d5
Update gemspec.
2012-08-13 11:35:15 -06:00
bootstraponline
d4e019ef42
Merge pull request #331 from tjh/home-page-link-issue
...
Redirect from root to /Home, fixes #250
2012-08-09 10:41:31 -07:00
bootstraponline
2e738828c6
Merge pull request #467 from jamesduncombe/pygments_initialize
...
Added Pygments.start to initialize Pygments on startup, fixes #465
2012-08-09 10:21:59 -07:00
James Duncombe
fd7dc93778
Added Pygments.start to initialize Pygments on startup
2012-08-09 09:14:55 +01:00
bootstraponline
3df407d9ee
Merge pull request #464 from giga/master
...
Fix editor when base url is '/'
2012-08-08 10:53:45 -07:00
Jean-Philippe Garcia Ballester
6fbba84725
Revert "Base path is relative."
...
This reverts commit 69e453ea0b .
2012-08-08 13:49:11 +02:00
Jean-Philippe Garcia Ballester
37d20fa9cc
Base url without trailing '/'
...
This will allow cleaner url in templates and javascripts.
2012-08-08 13:49:09 +02:00
bootstraponline
410cd912ac
Fix releasing.
2012-08-06 18:31:36 -06:00
bootstraponline
d234bbd861
Test get %r{/(.+?)/([0-9a-f]{40})} do
2012-08-06 18:27:12 -06:00
Corey Donohoe
3f68d96815
setup proper gem version numbers
2012-08-06 16:32:16 -07:00
bootstraponline
015cd895d2
Don't ignore version.
2012-08-06 17:18:30 -06:00
bootstraponline
5fa4b48d85
Fix new page default dir.
2012-08-06 15:57:46 -06:00
bootstraponline
88a3783bbc
Remove wpage.
2012-08-06 15:55:05 -06:00
bootstraponline
ea2254b9bd
Fix #462 .
...
Add test for 462.
2012-08-06 15:52:19 -06:00
bootstraponline
9a0c1f2605
Fix path.
2012-08-06 15:18:15 -06:00
bootstraponline
008f26bb7d
Fix app.
2012-08-06 14:49:56 -06:00
bootstraponline
69e453ea0b
Base path is relative.
2012-08-06 14:28:24 -06:00
bootstraponline
88b0b608f4
Add null guard.
2012-08-06 13:49:48 -06:00
bootstraponline
19e3987ae3
Fix path escaping.
2012-08-06 13:36:28 -06:00
bootstraponline
c72e91ddaf
Fix #462 .
2012-08-06 13:16:31 -06:00
bootstraponline
c789dd5067
Update org-ruby.
2012-08-02 19:45:06 -06:00
bootstraponline
551949de29
Fix #459 .
2012-08-02 16:55:24 -06:00
bootstraponline
80730ee87a
Merge pull request #419 from trans/metadata
...
Add support for embedded page metadata.
2012-08-01 16:05:10 -07:00
trans
71028adc9e
Add support for embedded page metadata.
2012-08-01 18:35:53 -04:00
bootstraponline
a2efebc06c
Fix #453 .
2012-08-01 13:04:04 -06:00
bootstraponline
a4e277a86b
Update gemspec.
2012-08-01 10:20:53 -06:00
bootstraponline
494c80d8b1
Add home button.
2012-08-01 01:53:30 -06:00
bootstraponline
02539bfdd3
Move new page dir logic to JS.
2012-08-01 01:49:38 -06:00
bootstraponline
a0f05eaf67
More refactoring.
...
Fix delete.
2012-08-01 01:36:23 -06:00
bootstraponline
72e26fc90b
Refactor app.rb to use paged.
...
Create new pages relative to current directory.
2012-08-01 00:37:34 -06:00
bootstraponline
2261cfabf3
Make wiki.page directory aware.
...
Remove scoped_page.
2012-07-31 23:24:37 -06:00
bootstraponline
c1afa2a0e3
Path is now sent on rename.
2012-07-31 22:13:04 -06:00
bootstraponline
d28f454c6e
Send path when renaming pages.
...
Fix nil error on editing a non-existent page.
Use baseURL on delete.
2012-07-31 21:58:35 -06:00
bootstraponline
f471c80ac0
Merge pull request #455 from ennova/scoped-page
...
Add a method that returns a given page name scoped to a directory.
2012-07-31 20:18:38 -07:00
Odin Dutton and Sebastian Korfmann
be086d94b5
Add a method that returns a given page name scoped to a directory.
...
This is to allow access to non unique pages.
2012-08-01 09:15:25 +10:00
bootstraponline
ff719510b6
Merge pull request #454 from kislyuk/master
...
Don't stop highlighting if one code block throws an exception.
2012-07-31 11:13:58 -07:00
Andrey Kislyuk
7b16116b67
Proceed with highlighting if one code block fails
2012-07-31 08:44:38 -07:00
bootstraponline
8422b71204
@arr2036's fix for #453 .
2012-07-30 19:04:10 -06:00
bootstraponline
c9bc2a89f6
Delete link now works with directories.
...
Fix #452 .
2012-07-27 15:03:26 -06:00
bootstraponline
387a52a7ba
Remove extra / in delete href.
2012-07-27 14:54:34 -06:00
bootstraponline
96842d9742
Refactor page url generation.
...
Avoid appending './' to urls.
2012-07-27 14:45:40 -06:00
bootstraponline
8fcef5401b
Fix href in file view.
2012-07-27 12:27:16 -06:00
bootstraponline
804c4c678d
Fix #446 .
...
The old regex turns 'a/b/c/' into 'a/' which is not correct.
The new regex is directory aware.
2012-07-27 12:14:06 -06:00
bootstraponline
8558777ece
Include full path in file view href.
2012-07-27 11:34:04 -06:00
bootstraponline
77bb608878
Fix #446 .
2012-07-27 11:08:11 -06:00
bootstraponline
2f574261a7
Merge pull request #359 from sunny/base-url
...
Relative urls.
2012-07-25 09:55:26 -07:00
Sunny Ripert
28c4a2c39e
Merge pull request #2 from giga/base-url
...
Fix relative url
2012-07-25 07:59:01 -07:00
Jean-Philippe Garcia Ballester
bd36cb59b1
Fix relative url
2012-07-25 12:33:48 +02:00
Jean-Philippe Garcia Ballester
998358ada8
Fix relative url
2012-07-25 12:27:00 +02:00
Sunny Ripert
75a00e8821
baseUrl missing on page rename
2012-07-25 11:20:53 +02:00
Sunny Ripert
b5653464d2
Merge branch 'master' into base-url
...
Conflicts:
lib/gollum/frontend/public/gollum/css/_styles.css
lib/gollum/frontend/public/gollum/javascript/gollum.js
lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
lib/gollum/frontend/templates/file_view.mustache
lib/gollum/frontend/templates/layout.mustache
lib/gollum/frontend/templates/page.mustache
2012-07-25 10:00:52 +02:00
Sunny Ripert
0269cd0b3b
Merge pull request #1 from giga/base-url
...
Base url
2012-07-25 00:49:18 -07:00
Jean-Philippe Garcia Ballester
88ed662fd4
Fix editor to work with “base_url”
2012-07-24 23:51:49 +02:00
Jean-Philippe Garcia Ballester
7c180c86a4
Set wiki “base_path” option to fix “base_url”
...
If the “base_path” option of the wiki is not set, set it to the base url.
It will make links work seamlessly when mounting to a relative url.
2012-07-24 23:46:22 +02:00
bootstraponline
f811ac510e
Improve names. Fix #447 .
2012-07-22 21:04:02 -06:00
bootstraponline
3e5054f357
Call to_url on rename to prevent invalid renames.
...
Remove to_url on delete so invalid names can be deleted.
Handle nil in to_url.
Update tests.
2012-07-22 13:45:30 -06:00
bootstraponline
3424a424a7
Add /delete test.
2012-07-22 13:25:25 -06:00
bootstraponline
8eb8af8ef8
Use old name default text on rename.
2012-07-21 21:00:14 -06:00
bootstraponline
8eaf7fc497
Remove msg.
2012-07-21 16:57:20 -06:00
bootstraponline
3255709399
Don't mess with the commit message.
2012-07-21 16:52:18 -06:00
bootstraponline
2dbea36b81
Add rename button. Fix #444 .
2012-07-21 16:31:38 -06:00
bootstraponline
e0b7009bff
Add delete this Page based on .com.
...
Match short sha commit message of .com for edit and delete.
Update tests.
2012-07-21 15:33:43 -06:00
Vicent Marti
77fb5ec3cb
Fix parsing extra whitespace in code blocks
2012-07-21 15:34:56 +02:00
bootstraponline
7392bce5dc
Restore livepreview.
...
Improvements include:
- UTF-8 aware
- Undo and redo support
- Code highlighting fixes
- New tests ensure output matches native sundown
Use jquery 1.7.2
2012-07-18 18:11:19 -06:00
bootstraponline
8188bbd35d
Add mousetrap.
2012-07-18 18:03:26 -06:00
bootstraponline
80fdea7bfb
Fix #437 .
...
Add hotkey support using mousetrap.
2012-07-18 14:17:50 -06:00
bootstraponline
dc9f6ac709
Display to_url name on create.
2012-07-18 12:29:03 -06:00
bootstraponline
ba796bc23d
Comment out test. See #363 .
2012-07-18 10:35:53 -06:00
bootstraponline
e0ecb4c44f
Fix #435 .
2012-07-17 15:29:34 -06:00
bootstraponline
d4c05304e9
Fix #434 .
2012-07-17 15:22:37 -06:00
bootstraponline
ccdbd71517
Fix style.
2012-07-17 11:19:54 -06:00
bootstraponline
454fce09c6
Merge pull request #441 from haad/upstream-gollum-path
...
Add --gollum-path [PATH].
2012-07-17 10:15:32 -07:00
bootstraponline
be4b12b4c8
Use .times.
...
Fix style.
2012-07-17 11:12:59 -06:00
bootstraponline
9fa629de31
Use range instead of upto.
2012-07-17 11:01:52 -06:00
bootstraponline
78dd5774b3
Fix code style.
2012-07-17 10:55:57 -06:00
bootstraponline
bb9a9cd0db
Merge pull request #440 from haad/upstream
...
Add support for multi-level directory setups, where files are under mult...
2012-07-17 09:46:34 -07:00
Adam Hamsik
ab9d8fb3db
Add option to define gollum path from command line. This way we can use different git repo for wiki files and different repo for
...
gollum.
2012-07-17 15:25:55 +02:00
Adam Hamsik
6ce76af2be
Fix tests.
2012-07-17 12:00:42 +02:00
Adam Hamsik
3199a4b2cb
Remove debug puts.
2012-07-17 11:10:09 +02:00
Adam Hamsik
6a2d153c3d
Add support for multi-level directory setups, where files are under multiple directories.
...
Generate HTML for them properly.
2012-07-17 11:06:04 +02:00
bootstraponline
bfd4ad9255
Async loading of MathJax.
...
http://calendar.perfplanet.com/2011/the-art-and-craft-of-the-async-snippet/
2012-07-13 14:25:53 -06:00
bootstraponline
30224515fd
Update table style to match .com.
2012-07-13 14:11:10 -06:00
bootstraponline
d7f3acfd05
Disable live preview until a robust JavaScript based markdown parser is found.
2012-07-13 00:42:26 -06:00
bootstraponline
a9e9eeeb54
Another encoding fix from #387 .
2012-07-12 12:06:47 -06:00
bootstraponline
76fa52b313
Merge pull request #387 from arr2036/fix_encoding
...
Work around Grit encoding issues.
2012-07-12 11:03:19 -07:00
bootstraponline
67de8e6a3a
Fix to_url so it correctly handles _Header, _Footer, and _Sidebar.
2012-07-11 20:10:59 -06:00
bootstraponline
ff78998829
30px height.
2012-07-11 16:12:27 -06:00
bootstraponline
55786e2d29
Uninstall old gollum before installing the new gem.
2012-07-11 10:35:37 -06:00
bootstraponline
20534a71b9
Remove New Page from file view.
2012-07-11 10:23:01 -06:00
bootstraponline
316b6feccb
Write_page changes not yet merged.
2012-07-10 11:46:00 -06:00
bootstraponline
6c7417e0a2
Add transliteration test.
2012-07-10 11:40:36 -06:00
bootstraponline
af89dc881e
Merge pull request #424 from bootstraponline/unicode_to_ascii
...
Ensure page file names are ASCII.
2012-07-10 09:52:57 -07:00
bootstraponline
5714cef3de
Page names are no longer case sensitive.
2012-07-10 10:47:15 -06:00
bootstraponline
3d2c8e7cc5
ASCII only filenames.
...
Fix test_unicode.
2012-07-10 10:41:55 -06:00
bootstraponline
772ffcc5e8
Ensure ascii only filenames. Fix #423 .
2012-07-09 13:22:45 -06:00
bootstraponline
8c30bb3a9f
Merge pull request #422 from nature/sidebar_rendering_in_subfolders
...
Sidebar rendering in subfolders.
2012-07-09 09:19:11 -07:00
bootstraponline
89bc121d3f
Merge pull request #421 from nature/create_new_page_in_subdir
...
Make the 'New Page' button create pages in sub directories.
2012-07-09 09:15:42 -07:00
Darren Oakley
1cc9d7b647
Slight optimisations...
...
- only create a new GitAccess object if the wiki does not have a @page_file_dir directive
- memoize the new GitAccess object
2012-07-09 13:01:40 +01:00
Darren Oakley
50e494e8e9
Make pages inherit their sidebar/header/footer from parent directories regardless of the current 'page_file_dir' of the wiki. refs #413 ( https://github.com/github/gollum/issues/413 )
2012-07-09 12:10:41 +01:00
Darren Oakley
19325930a2
Add a new file and sub-directory - 'Rivendell/Elrond.md' so we can test Sidebar/Header/Footer inheritance from parent directory.
2012-07-09 11:50:08 +01:00
Darren Oakley
ac97f7e9a2
Make the 'New Page' button create pages in sub directories if the user puts a slash in the path/page name.
2012-07-09 10:41:51 +01:00
bootstraponline
33f133b8b2
Livepreview is 102KB again.
...
java -jar compiler.jar --compilation_level WHITESPACE_ONLY --js sundown_o2_m0.js --js_output_file sundown_o2_wo.js
MKDEXT_SUPERSCRIPT extension disabled to match .com behavior (also fixes MathJax).
2012-07-06 23:26:12 -06:00
bootstraponline
2e9995e80a
Use sundown_o2_m0. Fix #415 .
2012-07-06 16:20:53 -06:00
bootstraponline
53f676bf2e
Do not load data on github.com.
2012-07-06 12:21:55 -06:00
bootstraponline
874d658d2a
Ace is broken on Safari 6. Fix #414 .
2012-07-06 12:01:45 -06:00
bootstraponline
d27c455ab7
Update sundown.
2012-07-05 12:01:09 -06:00
bootstraponline
9291431c61
Fix #413 .
2012-07-04 12:24:35 -06:00
bootstraponline
2e5f51e9ae
Update comment.
2012-07-04 11:20:38 -06:00
bootstraponline
2aa7e466ed
File view links use '-' instead of %20.
2012-07-04 11:04:51 -06:00
Jeremy McAnally
3767a11d21
Rename variables to be more clear and fix reference to non-existent 'ext' variable
2012-07-04 12:33:09 -04:00
bootstraponline
8c8b72d482
Restore path support to livepreview.js.
2012-07-03 23:55:28 -06:00
bootstraponline
bb9effa282
Prevent wrapping on long file names.
...
Fix formatting.
2012-07-03 20:41:14 -06:00
bootstraponline
52e96bfa0f
Detect typed array support based on user agent.
...
http://caniuse.com/typedarrays
2012-07-03 15:26:40 -06:00
bootstraponline
00ded65b7f
Fall back to old edit mode if typed arrays are not supported.
2012-07-03 14:47:27 -06:00
bootstraponline
f738aa4234
Disable ie 9 live preview support for now.
2012-07-03 14:19:27 -06:00
bootstraponline
6ff939451c
Update livepreview.
...
Update ace.
Replace pagedown with sundown. Live preview is now able to render markdown identical to regular gollum by leveraging the same library.
Thanks to @kripken for explaining how to best use emscripten for sundown.
2012-07-03 13:55:08 -06:00
bootstraponline
32930cee01
extract_path fails on nil paths.
2012-07-03 10:55:42 -06:00
bootstraponline
3f45c76f48
Extract path on edit. Fix #410 .
2012-07-03 10:53:18 -06:00
bootstraponline
1511baf12d
Restore Home.md.
2012-07-02 10:37:46 -06:00
bootstraponline
20dd0816a6
Revert "Merge pull request #379 from pipex/latex-dollar-sign"
...
This reverts commit b53c961db2 , reversing
changes made to 9c40cbea76 .
2012-07-02 10:27:30 -06:00
bootstraponline
41cd43ebc6
Updated Home (markdown)
2012-07-02 10:18:40 -06:00
Sunny Ripert
4a63899722
Livepreview JavaScript fix for base_url
2012-07-02 15:03:01 +02:00
Sunny Ripert
c31ead493a
Fixed tests to make up for base url
2012-06-28 17:31:19 +02:00
Sunny Ripert
7485733fba
Sinatra base url to allow subdirectories
2012-06-28 17:31:19 +02:00
bootstraponline
e930b5d07b
Merge pull request #390 from arr2036/app_rest_fix
...
App rest fix.
2012-06-26 13:27:57 -07:00
Arran Cudbard-Bell
4543781153
Add tests to check page redirects to create
2012-06-24 22:41:27 +01:00
Arran Cudbard-Bell
1d5bfbb162
Add URL for page creation to allow preemption by extensions
2012-06-24 22:41:27 +01:00
bootstraponline
7045f7f92d
Fix searching for page titles.
2012-06-22 16:04:57 -06:00
bootstraponline
5e7974f30b
Fix file ext removal.
...
a = '/.md/home.md'
a.chomp(File.extname(a))
=> "/.md/home"
a.gsub(File.extname(a),'')
=> "//home"
2012-06-22 11:45:42 -06:00
bootstraponline
1079a888d3
nil.to_i == 0
2012-06-22 11:28:34 -06:00
bootstraponline
b1837abbc2
Fix nil error in search.
2012-06-22 11:24:13 -06:00
bootstraponline
611e1a536c
Merge pull request #403 from trans/file
...
Add Wiki#files for list of non-page files.
2012-06-22 09:59:31 -07:00
bootstraponline
c152ae1557
Merge pull request #401 from nature/make_gollum_search_count_additive
...
Update the Wiki.search function to make the results counts 'additive'.
2012-06-22 09:49:04 -07:00
bootstraponline
de3020c1aa
Merge pull request #400 from nature/new_page_within_dir
...
Add a 'New Page' button to the /pages browser.
2012-06-22 09:48:23 -07:00
trans
f12c3fe06f
Fix docs for File#populate.
2012-06-22 08:45:57 -04:00
trans
754485c306
Add Wiki#files for list of non-page files.
2012-06-22 08:23:46 -04:00
Darren Oakley
088448a8a1
Update the Wiki.search function to make the results counts 'additive'.
...
i.e. so if we have a file named 'foo' that also contains the word 'foo' is should report 2 matches, not 1.
2012-06-22 12:01:39 +01:00
Darren Oakley
6e35a09abd
Add a 'New Page' button to the /pages browser that allows users to create a new page within a subdirectory.
2012-06-22 11:41:42 +01:00
bootstraponline
8fd11e8fdb
Fix #396 .
...
Use ls-files to search file names (which define the page title).
2012-06-21 19:18:46 -06:00
bootstraponline
40855103ad
Disable failing test.
2012-06-21 17:26:19 -06:00
bootstraponline
02041dbdb7
Work around #363 (grit is broken).
2012-06-21 16:45:38 -06:00
bootstraponline
18ccc01501
Remove #head boarder in /pages because it's now defined by .breadcrumb.
2012-06-21 13:16:34 -06:00
bootstraponline
1ff3f9c0da
Merge pull request #393 from nature/dir_support
...
Add Directory Support.
2012-06-21 09:39:12 -07:00
Darren Oakley
7a251248f1
Re-work the compare URL matchers so that CGI escaping etc shouldn't be so needed.
2012-06-21 15:59:10 +01:00
Darren Oakley
971cbb94f6
Make the Sinatra app directory aware.
2012-06-21 15:59:01 +01:00
bootstraponline
b53c961db2
Merge pull request #379 from pipex/latex-dollar-sign
...
[New] Support `$` and `$$` as formula delimiters.
2012-06-19 13:22:49 -07:00
bootstraponline
9c40cbea76
Merge pull request #377 from pipex/latex-align
...
[Fix] Inline latex formula alignment
2012-06-19 13:22:26 -07:00
bootstraponline
a8ce7e93cd
Enable MathJax for live preview.
2012-06-19 11:58:09 -06:00
bootstraponline
4b02b74d6f
Fix #389 .
...
Set page name correctly on preview.
2012-06-19 10:59:24 -06:00
Arran Cudbard-Bell
67dd3afd92
Fix for 1.8 versions of ruby
2012-06-19 15:33:47 +02:00
bootstraponline
7aca7fa0ec
Update Ace.
2012-06-18 12:32:27 -06:00
bootstraponline
c0564a1467
Update readme.
2012-06-18 12:32:14 -06:00
bootstraponline
b0a8984d3b
Update livepreview for new Ace.
2012-06-18 12:31:30 -06:00
bootstraponline
0f451d6833
Fix #386 . File view defines its own layout.
2012-06-18 10:54:14 -06:00
Arran Cudbard-Bell
c704d1f3b3
Hacky fix for encoding issues
2012-06-18 09:44:20 +02:00
bootstraponline
e6d568fd49
Merge pull request #385 from bootstraponline/sequence_no_conflict
...
Fix #376 .
2012-06-17 15:20:19 -07:00
bootstraponline
ee56509302
Fix #376 .
...
New syntax for sequence diagrams is {{{{{{ }}}}}}.
2012-06-17 16:11:59 -06:00
bootstraponline
bc5896b51f
Update readme.
2012-06-17 16:01:48 -06:00
bootstraponline
3224f5f422
Document building the gem from master.
...
[ci skip]
2012-06-16 12:17:13 -06:00
Felipe Lalanne
f9cd97edaa
[Fix] Replaced random escaping of $
...
The `$` symbol is now escaped by replacing it with a static string.
2012-06-11 20:18:22 +02:00
bootstraponline
e1ce3d46de
Fix location for live preview.
2012-06-11 10:07:17 -06:00
Felipe Lalanne
294a8e9642
[New] Support $ and $$ as formula delimiters.
...
Although the standard formula delimiters for latex formulas is currently
`\(` and `\[`, the `$` syntax has an advantage from the point of view of
writing speed, very important if we intend to use *gollum* as a writing
tool.
The code includes support for escaping of the `$` symbol by using the
gollum syntax `'`.
2012-06-11 12:06:54 +02:00
Felipe Lalanne
44fb6d9648
[Removed] Unnecessary require 'time' line.
2012-06-11 11:39:37 +02:00
Felipe Lalanne
74c1ba1653
[Fix] Inline latex formula alignment
...
Fixed an issue of latex inline formulas not aligning correctly with
the text. The fix is a ruby translation of the Perl code described in
http://tex.stackexchange.com/questions/44486/pixel-perfect-vertical-alignment-of-image-rendered-tex-snippets .
This code calculates the alignment of the generated image depending on
the image size and the size of the white space between the formula and
the margins of the image.
The alignment now is nearly perfect, however the new rendering comes
with a performance impact because of the increased number of operations.
To reduce this impact, the generated images and calculated values for
the alignment are now cached in `~/.cache/gollum`. The caching is done
per formula and not per page, thus avoiding caching the same formula
twice.
The Readme and tests have been modified accordingly with the new tool
requirements and expected markup.
2012-06-11 11:25:25 +02:00
bootstraponline
0cb39f049f
Fix IE check.
2012-06-08 16:57:19 -06:00
bootstraponline
f7a3a8aa55
Live preview supports IE 9.
2012-06-08 16:54:28 -06:00
bootstraponline
cbc37eb006
Fix live_preview option #374 .
2012-06-08 16:39:44 -06:00
bootstraponline
097f45eeb3
Use Ace for code highlighting.
...
Update Ace.
Fix CSS for new Ace.
Prevent flickering of toolpanel.
Add GitHub theme for Ace.
Remove gutter in static highlight ext.
Update languages for Ace.
2012-06-08 15:50:20 -06:00
bootstraponline
4c5b3dd76f
Remove highlightjs.
...
Remove old Ace.
2012-06-08 15:49:05 -06:00
bootstraponline
ccf70590a4
Merge pull request #374 from arr2036/optional_livepreview
...
Optional livepreview
2012-06-07 09:08:58 -07:00
Arran Cudbard-Bell
3c709a27ac
Add commandline option for disabling livepreview
2012-06-07 18:05:15 +02:00
Arran Cudbard-Bell
8554654ee9
Add option to disable livepreview from settings
2012-06-07 11:30:30 +02:00
bootstraponline
59ac86cf6e
Add header example to readme.
2012-06-05 15:56:02 -06:00
bootstraponline
a4ecc9a187
Merge pull request #371 from bootstraponline/searchfix
...
Search fix (#348 with assert_not_match replacement).
2012-06-03 15:42:21 -07:00
bootstraponline
cc67c8b68e
Don't use assert_not_match.
2012-06-03 16:37:47 -06:00
bootstraponline
b41f660fec
Merge pull request #358 from blmarket/koreanfix
...
Use grit with force_encoding('ascii-8bit')
2012-06-03 15:00:37 -07:00
bootstraponline
00edcbbf64
Move build status to top of readme.
2012-06-03 15:56:29 -06:00
bootstraponline
c530c70575
Add tests for file_view.
2012-06-03 15:53:11 -06:00
bootstraponline
21840bb344
Remove debug code.
2012-06-03 14:00:50 -06:00
bootstraponline
57bc23779d
Merge pull request #370 from cholick/master
...
File View doesn't work when there's a single subdirectory
2012-06-03 12:41:23 -07:00
Matt Cholick (phenom2-desktop)
78e649f30a
fix for broken file view when only a single directory
2012-06-03 11:56:18 -05:00
blmarket
eaa7a61f71
Fixed 1.8.7 compatible issue
2012-05-31 21:27:27 +09:00
Neon
150a019b8d
Added test cases to test Unicode handling issue.
...
these test cases will fail on non-unicode testing environment
2012-05-31 20:14:21 +09:00
Jeong, Heon
5dd1158025
Use grit with force_encoding('ascii-8bit')
2012-05-31 20:14:21 +09:00
bootstraponline
c60ca4a8d2
Merge pull request #367 from bootstraponline/browser_fallback
...
Enable live preview only for supported user agents.
2012-05-29 17:35:01 -07:00
bootstraponline
e1b28f0805
Rename is_supported to supported_useragent?.
2012-05-29 18:28:19 -06:00
bootstraponline
aeeaeb1eae
Fall back to old edit mode for browsers that are not officially supported by Ace.
2012-05-29 16:32:39 -06:00
Corey Donohoe
76f87f9094
stay on 1.8.7 for the foreseeable future
...
Settles #365 for now
2012-05-28 10:55:59 -07:00
bootstraponline
01e1c92813
Add --base-path option.
2012-05-24 20:45:33 -06:00
bootstraponline
22c0206451
Call page.versions once.
2012-05-24 18:32:45 -06:00
bootstraponline
5173c258b7
Merge pull request #354 from bootstraponline/mathjax
...
Add MathJax (only for gollum, not github.com).
2012-05-24 16:24:44 -07:00
bootstraponline
ff8b892ebe
Add mathjax using SSL CDN.
2012-05-24 17:18:55 -06:00
bootstraponline
7b0988cc19
Remove empty line.
2012-05-24 17:10:05 -06:00
bootstraponline
a4c79f09f8
Gem uninstall does not require sudo (pointed out by @michaelklishin).
2012-05-24 16:48:54 -06:00
bootstraponline
7ec3d92215
Merge pull request #361 from github/travis-fixes
...
nuke the ffi gem on travis boxes
2012-05-24 15:43:21 -07:00
Corey Donohoe
ac9fef784a
nuke the ffi gem on travis boxes
...
/cc @bootstraponline @akzhan
2012-05-24 15:31:54 -07:00
bootstraponline
4822bad4fb
Merge pull request #355 from bootstraponline/author_fix
...
Fix author info (based on #350 ).
2012-05-23 11:40:26 -07:00
bootstraponline
d7dd90f073
Update README.md
2012-05-23 11:12:29 -06:00
Neon
bbc19d1800
Added testcase for 'open existing parent'
2012-05-24 00:04:45 +09:00
Jeong, Heon
9ee9e61312
Fix searching in page_dir if it exists
...
This bug can cause DuplicateError even there is no such file
in page_dir
2012-05-23 23:58:54 +09:00
bootstraponline
f765137f3f
Avoid nil.
2012-05-23 00:04:57 -06:00
bootstraponline
e160822b0f
Only use versions.
2012-05-22 23:48:56 -06:00
bootstraponline
c0e35b0126
Avoid nil.
2012-05-22 23:03:23 -06:00
bootstraponline
ac41ed629e
Merge modified #350 .
2012-05-22 22:46:15 -06:00
Kristi
8b5dfff2a1
Merge pull request #343 from kristi/toc
...
Table of contents feature
2012-05-22 13:14:25 -07:00
kristi
e77154bf7a
Merge remote-tracking branch 'upstream/master' into toc
2012-05-22 12:14:03 -07:00
kristi
5f5187e05c
Only set parentpage if a subpage was found
...
Fixes error if there's no header or footer
2012-05-22 11:55:02 -07:00
bootstraponline
5db1728a3f
Use org-ruby 0.6.3. Fixes #86 .
2012-05-22 09:49:11 -06:00
bootstraponline
c7984ceed1
Revert "Merge pull request #350 from blmarket/pageauthor"
...
This reverts commit 5d3571b7a3 , reversing
changes made to c1082b4474 .
2012-05-21 17:09:15 -06:00
bootstraponline
5d3571b7a3
Merge pull request #350 from blmarket/pageauthor
...
Proper last edit info (with test case)
2012-05-21 16:00:15 -07:00
bootstraponline
c1082b4474
Fix click.
2012-05-21 10:39:11 -06:00
bootstraponline
14f16349c0
Remove unload on save.
2012-05-21 10:35:29 -06:00
bootstraponline
aa7e01a085
Add unload confirmation on live preview, edit, and create.
2012-05-21 10:27:16 -06:00
bootstraponline
484629734e
Update README.md
2012-05-21 10:17:05 -06:00
bootstraponline
444fca2250
Revert changes to Home.
2012-05-21 10:02:55 -06:00
bootstraponline
7f17102c86
Remove home.md.
2012-05-21 10:00:06 -06:00
bootstraponline
e480998a4c
Merge pull request #345 from bootstraponline/file_view
...
Add file view.
2012-05-21 08:58:14 -07:00
bootstraponline
5c642997fe
Origin is undefined in Firefox.
2012-05-21 09:50:23 -06:00
bootstraponline
5be5cd5ba5
Updated Home (markdown)
2012-05-21 09:49:22 -06:00
bootstraponline
1d55ed0599
Updated Home (markdown)
2012-05-21 09:49:12 -06:00
bootstraponline
4380aa9803
Updated Home (markdown)
2012-05-21 09:45:39 -06:00
bootstraponline
66e7f240da
Updated Home (markdown)
2012-05-21 09:45:14 -06:00
bootstraponline
f3e5816547
Updated Home (markdown)
2012-05-21 09:45:08 -06:00
bootstraponline
3d5931c259
Updated Home (markdown)
2012-05-21 09:44:52 -06:00
bootstraponline
d510c74456
Updated Home (markdown)
2012-05-21 09:44:27 -06:00
bootstraponline
7154220d0b
Updated Home (markdown)
2012-05-21 09:44:19 -06:00
bootstraponline
d5155273df
Move script tags to bottom. Refactor livepreview logic into livepreview.js.
2012-05-20 12:34:32 -06:00
Jeong, Heon
60dbe9d0a7
Proper last edit info
...
but it can be slow if page modified so many times
2012-05-20 12:37:10 +09:00
bootstraponline
f7d3f6b3f0
Don't wait for onload.
2012-05-18 15:57:41 -06:00
bootstraponline
40fdd2aa74
Adjust save text.
2012-05-18 15:49:57 -06:00
bootstraponline
f39ed93ca0
Use default commit message in comment window.
2012-05-18 15:32:14 -06:00
bootstraponline
541b2fabb4
Add new page button to file view action panel.
2012-05-18 15:00:23 -06:00
bootstraponline
067ad72f34
Update icon license.
2012-05-18 13:12:14 -06:00
bootstraponline
6c137e39c9
Add file view button.
2012-05-18 13:05:08 -06:00
bootstraponline
f8c6cdb207
Add license for css tree menu.
2012-05-18 12:11:55 -06:00
bootstraponline
f5de6a809d
Remove name2 now that name is fixed.
2012-05-18 12:09:42 -06:00
bootstraponline
e36b96fca6
Remove comments.
2012-05-18 12:01:43 -06:00
bootstraponline
cd1738bdf6
Fix file names.
2012-05-18 12:00:43 -06:00
bootstraponline
ebcd30fadc
Add file view.
2012-05-18 11:50:38 -06:00
bootstraponline
3c10a6bf94
Set focus when toggling comment window.
2012-05-18 11:08:27 -06:00
bootstraponline
dc80fd9b15
Remove old comments.
2012-05-18 10:39:52 -06:00
bootstraponline
5d21df9ac7
Fix css href.
2012-05-18 10:38:27 -06:00
bootstraponline
019e912d7f
Fix comment button.
2012-05-18 10:35:42 -06:00
bootstraponline
3479dca0d0
Add comment window using Ace that allows user entered commit messages.
...
Use darkness div to dim the background when the comment window is active.
Set CSS in batch to avoid unnecessary reflows.
Use debouncing to efficiently resize the window.
Eliminate previewSetter in favor of redefining the previewSet function.
2012-05-18 10:28:59 -06:00
bootstraponline
32e5cc4a5a
Add debounce.
2012-05-18 10:27:01 -06:00
bootstraponline
268a9f18fa
Update readme.
2012-05-18 10:24:14 -06:00
bootstraponline
16a6186570
Add icon for save with comment in live preview.
2012-05-17 16:00:09 -06:00
bootstraponline
4b2fb6dd11
Add default commit messages when using gollum editor.
2012-05-17 15:17:24 -06:00
bootstraponline
67d21bcd64
Fix location.
2012-05-17 12:44:28 -06:00
bootstraponline
9b87126f0f
Generate commit messages when using live preview.
2012-05-17 12:40:27 -06:00
Corey Donohoe
1043b4de70
Revert "Merge pull request #338 from jroes/resize-sha1s"
...
This reverts commit 4bc5e7b8ff , reversing
changes made to 423b5205bf .
2012-05-16 12:48:16 -07:00
Corey Donohoe
4bc5e7b8ff
Merge pull request #338 from jroes/resize-sha1s
...
Fit generated SHA1 placeholders to original length.
2012-05-16 12:15:40 -07:00
bootstraponline
423b5205bf
Fix language detection.
2012-05-15 11:49:55 -06:00
bootstraponline
fde288d9e8
Guess highlight rules for code blocks to match gollum behavior.
2012-05-15 11:48:48 -06:00
bootstraponline
f2a2d85008
Preserve whitespace in gollum code blocks.
2012-05-15 11:20:01 -06:00
bootstraponline
3a91b076e1
Fix gollum code blocks.
2012-05-15 11:06:36 -06:00
bootstraponline
27bd608b53
Update live preview title.
2012-05-15 10:37:38 -06:00
bootstraponline
966ba29084
Fix gollum style code blocks.
2012-05-15 10:12:32 -06:00
bootstraponline
3ea5b0193c
Fix sanitizer to whitelist h1-6.
2012-05-15 09:59:15 -06:00
kristi
97dd1b3b00
Fix toc test
2012-05-14 17:01:39 -07:00
kristi
fe0088d1ae
Add TOC to readme file
2012-05-14 16:12:20 -07:00
kristi
342e1e22f8
Change link icon
2012-05-14 15:54:46 -07:00
kristi
c9203047fc
Make universal toc pretty too
2012-05-14 13:07:57 -07:00
kristi
a3a946ccd6
Remove toc.rb; markup.rb handles toc processing
2012-05-14 13:06:46 -07:00
kristi
22564f34a9
Merge remote-tracking branch 'upstream/master' into toc
2012-05-14 10:44:50 -07:00
kristi
f939c24aa4
Clear floats for footer
2012-05-14 10:25:31 -07:00
kristi
be93fa747b
Make TOC pretty. Also put in "[[_TOC_]]" stub for viewing sub-page directly
2012-05-14 10:23:12 -07:00
kristi
d7f4eeea2c
Merge remote-tracking branch 'upstream/master' into toc
...
Conflicts:
lib/gollum/frontend/app.rb
lib/gollum/markup.rb
test/test_markup.rb
2012-05-14 09:12:44 -07:00
kristi
6191f60025
Fix tests for added example repo pages
2012-05-14 02:01:33 -07:00
kristi
82ccb0cedb
add documentation comment
2012-05-14 02:01:06 -07:00
kristi
eb92e4413a
Add header files and TOC test files
2012-05-14 01:28:03 -07:00
kristi
b0ba205532
Remove :header_hashtags option and adjust tests
2012-05-14 00:38:27 -07:00
kristi
4fa2cdf8d9
Allow sub pages to use the [[_TOC_]] tag
2012-05-13 22:19:55 -07:00
kristi
ae30b23d34
insert a comment if no TOC headers found
2012-05-13 18:48:02 -07:00
kristi
1d3905bb71
Use special tag [[_TOC_]] to insert a table of contents
2012-05-13 12:44:20 -07:00
kristi
aa1e845f9a
create process_headers function to add anchors and create toc
2012-05-13 10:21:50 -07:00
Jonathan Roes
fbcc69ec67
Tell Travis that the tests now depend on docutils.
2012-05-12 21:47:31 -04:00
Jonathan Roes
68b2de6dd7
Fit generated SHA1 placeholders to original length.
2012-05-12 21:05:42 -04:00
bootstraponline
20389babbc
Merge pull request #336 from jroes/remove-links-in-code
...
Remove links in code, fixes #128 .
2012-05-12 14:48:41 -07:00
Jonathan Roes
f9899033aa
Before replacing tags, ensure the SHA1 is not within preformatted content.
2012-05-12 17:29:23 -04:00
Jonathan Roes
eb37b17486
Remove links in code, fixes #128 .
2012-05-11 22:49:26 -04:00
bootstraponline
c428cad286
Remove marker on no highlight pre tags.
2012-05-11 15:05:05 -06:00
kristi
26486da27b
Use correct wiki option
2012-05-11 13:41:03 -07:00
kristi
cabd0ed85e
Add tests for new universal_toc and header_hashtags wiki options
2012-05-11 13:27:43 -07:00
kristi
f53e1a60d5
Fix tests by adding a default_options hash to the wiki
2012-05-11 12:51:04 -07:00
kristi
ec694e4a99
Fix option setting
2012-05-11 12:50:34 -07:00
Corey Donohoe
81e076c924
gemspec upgrade
2012-05-10 14:12:45 -07:00
Corey Donohoe
04070ffc23
bump gollum version
2012-05-10 14:12:36 -07:00
bootstraponline
6941d6b863
Restore title now that #308 is merged using github.com css.
2012-05-10 13:35:33 -06:00
bootstraponline
3c88f68f16
Fix relative links in live preview.
2012-05-10 12:25:26 -06:00
bootstraponline
82461da704
Merge pull request #334 from Skookum/selected-links
...
Grab selected text and use it as the default text when creating links.
2012-05-10 10:23:52 -07:00
Mark Rickert
8e5d17c907
Grab selected text and use it as the default text when creating links.
2012-05-10 13:16:52 -04:00
Tim Harvey
43d2143506
Redirect from root to /Home, fixes #250
2012-05-10 08:55:56 -04:00
kristi
28b729acda
Add in some minimal documentation for wiki options
2012-05-10 00:38:35 -07:00
kristi
584641236b
fixup toc/anchor code in markup.rb
2012-05-10 00:34:35 -07:00
kristi
ca74897569
Add header_hashtag feature option: headers display a link icon when moused over so you can jump to sections
...
Move anchor processing into markup.rb
Use dashes for spaces in the anchor hashtag
2012-05-10 00:26:22 -07:00
kristi
61987c85d2
Add universal_toc wiki option
2012-05-09 16:13:53 -07:00
bootstraponline
cfb75abeed
Remove test file.
2012-05-09 16:27:59 -06:00
bootstraponline
fd32706f0b
Use pre tag for code in live preview.
2012-05-09 16:15:48 -06:00
bootstraponline
d1f90b7d44
Merge branch 'master' of github.com:github/gollum
2012-05-09 16:09:30 -06:00
kristi
f09bc4a81a
Fix editor bug - displaying wrong version of header/footer/sidebar
...
Use most recent version; not the version matching the page
2012-05-09 15:04:29 -07:00
bootstraponline
31b3aea282
Merge branch 'master' of github.com:github/gollum
2012-05-09 14:36:37 -06:00
bootstraponline
2e1d236e8e
Enable previewframe scrolling.
2012-05-09 14:36:20 -06:00
kristi
065d06a98f
Move toc calling code out of app; put in Page.toc_data
...
Page stores the formatted document parsed by Nokogiri
2012-05-09 13:33:54 -07:00
kristi
63107566ec
add Toc to Gollum
2012-05-09 13:33:08 -07:00
bootstraponline
4f1dcea806
2012-05-09 14:28:32 -06:00
bootstraponline
5da1a2c611
2012-05-09 14:28:20 -06:00
bootstraponline
180a214e1f
Merge pull request #311 from bootstraponline/livepreview
...
Live Preview.
2012-05-09 13:24:12 -07:00
kristi
bb417c6975
Rename class to Toc
2012-05-09 12:18:24 -07:00
kristi
75c02475be
Remove extensions namespace
2012-05-09 12:14:45 -07:00
bootstraponline
2fd07211d9
Update README.md
2012-05-09 12:06:05 -06:00
bootstraponline
128f3be596
Use template.css
2012-05-09 10:56:52 -06:00
bootstraponline
810333dbb7
Update link CSS to match github.com.
2012-05-09 10:24:12 -06:00
bootstraponline
e465358ec0
Add Ubuntu asciidoc install commmand.
2012-05-09 10:03:38 -06:00
bootstraponline
2954ed84a0
Merge pull request #327 from arr2036/master
...
Pass :is_bare to Grit where appropriate.
2012-05-09 08:57:18 -07:00
Arran Cudbard-Bell
b36cd8a68e
Pass through :is_bare option from wiki_options, allows Gollum to work with gitolite
2012-05-09 16:12:00 +02:00
Arran Cudbard-Bell
8435daa598
Stop anchor highlighting
2012-05-09 15:37:42 +02:00
Arran Cudbard-Bell
38c943d564
Add supporting modifications to frontend and css
2012-05-09 15:07:01 +02:00
Arran Cudbard-Bell
8e89ec504f
Initial commit of Nokogiri based TOC generator
2012-05-09 14:06:17 +02:00
Kristi
a692ec1124
Merge pull request #326 from kristi/frontend-tweak
...
Frontend tweak: Add header to editor, small fixup for asciidoc css, add spacing to headers
2012-05-08 17:25:26 -07:00
kristi
4e5f2c9587
Add header to editor
2012-05-08 17:29:28 -07:00
kristi
1cc263acfb
Make footer editor font normal sized
2012-05-08 17:22:39 -07:00
kristi
49c6534da6
Put asciidoc fix into template with the rest of the markup css
...
Also remove padding from the asciidoc code block so first line doesn't get indented
2012-05-08 17:11:02 -07:00
bootstraponline
02d3a3d7ec
Clarify gemspec task desc.
2012-05-08 16:36:44 -06:00
kristi
1dbe49243c
Give headers more headroom
2012-05-08 15:03:15 -07:00
kristi
2c12fb7ae8
Add missing semicolons
2012-05-08 15:02:52 -07:00
kristi
829c6debbd
Merge remote-tracking branch 'upstream/master' into frontend-tweak
2012-05-08 14:58:32 -07:00
bootstraponline
f2d3ed322e
Merge pull request #325 from bootstraponline/ascii_css
...
Fix AsciiDoc CSS.
2012-05-08 12:40:57 -07:00
bootstraponline
d90e7db497
Fix #278 .
2012-05-08 13:39:21 -06:00
Corey Donohoe
26f372a36a
this works on 1.9.3 now too
2012-05-08 12:25:03 -07:00
bootstraponline
b037777f83
Fix spacing.
2012-05-08 13:18:46 -06:00
bootstraponline
35ce35b1e0
Default to empty edit window.
2012-05-08 13:15:09 -06:00
bootstraponline
e1517c2907
Merge with upstream.
2012-05-08 13:13:36 -06:00
bootstraponline
ed5f88daa0
Remove unused local var.
2012-05-08 13:05:49 -06:00
bootstraponline
4afda646f0
Merge pull request #324 from bootstraponline/windowsNote
...
Add windows filename invalid characters notice to readme.
2012-05-08 11:36:41 -07:00
bootstraponline
e782538777
Add windows filename invalid notice to readme.
2012-05-08 12:17:36 -06:00
Corey Donohoe
4e86be86d9
Merge pull request #323 from kristi/frontend-tweak
...
Fix HR background
2012-05-07 21:22:29 -07:00
kristi
6c8cfcd7c2
Make code border darker
2012-05-07 20:47:04 -07:00
kristi
9fc7929665
uniform spacing for css
2012-05-07 20:47:04 -07:00
kristi
d590bf7d64
Add images from github
2012-05-07 20:47:04 -07:00
kristi
c0f653340e
Fix urls
2012-05-07 20:47:04 -07:00
Corey Donohoe
ac2bef083b
Merge pull request #322 from kristi/header-feature
...
Header feature
2012-05-07 20:42:14 -07:00
kristi
42c7d0ca44
Fix crazy spacing (sorry, git blame, I couldn't stand it any longer)
2012-05-07 20:35:28 -07:00
kristi
8a8afcfb24
Put gray background on header, fix footer font size
2012-05-07 20:28:07 -07:00
kristi
5d259bb5aa
Use markdown css formatting for header and footer
2012-05-07 20:09:59 -07:00
Corey Donohoe
d2a24ed4bc
Merge pull request #321 from bootstraponline/cleanUp
...
Remove unused local var.
2012-05-07 15:04:04 -07:00
bootstraponline
efd2f49484
Remove unused local var.
2012-05-07 15:37:24 -06:00
Corey Donohoe
9d4d6ccca5
Merge remote-tracking branch 'bootstraponline/gollum2'
...
/cc @kristi is the css behaving on this? we had minor markup conflicts
Conflicts:
lib/gollum/frontend/templates/page.mustache
2012-05-07 14:10:38 -07:00
Aman Gupta
218c894b5a
Merge pull request #319 from bootstraponline/looseObject
...
Fix LooseObjectError by upgrading to grit 2.5.
2012-05-07 13:29:21 -07:00
bootstraponline
0dec522542
Fix LooseObjectError by upgrading to grit 2.5. See https://github.com/mojombo/grit/issues/65
2012-05-07 14:26:48 -06:00
bootstraponline
7fa6708483
Add _Header.md to revert.git.
2012-05-07 14:17:15 -06:00
kristi
33af47c282
Make code border darker
2012-05-07 00:22:24 -07:00
kristi
6b971e9e1b
uniform spacing for css
2012-05-07 00:22:24 -07:00
kristi
50107504a6
Add images from github
2012-05-07 00:22:23 -07:00
kristi
2cb0c9fea6
Fix urls
2012-05-07 00:22:23 -07:00
Corey Donohoe
dd7c2cc7f6
Merge pull request #317 from kristi/frontend-tweak
...
Frontend tweak
2012-05-06 17:00:16 -07:00
kristi
857ca14499
add bottom margin to wiki-page css
2012-05-06 16:37:29 -07:00
kristi
f022b3fcde
Use github markup for page and sidebar content
2012-05-06 16:37:29 -07:00
kristi
9470ff2dcc
fix the sidebar editor
2012-05-06 16:37:28 -07:00
Corey Donohoe
d817a4fdb6
fixup page versioning, fixes #174
...
Thanks @nealpoole and @arr2036
2012-05-06 13:30:23 -07:00
Corey Donohoe
19635b06cf
gemspec updates
2012-05-06 12:08:25 -07:00
Corey Donohoe
872776660b
next version will be 2.0
2012-05-06 12:08:12 -07:00
Corey Donohoe
9644d4b00e
dupe sanitization attrs initialized by constants, fixes #200
2012-05-06 12:07:41 -07:00
bootstraponline
04579d7ae6
Update test.
2012-05-05 13:51:46 -06:00
bootstraponline
e9a9eb1779
Add header.
2012-05-05 13:49:01 -06:00
Corey Donohoe
9a1dddaccf
whitelist apt uri schemes, fixes #233
2012-05-05 11:56:01 -07:00
Corey Donohoe
4110ab5a82
Merge pull request #308 from bootstraponline/title
...
Title defined by filename only.
2012-05-04 15:35:32 -07:00
Corey Donohoe
5d1844e491
Merge pull request #313 from kristi/frontend-tweak
...
Fix searchbar scaling issue
2012-05-04 09:44:23 -07:00
kristi
6a126d46ee
Fix searchbar scaling issue
2012-05-04 09:35:27 -07:00
kristi
f834a0c84f
searchbar fix for ie9
2012-05-04 09:24:20 -07:00
Corey Donohoe
9dfeb237e7
Merge pull request #312 from kristi/frontend-tweak
...
searchbar fix for ie9
2012-05-04 09:21:45 -07:00
Corey Donohoe
b769ba2974
Merge pull request #310 from kristi/frontend-tweak
...
Frontend tweaks
2012-05-04 08:32:17 -07:00
Corey Donohoe
fc1feb280f
let's use 0.8.0 if at all
2012-05-04 08:25:01 -07:00
Corey Donohoe
bface83af7
Merge pull request #309 from nricciar/master
...
Gollum using very old version of wikicloth
2012-05-04 08:24:14 -07:00
bootstraponline
9a89a16388
Update live preview and gemspec.
2012-05-03 17:22:34 -06:00
bootstraponline
7649abf86a
Add encodeURIComponent.
2012-05-03 11:51:59 -06:00
bootstraponline
b6ad97745d
Use encodeURIComponent.
2012-05-03 11:49:41 -06:00
bootstraponline
92028e191d
Remove console.log.
2012-05-03 11:13:27 -06:00
bootstraponline
7d4427a5d3
Add save and load.
2012-05-03 11:10:50 -06:00
Vicent Martí
2bea800a37
Proper ordering for markup processing, fixes #135
...
Code blocks get extracted first.
2012-05-02 18:53:41 -07:00
kristi
4c1ff7deb7
fixup the compare revisions page
2012-05-02 16:55:16 -07:00
bootstraponline
347260f17b
Add livepreview (7f3ed651e4e4388977f9b3ce29ed1a995ff6d7a9).
2012-05-02 16:59:50 -06:00
bootstraponline
1086fba7da
Only use live preview for editing markdown pages.
2012-05-02 16:58:49 -06:00
kristi
5a7cb129bb
Fixup css styling for pages, editor, history
2012-05-02 15:52:15 -07:00
kristi
b29d22e99b
Make navbar flow nicely for narrow windows
2012-05-02 13:51:26 -07:00
David
12cf102543
removing hardcoded reference to old version of wikicloth
2012-05-02 20:45:46 +00:00
kristi
3d95730880
Fix navbar and searchbar css
2012-05-02 13:00:46 -07:00
bootstraponline
c5d807dd58
Fix tests.
2012-05-02 12:13:18 -06:00
bootstraponline
d40df79dce
Title defined by filename only.
2012-05-02 12:05:57 -06:00
Corey Donohoe
3cfa297b49
hide the page title as before
2012-05-02 19:29:17 +02:00
Corey Donohoe
e435769345
remove executable bit
2012-05-02 19:20:57 +02:00
bootstraponline
9a73877b3e
Fix search bar and restore title.
2012-05-02 11:03:37 -06:00
Corey Donohoe
e2cd8d93f4
Merge pull request #306 from pdeschen/master
...
README Installation requirements sub section for mathematical equations support
2012-05-01 16:33:51 -07:00
Corey Donohoe
afc6ec468f
bit of testing info
2012-05-02 01:33:15 +02:00
Corey Donohoe
391838cfc3
no more rbx
2012-05-02 01:25:52 +02:00
Corey Donohoe
36a11ded4f
Merge pull request #304 from rwfowler/asciidocLinksWithTravis
...
Disable internal link processing for asciidoc
2012-05-01 16:10:51 -07:00
Corey Donohoe
f540ef2e06
Merge pull request #305 from rwfowler/goForGreen
...
Fix the test_normalizes_commit_hash on Travis-CI
2012-05-01 16:04:39 -07:00
Corey Donohoe
b061e0f859
2.0 is unnecessary
2012-05-02 00:49:44 +02:00
Corey Donohoe
4972fbbc7b
this doesn't build on 1.9.x /cc @brianmario
2012-05-02 00:44:17 +02:00
Pascal Deschenes
1f318de812
add missing note about dvips in installation requirements sub section + associated section text
2012-05-01 18:15:01 -04:00
Pascal Deschenes
0ceeadd75b
add installation requirements regarding mathematical equations support
2012-05-01 18:10:21 -04:00
Ryan Fowler
b9dad32707
Fix the test_normalizes_commit_hash on Travis-CI
2012-05-01 17:02:50 -05:00
Ryan Fowler
d1cf698b45
Disable internal link processing for asciidoc
...
asciidoc's representation of section identifiers interferes with
Gollum's page linking. This disables Gollum's page link tag
extraction for asciidoc files.
Adds "apt-get install -y asciidoc" to .travis.yml so tests pass
on @travis-ci.
2012-05-01 14:23:26 -05:00
Corey Donohoe
9dba3f9c58
Revert "Merge pull request #303 from rwfowler/asciidocLinks"
...
This reverts commit 8fbbe40300 , reversing
changes made to b7fb4c5950 .
2012-05-01 19:51:05 +02:00
Corey Donohoe
8fbbe40300
Merge pull request #303 from rwfowler/asciidocLinks
...
Fix for #52 - Disable internal link processing for asciidoc
2012-05-01 10:42:31 -07:00
Ryan Fowler
f73c925ad9
Disable internal link processing for asciidoc
...
asciidoc's representation of section identifiers interferes with
Gollum's page linking. This disables Gollum's page link tag
extraction for asciidoc files.
2012-05-01 11:43:27 -05:00
Corey Donohoe
b7fb4c5950
Merge pull request #302 from kristi/master
...
fix Rack config.ru documentation
2012-05-01 02:32:07 -07:00
kristi
fed49bb98b
Fix gollum_path in rack setup documentation
2012-05-01 01:37:17 -07:00
Vicent Martí
6aa4e382b2
Tag 1.4.3
2012-04-25 14:12:54 -07:00
Vicent Martí
8051d4f9b0
Fix the public path
2012-04-25 14:11:02 -07:00
Vicent Martí
31a49601b1
Namespace the public assets
2012-04-25 14:11:02 -07:00
Corey Donohoe
4a50635fe1
docs for releasing the gem
2012-04-25 20:52:40 +02:00
Vicent Martí
9b92e9d325
Add Gollum.assets_path hook
2012-04-25 11:46:28 -07:00
Corey Donohoe
833953d658
bump to 1.4.2
2012-04-25 20:44:16 +02:00
Corey Donohoe
198dc8a8e2
Merge remote-tracking branch 'jussimalinen/fix-rest-local-links'
2012-04-25 17:00:56 +02:00
Vicent Martí
78cd65240f
Tag 1.4.1
2012-04-24 20:42:33 -07:00
Jussi Malinen
02073f827b
add id to whitelisted attributes. The transformers still seem to work and prefix ids with wiki-. Uncommented relevant tests.
2012-04-23 20:08:24 +03:00
Corey Donohoe
4cd3fdcdba
fixup readme error, fixes #294
2012-04-16 15:41:11 -07:00
Corey Donohoe
7c803288e0
update org-ruby dev dep
2012-04-14 14:10:29 -07:00
Corey Donohoe
dc91e0f733
Merge remote-tracking branch 'origin/sane-parsing'
2012-04-12 14:07:08 -07:00
Vicent Martí
adc3abe82a
Update README
2012-04-12 22:59:44 +02:00
bootstraponline
00b6f5c3fb
Add desc to tasks so they show up in rake -T.
2012-04-12 13:58:57 -07:00
Vicent Martí
b5a2a8df67
Keep a MarkupGFM class for compatibility reasons
2012-04-12 22:54:45 +02:00
Vicent Martí
0cc4c9f2c2
Remove the GFM parser; it makes no sense
...
The new versions of GitHub::Markup will automatically render GFM for
Markdown documents if the necessary gems are installed.
2012-04-12 22:54:11 +02:00
Vicent Martí
7317a9ba2d
Allow indented code blocks in Gollum syntax
2012-04-12 22:52:08 +02:00
Corey Donohoe
d6a4009989
nuke whitespace
2012-04-10 18:38:04 -07:00
Corey Donohoe
8ee52e7d05
cleanup whitespace
2012-04-10 18:26:13 -07:00
Corey Donohoe
b9a970a19a
minor css fixups from github's internal copy
2012-04-10 18:25:09 -07:00
Corey Donohoe
bee93eade1
release 1.4.0
2012-04-10 18:15:39 -07:00
Corey Donohoe
5d157eea54
update what changed in this release
2012-04-10 18:15:00 -07:00
Corey Donohoe
28b494c913
Merge remote-tracking branch 'andrew0/editor_hooks'
2012-04-10 17:50:02 -07:00
Corey Donohoe
817f189154
be a little more rubyish
2012-04-10 17:40:47 -07:00
Corey Donohoe
0bfa049778
Merge remote-tracking branch 'origin/master' into websequencediagrams
...
Conflicts:
README.md
lib/gollum.rb
lib/gollum/markup.rb
2012-04-10 17:37:48 -07:00
Corey Donohoe
8745314ad8
Merge pull request #281 from muzuiget/master
...
Fix searchbar position and button appearance
2012-04-10 17:11:19 -07:00
Corey Donohoe
846d6d62c7
Merge pull request #257 from hulihanapplications/default-editor-markup
...
Make default markup changeable through sinatra settings
2012-04-10 17:10:12 -07:00
Corey Donohoe
c625440161
Merge pull request #249 from ChrisCauser/master
...
Fix spaces in filenames breaking redirect with Sinatra 1.3.1
2012-04-10 16:10:02 -07:00
Corey Donohoe
aa544f03fb
Merge pull request #166 from arr2036/mediawiki_compat
...
Gollum doesn't play nice with un-canonicalized filenames, and breaks offsite links when replacing mediawiki
2012-04-10 16:04:09 -07:00
bootstraponline
8d42c06fb0
Remove MathJax.
2012-04-10 15:59:05 -07:00
Corey Donohoe
4480ff0520
update the gemspec to reflect mathjax being gone
2012-04-10 15:55:30 -07:00
Corey Donohoe
eed9b2695a
Merge branch 'master' into code_with_multibyte
...
Conflicts:
lib/gollum/markup.rb
test/test_markup.rb
2012-04-10 15:49:37 -07:00
Corey Donohoe
337a9b180e
Merge remote-tracking branch 'xdite/highlight-utf8'
2012-04-10 15:27:46 -07:00
Corey Donohoe
66a6ee97f0
Merge pull request #273 from polarblau/code_block_ascii_bug
...
Added test for ASCII characters in code blocks created with back ticks.
2012-04-10 15:26:31 -07:00
Corey Donohoe
26d5abe7a5
Merge pull request #264 from github/remove_contents
...
remove contents of script and style elements
2012-04-10 15:26:00 -07:00
Corey Donohoe
bf8246c705
minor api updates
2012-04-10 15:21:34 -07:00
Corey Donohoe
73cd25b05f
Merge remote-tracking branch 'origin/master' into xdite-merge
...
Conflicts:
lib/gollum/markup.rb
2012-04-10 15:16:13 -07:00
Corey Donohoe
c5cc6905de
Merge pull request #283 from dentarg/master
...
Serve Gravatars via SSL
2012-04-10 15:06:30 -07:00
Patrik Ragnarsson
7b0a714e1f
Serve Gravatars via SSL.
2012-03-17 19:06:11 +01:00
muzuiget
b47d83a7f2
Fix searchbar position and button appearance
2012-03-04 17:57:31 +08:00
Polarblau
5f4d312b8e
Added test for ASCII characters in code blocks created with back ticks.
2012-02-07 12:52:06 +02:00
Jesse Newland
be4c52202c
remove contents of script and style elements
...
Avoids rendering HTML-ized CSS and/or Javascript by removing the
contents of script and style elements as well as the elements
themselves.
/cc @technoweenie
Pull Request: master
2012-01-08 22:07:33 -05:00
Dave Hulihan
4e9111976e
Make default markup changeable through sinatra settings
2011-12-22 20:20:03 -07:00
rick
5163f11ecb
allow ftp and irc protocol links in wiki pages
2011-12-22 09:30:27 -07:00
xdite
5a1d5fa4f0
syntax highlight should with utf-8
2011-12-21 15:18:12 +08:00
Chris Causer
d389390523
Escape names on page create redirect
2011-12-14 13:10:44 +00:00
Chris Causer
5a661fdacc
Add tests for escaped characters in title
2011-12-14 13:07:13 +00:00
Vicent Marti
bd6dfcd51c
Merge branch 'drop-redcarpet' of github.com:github/gollum into drop-redcarpet
2011-12-07 19:10:43 +01:00
Vicent Marti
8014486fd8
XHTML is dead
...
Do not enforce the XHTML conversion for Wiki pages. HTML is cool!
2011-12-07 18:57:07 +01:00
Vicent Marti
654b5b176b
Bump GitHub::Markup dependency
2011-12-07 16:54:35 +01:00
Vicent Marti
af09f99c8a
Fix newline tests in code blocks
2011-12-07 13:02:54 +01:00
Vicent Marti
108876d9a1
Do not assume Markdown output is XHTML
...
Self-closing tags are bad for your health.
2011-12-07 12:34:59 +01:00
Vicent Marti
1eb65caff4
Remove dependency on Redcarpet
...
Now Gollum does all its Markdown processing through GitHub::Markup; if
you require a custom Markdown renderer using Redcarpet or another
library, you can hot-load it from your own code base:
Gollum::Wiki.markup_classes[:markdown] = YourRedcarpetRenderer
2011-12-07 12:12:02 +01:00
xdite
7924e8c9a9
compatible with RedCarpet 2.0+
2011-12-01 19:26:14 +08:00
Joshua Peek
101f43947f
Merge pull request #222 from github/server-side-tex
...
Render Tex on Server
2011-11-29 08:46:45 -08:00
Joshua Peek
68a0ead0c5
Use posix-spawn for tex shell out
2011-11-29 09:47:32 -06:00
Joshua Peek
3d119c0d5d
Depend on posix-spawn
2011-11-29 09:35:27 -06:00
Joshua Peek
f3e8cbf41d
Requires ghostscript too
2011-11-28 16:45:29 -06:00
Joshua Peek
f0fa42a50e
Fix error check order
2011-11-28 16:41:03 -06:00
Joshua Peek
a20fd4fdcf
Raise Tex::Error
2011-11-28 13:53:36 -06:00
Joshua Peek
32fb1cdb23
Better tex errors
2011-11-28 13:49:42 -06:00
Joshua Peek
ac24213d53
Link to tex image at wiki base path
2011-11-28 13:41:43 -06:00
Joshua Peek
fa20343253
Remove MathJax from README
2011-11-28 13:36:42 -06:00
Joshua Peek
f4d70d3748
Remove other mathjax support
2011-11-28 13:35:53 -06:00
Joshua Peek
b311730c7c
Remove MathJax
2011-11-28 13:34:11 -06:00
Joshua Peek
3cba98fee6
Merge branch 'master' into server-side-tex
2011-11-28 13:21:46 -06:00
Arran Cudbard-Bell
7c799323a5
Add additional tests to verify that existing filenames are processed properly and not cannonicalized
2011-11-24 11:07:27 +01:00
Arran Cudbard-Bell
6926746624
Do not re-canonicalize names referring to existing page files when updating format extensions
2011-11-24 11:07:27 +01:00
Arran Cudbard-Bell
af7a52970f
Repository page files with spaces, will now match using urls with hyphens, underscores and urlencoded spaces. This is for compatibility with mediawiki conversions.
2011-11-24 11:07:27 +01:00
rick
5ce3886651
Merge pull request #237 from bootstraponline/master
...
Update Gollum CSS based on GitHub's production CSS
2011-11-22 12:50:15 -08:00
bootstraponline
0bc883ee29
Update CSS based on GitHub's production Gollum CSS.
2011-11-22 10:56:10 -07:00
Joshua Peek
cc96786ac0
Fix Wiki XSS vuln
2011-11-15 15:29:05 -06:00
hibariya
5b84ecf372
ruby1.8 compatibility
2011-11-12 11:32:54 +09:00
hibariya
620926c379
add encoding option
2011-11-12 11:23:04 +09:00
Joshua Peek
7a4e57a49d
Fix Tex tests
2011-10-24 15:54:40 -05:00
Joshua Peek
cdca60ff1b
Remove test document
2011-10-24 15:52:48 -05:00
Joshua Peek
604f88939e
Render tex formulas to images
2011-10-24 15:50:02 -05:00
Joshua Peek
95a7d33848
2011-10-24 15:10:23 -05:00
rick
39e06e48bd
Merge pull request #217 from phlipper/fix-sinatra-api-warning
...
set :public_folder in frontend app instead of :public
2011-10-22 01:58:13 -07:00
Phil Cohen
9246c1443f
set :public_folder in frontend app
...
:public is no longer used to avoid overloading
Module#public, use :public_folder instead
2011-10-21 16:39:15 -07:00
Joshua Peek
d3e358817e
Merge pull request #209 from pal/edit-page-preview-fix
...
Fix edit page preview problems
2011-10-05 06:50:44 -07:00
pal
3682bc8558
Fix preview problems, also see #141
2011-10-05 12:11:09 +02:00
rick
8c1f82d894
let Gollum::Markup handle code blocks instead of RedCarpet
2011-09-29 11:02:35 -06:00
rick
6887c89d5c
remove rdoc task
2011-09-29 10:04:48 -06:00
Joshua Peek
5071072c6b
Prune MathJax docs
2011-09-28 17:53:18 -05:00
Joshua Peek
1cb7bc96c7
Merge pull request #206 from github/backport-js
...
Backport JS
2011-09-28 13:44:27 -07:00
Joshua Peek
755c303008
Use $.facebox for dialog if its available
2011-09-27 17:13:53 -05:00
Joshua Peek
381a963971
Fix lang script uri
2011-09-27 17:13:33 -05:00
Joshua Peek
903ea7c49a
Reindent dialog JS and trim trailing spaces
2011-09-27 16:50:24 -05:00
Joshua Peek
41c4801aed
Backport some JS changes from github.com
2011-09-27 16:49:52 -05:00
Joshua Peek
3a8d65bd3e
Fix indenting offset
...
2 spaces, not 3
2011-09-27 16:26:03 -05:00
Joshua Peek
095a392359
Trim trailing whitespace
2011-09-27 16:06:16 -05:00
Joshua Peek
ce770c2e79
Don't leak nodeSelector
2011-09-27 14:51:47 -05:00
Joshua Peek
be9529faee
Remove dead and leaky global functions
2011-09-27 14:48:38 -05:00
Joshua Peek
1f948e30d8
Cleanup gollum.js trailing whitespace
2011-09-27 14:27:37 -05:00
Joshua Peek
50de79171a
Rebuild empty.git fixture
2011-09-27 14:01:58 -05:00
Joshua Peek
e8b3854682
Hush test clone warnings
...
warning: You appear to have cloned an empty repository.
2011-09-27 13:49:59 -05:00
Joshua Peek
985fade9f6
Don't call id on nil
2011-09-27 13:48:16 -05:00
Joshua Peek
39b1177ba0
Check in empty directories
2011-09-27 13:43:52 -05:00
rick
5fb440171e
Merge pull request #205 from x1024/author_on_first_preview
...
The first page in an empty repository can now be previewed.
2011-09-27 09:10:21 -07:00
Mihail Minkov
38673e5f43
regenerated gollum.gemspec
2011-09-27 19:07:05 +03:00
Mihail Minkov
b8ce2b251d
The first page in an empty repository can now be previewed.
2011-09-27 18:52:51 +03:00
Joshua Peek
7829e17c27
Fix invalid syntax, leaky vars and trailing whitespace in lang JS
2011-09-26 17:35:39 -05:00
Joshua Peek
fced891975
Merge pull request #204 from github/pygments.rb
...
Switch to Pygments.rb
2011-09-26 15:00:48 -07:00
Joshua Peek
35da594bfc
Switch to pygments.rb
2011-09-26 16:45:21 -05:00
rick
e8df272729
Merge pull request #195 from bobrik/patch-1
...
Forcing encoding to UTF-8 for git tree
2011-09-21 19:33:14 -07:00
Ian Babrou
a337b9ba15
added method existence checking for UTF-8, thanks to @technoweenie
2011-09-09 19:24:27 +04:00
Ian Babrou
685cc358b3
forcing encoding to UTF-8 for git tree to be able to use gollum with non-ascii wiki filenames
2011-09-09 17:24:19 +04:00
risk
9ce4f0220e
dont want wikicloth 0.7.0
2011-08-08 15:45:55 -07:00
risk
2128559186
fix edge case where sanitize gem doesn't operate on <a> node if the custom transformer runs
2011-08-08 15:43:21 -07:00
risk
20e4ca6a56
normalize test output
2011-08-08 15:26:27 -07:00
risk
6f15fafc4a
add a Page#markup_class reader
2011-08-08 15:26:22 -07:00
risk
cd4704aed7
prefix name attributes too
2011-08-08 15:02:10 -07:00
risk
82fd4d8b26
update the changelog
2011-08-04 14:18:38 -07:00
risk
08a58b7520
Sanitization#id_prefix can be modified
2011-08-04 14:02:24 -07:00
risk
c7d8026ac5
when extracting the code blocks, use the SHA of the lang code AND contents to uniquely identify the snippet
2011-08-04 13:38:05 -07:00
risk
c7729f81ad
Release 1.3.1
2011-07-21 16:30:59 -07:00
risk
7e12de0087
tomdoc
2011-07-21 16:19:48 -07:00
risk
c9c7db5a53
add backwards compatible Gollum::Wiki.markup_class
2011-07-21 16:17:09 -07:00
risk
aadbdd8b76
keep the versions of rake in the gemspec and gemfile in sync for cry babies
2011-07-21 16:04:08 -07:00
risk
b2d372ab3c
id attribute transformers should always return a hash or nil
2011-07-21 15:47:00 -07:00
risk
c47a47bc30
disable notifications
2011-07-21 15:43:03 -07:00
risk
ad5ec77f41
smaller #inspect output for wiki and page objects
2011-07-21 15:27:56 -07:00
risk
c0bf387cb4
requiring gollum doesnt require the load path to be set to the lib directory ahead of time (good for rake console)
2011-07-21 15:27:34 -07:00
risk
267323c7c3
merge gfm
2011-07-21 15:04:50 -07:00
risk
d9b1ea3d51
track builds in travis-ci
2011-07-21 14:53:05 -07:00
risk
70bf86f561
specify rake gem in gemfile
2011-07-21 14:53:05 -07:00
rick
e1eebb2f75
Merge pull request #182 from schacon/test-fixes
...
Fixing Tests
2011-07-21 14:37:58 -07:00
Scott Chacon
aa258dbe6b
fix test breaking due to new footnote anchor
2011-07-19 12:55:43 -07:00
Scott Chacon
5a7659e1c3
fix tests breaking due to whitespace issues
2011-07-19 12:55:19 -07:00
Scott Chacon
d51a829038
rake is needed to run the tests in dev
2011-07-19 12:54:13 -07:00
Ryan Tomayko
b7ffc4051c
Wiki#tree_list returns an empty array if the ref doesnt resolve
...
Signed-off-by: risk <technoweenie@gmail.com >
2011-07-14 14:35:58 -07:00
risk
bb06b566cd
GitAccess#ref_to_sha should never return a blank string
2011-07-14 14:30:23 -07:00
Vicent Marti
fc6149a171
Bless Gollum with the power of GFM
...
With these changes, the Markdown rendered in Gollum wikis will have the
same quality and safety as the MD we render everywhere else @ GitHub.
This commit also changes the old `markup_class` accessor to
`markup_classes`, allowing users to specify a custom Markup class for
each markup language.
2011-06-21 18:28:28 +02:00
rick
4abc32f1ec
Merge pull request #143 from kashif/patch-1
...
Fixed spelling.
2011-06-20 09:18:22 -07:00
rick
efd734d962
Merge pull request #162 from ttscoff/master
...
Spacing fix for issue #145
2011-06-20 09:17:59 -07:00
rick
8158610587
Merge pull request #164 from arr2036/patches_1.3.0
...
Remove edit button on preview pages
2011-06-20 09:15:38 -07:00
rick
2bb62309be
Merge pull request #157 from nealpoole/master
...
Fixed broken preview functionality
2011-06-20 09:15:23 -07:00
rick
401e41b699
Merge pull request #169 from JoshCheek/fix_page_file_dir_option
...
Fix page_file_dir option
2011-06-07 23:44:51 -07:00
Josh Cheek
3015831d66
fix bug where can't edit pages while using page_file_dir
2011-06-07 22:47:01 -05:00
Josh Cheek
c2919897e2
add test that fails when editing pages while using page_file_dir
2011-06-07 22:45:41 -05:00
Arran Cudbard-Bell
83d6cae53f
Remove edit button on preview pages
2011-05-26 21:35:34 -07:00
Brett Terpstra
7ad54e3c94
Added spacing to allow has-rightbar and has-footer classes to work
2011-05-23 13:12:47 -05:00
Neal Poole
c1fc3a92c0
Fixed broken preview functionality in Gollum.
2011-05-16 17:10:08 -04:00
Aman Gupta
23508d3867
Merge pull request #153 from guilleiguaran/patch-1
...
default_executable= have been deprecated
2011-05-08 22:43:00 -07:00
Guillermo Iguaran
b5cb2e6dd6
default_executable= have been deprecated
2011-05-08 22:38:24 -07:00
Andrew O'Brien
9efcf8bfb1
Added support for activate/deactivate functions in LanguageDefinition so that languages that have a client-side component can setup and teardown UI elements.
2011-05-06 11:29:54 -04:00
rick
1ff486e16c
Merge pull request #146 from schuyler1d/master
...
allow prefixed @id attributes to allow internal linking
2011-05-06 03:51:13 -07:00
Schuyler Duveen
c22050fca8
allow @id attributes but force a "wiki-" prefix
2011-05-04 11:50:38 -04:00
Kashif Rasul
e910dd0ccf
Fixed spelling.
2011-05-02 07:15:11 -07:00
rick
748d76dff1
Release 1.3.0
2011-04-25 20:59:57 -04:00
rick
2ebed41225
Merge branch 'master' of github.com:github/gollum
2011-04-25 20:47:46 -04:00
rick
86d14fa7ab
Merged pull request #134 from mrjbq7/master.
...
Fixing search box location.
2011-04-25 11:38:01 -07:00
rick
82e31e971a
Merged pull request #136 from freerange/master.
...
Remove redundant 1.8 compatibilty
2011-04-25 11:37:21 -07:00
Chris Roos
3d591b49cb
Updated the gemspec.
...
Commit df505a7289 removed ruby1.8.rb but it was still included in the gemspec which caused Bundler to complain about an invalid Gemspec.
*NOTE* There are five test failures when running 'rake'. I checked out the last commit before Tom's change (d3594f6652 ) and that also has these five failures so I'm happy that we didn't introduce them.
2011-04-15 15:54:35 +01:00
Tom Ward
df505a7289
ruby1.8 compatibility isn't required to run gollum using ruby 1.8.7
...
The sanitize gem requires 1.8.7 or later, so compatibility with earlier versions is moot
2011-04-12 15:23:23 +01:00
rick
17dcde1f61
fix xss vulnerability in mathjax parsing
2011-04-11 23:29:06 -04:00
John Benediktsson
2a052cae8d
Remove default width of page name header.
2011-04-10 22:28:37 -07:00
Tom Clark
d3594f6652
Added 'All Pages' route and view
2011-04-09 14:09:36 -07:00
rick
ad561226b9
merrrge
2011-03-31 15:11:24 -07:00
rick
2523b4e849
Release 1.2.0
2011-03-31 14:44:45 -07:00
rick
9a96d76099
Merge branch 'bugfixes' of https://github.com/philc/gollum into philc-bugfixes
2011-03-31 14:35:54 -07:00
rick
e0494a6321
fix tests
2011-03-10 11:06:18 -08:00
rick
45a300c6bc
add gollum-{{format}}}-content class names to rendered wiki body divs
2011-03-10 10:54:32 -08:00
rick
32a33e0c15
update to albino v1.3.2
2011-03-10 10:33:35 -08:00
rick
ecb44b50e1
use Albino::Multi
2011-03-03 16:28:13 -08:00
rick
83c0dbaaf2
update to albino v1.3.0
2011-03-03 15:22:46 -08:00
rick
f8b25f44f7
i think ruby 1.9 needs this. can't live without
...
it.
2011-03-03 15:22:31 -08:00
eston
aabed7a6cc
Add absent links for wiki
2011-03-03 13:48:13 -08:00
eston
2468aa9350
Stop this font scaling madness
2011-03-02 18:17:25 -08:00
eston
234f248b17
More fixes
2011-03-02 18:09:24 -08:00
eston
d87750c39d
Fix up sidebar conditional
2011-03-02 17:56:34 -08:00
eston
175408e6bd
Tweak definition lists some more
2011-03-02 17:32:42 -08:00
eston
56408bdaa4
Move editor stuff to same directories as GitHub to keep from URI confusion
2011-03-02 17:28:32 -08:00
eston
118e0df2c3
Gollum-specific image styles
2011-03-02 17:14:54 -08:00
eston
59eaae8e73
Gollum-specific framed images, table styles
2011-03-02 16:46:33 -08:00
eston
d0900520a3
Org-mode generates invalid lists
2011-03-01 23:46:41 -08:00
eston
385b56bf77
Fix up line endings on headers
2011-03-01 23:45:03 -08:00
eston
3bc1e8513e
definition lists
2011-03-01 19:30:10 -08:00
eston
5c95264192
Clean up readability and typography in Gollum wikis
2011-02-28 17:24:47 -08:00
eston
c73a6b0045
Merge branch 'master' of git://github.com/github/gollum
2011-02-28 17:10:51 -08:00
Tom Clark
8403868ac3
Test that wikis can write to different branches in isolation
2011-02-22 00:12:32 -05:00
Tom Clark
a1d760df1e
Write pages to the proper branch
2011-02-21 23:32:27 -05:00
philc
e4d63ec8a2
Make the search case insensitive
2011-02-10 11:16:35 -08:00
philc
a0ba81c763
Fix a bug where each time the editor is loaded, all of its existing content is indented by two spaces.
...
Must've been caused by some markup restructuring.
2011-02-10 11:16:35 -08:00
Caleb Spare
d76a40b1a8
[Frontend] Small fix (no change in functionality) based on technoweenie's CR.
2011-02-09 16:33:51 -08:00
Caleb Spare
db3d534ee5
[Frontend] Fixed bug that gave a bad redirect on page edit.
2011-02-09 13:33:31 -08:00
eston
fb240fa79e
Fix Org-mode mismatched quotes; clean up syntax
2011-02-03 15:09:27 -08:00
Puneeth Chaganti
c088cc0617
Add help for the use of tables in org-mode
2011-02-03 16:32:43 +05:30
Puneeth Chaganti
2648e75328
Remove references to Markdown
2011-02-03 05:11:13 +05:30
Puneeth Chaganti
46d70e0492
Add support for Org-mode to the new editor
2011-02-03 03:22:35 +05:30
rick
732e8a9361
fix bug where relative images in previews did not render
2011-01-27 16:34:29 -08:00
Randy Merrill
e3950d52c1
Removing the ref as an argument to the Committer#parents and just using the @wiki.ref.
...
Updated the test to reflect the change and to test creating a wiki with a custom ref returns the correct parent for the `Committer#parents`.
2011-01-27 13:59:39 -08:00
Randy Merrill
7427ddd900
Adding some tests to test that the commiter can retrieve parents that are not the same as the wiki ref.
...
Also testing that the default wiki ref works without passing a ref.
2011-01-27 13:00:54 -08:00
Randy Merrill
364b2b85ae
Moving the ref to be an argument to the parents that defaults to the @wiki.ref
2011-01-27 12:46:29 -08:00
Randy Merrill
a71ab7c418
Changing from using branch as the variable to using ref.
2011-01-27 11:38:48 -08:00
Randy Merrill
2bb1937fa9
Fixing the docs for the default branch.
2011-01-27 11:29:21 -08:00
Randy Merrill
3c44205be7
Adding the logic to accept a command line flag for the branch to use to retrieve pages.
2011-01-27 11:24:15 -08:00
Brian Lopez
f708dc7002
fix bug due to the way Array#to_s works in 1.9
2011-01-20 15:06:21 -08:00
rick
feef486f63
add wikicloth as a dev gem dep
2011-01-20 14:37:35 -08:00
rick
a78964ae30
upgrade to sanitize 2.0
2011-01-20 14:14:40 -08:00
rick
8ddb781588
yield the created SHA1 in the after_commit callback
2011-01-19 05:51:16 -08:00
rick
2b1510af11
edit a page, sidebar, and footer all in one commit
2011-01-19 05:20:58 -08:00
rick
aae9eb1883
refactor wiki commit logic into Gollum::Committer class
2011-01-19 05:16:16 -08:00
eston
05b53462df
Fix backreferencing/replacement issues
...
Add in a way to short-circuit missing language definitions
2011-01-18 23:08:08 -08:00
eston
56bd0b9757
Merge branch 'master' of github.com:github/gollum
2011-01-18 22:59:51 -08:00
eston
049d9d6d1f
Remove widon't code
2011-01-18 22:58:44 -08:00
rick
e1f92e3ca2
update readme with new features
2011-01-17 10:30:26 -08:00
rick
1150303f77
update history
2011-01-17 10:21:22 -08:00
rick
d0a8b66607
Merge branch 'master' of https://github.com/sleeplessgeek/gollum into sleeplessgeek-master
2011-01-17 10:18:13 -08:00
rick
a9d4e117aa
fix markup formatting edge case
2011-01-17 10:17:14 -08:00
rick
feff07ae9c
Merge branch 'org-mode-file-links' of https://github.com/hugoduncan/gollum into hugoduncan-org-mode-file-links
2011-01-17 10:12:50 -08:00
rick
e77cba96fd
add git test fixture for page_file_dir tests
2011-01-17 10:08:58 -08:00
rick
f6f8428daf
merge page-file-dir_option branch
2011-01-17 10:05:21 -08:00
rick
11fcf0c784
fix whitespace, remove old no_follow code (nokogiri to the rescue)
2011-01-17 09:15:21 -08:00
rick
ca2aaa543a
Merge branch 'mediawiki_fixups' of https://github.com/qmx/gollum into qmx-mediawiki_fixups
2011-01-17 09:06:00 -08:00
Nathan Long
a1876ccd7a
Fixed formatting mistake (auto-wrap in vim)
2011-01-14 13:59:03 -05:00
Nathan Long
dda8a7374f
Clarified a couple of points in the documentation
2011-01-14 13:55:49 -05:00
rick
e2a4514be5
add the ability to revert whole commits that touch multiple files
2011-01-13 15:50:35 -08:00
rick
002fe8d409
add method for getting the reverse diff without a page path
2011-01-13 13:32:15 -08:00
rick
710741813b
upgrade to grit ~2.4.0 to take advantage of Grit::Process
2011-01-13 13:22:36 -08:00
rick
daa07326df
docs for some of the diffing methods
2011-01-13 13:21:14 -08:00
rick
9a4e2e39a8
update albino to 1.2.3, handle bad code blocks gracefully
2011-01-12 15:00:58 -08:00
Douglas Campos
0a1ecde7b6
typo
2011-01-12 01:00:01 -02:00
Douglas Campos
2dbb4e9fa7
fixed mediawiki link handling
2011-01-12 00:57:21 -02:00
Douglas Campos
e4103e6181
testing link labeling current behavior
2011-01-11 22:50:59 -02:00
rick
c5e4935e85
tweak code markup parser so that blocks without a language are just output in pre tags
2011-01-11 01:00:51 -08:00
rick
45765eb161
add proper shell escaping for Albino
2011-01-11 00:58:04 -08:00
rick
992ec36295
accidental removal
2011-01-11 00:04:38 -08:00
rick
41a21efe9f
don't attempt to serve public assets from sinatra
2011-01-10 16:44:20 -08:00
rick
0fd639a149
whitespace plugin
2011-01-10 16:44:07 -08:00
Hugo Duncan
32d1f9eb2f
Add parsing of org-mode [[file:path.org][label]] links
2011-01-07 23:59:36 -05:00
eston
cc85879810
Don't short circuit now
2011-01-04 17:15:13 -08:00
eston
74a58ce8b5
Turn off debug mode in editor by default
2011-01-04 17:10:42 -08:00
eston
a93a2fb53d
Merge branch 'master' of github.com:github/gollum
2011-01-04 13:49:16 -08:00
Eston Bond
ea49ef806b
Fail nicely with a malformed language definition, play by Crockford's rules
2011-01-03 16:48:42 -08:00
rick
21332010ab
new textmate whitespace killa
2011-01-03 15:52:27 -08:00
rick
f7b7d0d965
add mediawiki support
2011-01-03 15:52:13 -08:00
rick
87da1eaa6d
apparently gemfile.lock is baddd
2011-01-03 14:54:51 -06:00
rick
4fa3951718
fix tests for normalize_dir
2010-12-31 12:30:23 -06:00
rick
6ffff4e586
Merge branch 'master' of https://github.com/jondot/gollum into jondot-master
2010-12-31 12:25:48 -06:00
rick
e641f69589
add test for BlobEntry.normalize_dir
2010-12-31 12:25:18 -06:00
jondot
096edd20da
fixing dir normalization under windows
2010-12-31 19:21:54 +02:00
rick
491eee7ebd
each test file that clones a repo gets its own repo path
2010-12-21 10:37:04 -08:00
Eston Bond
58a680ab6d
Merge branch 'master' of git://github.com/github/gollum
2010-12-21 02:36:43 -08:00
Eston Bond
d0a4fcb7cd
Merge branches 'redesign' and 'master'
2010-12-21 02:34:48 -08:00
Eston Bond
ed38357ac8
Reset type size for syntax highlighting
2010-12-21 02:33:57 -08:00
Eston Bond
3a6d98aa37
Fix font size in sidebar
2010-12-21 02:33:20 -08:00
Eston Bond
9004e21d93
Goodbye, scratch directory
2010-12-13 14:35:05 -08:00
Eston Bond
8b032f03f2
Adding absent link color
2010-12-13 14:34:44 -08:00
Eston Bond
87be3ff414
Fix line heights of captions
2010-12-13 14:27:22 -08:00
Eston Bond
55aaa5ee08
Fix deprecated style classes
2010-12-13 14:25:43 -08:00
Eston Bond
d934ed9d80
Fix checkbox selector
2010-12-13 14:07:48 -08:00
Eston Bond
6a60bd9544
Put revert action where it should be
2010-12-13 13:58:01 -08:00
rick
32b938905e
better html structure for the compare action menu
2010-12-09 18:26:27 -08:00
rick
0f15a05ee6
search page has no edit/history links
2010-12-09 18:23:47 -08:00
rick
17a57b8071
show appropriate error message when revert wont apply
2010-12-09 18:11:46 -08:00
rick
d0475a45ed
add revert button, omg its fugly
2010-12-09 18:06:11 -08:00
rick
19ef3710c3
fix compare view if there is no diff between 2 versions
2010-12-09 17:52:01 -08:00
rick
8769e3475b
it does not assume you want to revert the parent of the first sha when reverting 2 shas
2010-12-09 17:21:09 -08:00
rick
979d89a23f
add revert action
2010-12-09 17:19:18 -08:00
rick
1875eef8f6
update frontend tests to use sample 'revert' repo
2010-12-09 17:00:52 -08:00
rick
79a1fb860d
add ability to change footer and sidebar of page
2010-12-09 16:49:03 -08:00
rick
6edd327ff0
refactor page update logic
2010-12-09 16:29:43 -08:00
rick
511b62c5ab
add page rename test
2010-12-09 16:29:18 -08:00
rick
0b37597834
helps if the test has some kind of assertion
2010-12-09 16:22:37 -08:00
rick
ff1c8868dc
add duplicate page test
2010-12-09 16:20:34 -08:00
rick
f5480c21d2
fix previews
2010-12-09 16:15:28 -08:00
rick
2c8be3d95b
add tests for creating/updating wikis, fix page name bug along the way
2010-12-09 16:11:12 -08:00
rick
aeb90c6293
use expand_path so ruby doesnt load helper.rb twice
2010-12-09 13:58:51 -08:00
rick
8946d098f9
fix the page editor to show footer/sidebar content
2010-12-09 13:31:51 -08:00
rick
f222bbcbac
extract page revert tests to a separate file
2010-12-09 13:31:22 -08:00
Eston Bond
319fb4dc3f
Add code block styling (for syntax highlighter)
2010-12-08 16:36:59 -08:00
Eston Bond
8022208c47
Add syntax highlighting to template
2010-12-08 16:35:59 -08:00
Eston Bond
d7daa331bd
Change revert nomenclature to reset
2010-12-08 16:33:56 -08:00
Eston Bond
88a41a3870
Disable help animations in IE since weird crap happens to aliasing with opacity animations
2010-12-08 16:01:22 -08:00
Eston Bond
4bc9f70eba
Merge branch 'redesign' of github.com:eston/gollum into redesign
2010-12-08 15:56:07 -08:00
rick
e2fbac96cb
sometimes reverts fail, yo
2010-12-08 15:55:35 -08:00
Eston Bond
db8717d1a3
Fix padding of gollum editor
2010-12-08 15:55:31 -08:00
Eston Bond
86b09307c4
Whoops, prevent default
2010-12-08 15:43:11 -08:00
Eston Bond
875e57b366
Hide new page unless JS is loaded
2010-12-08 15:42:00 -08:00
rick
d436f5f112
cleanliness is next to godliness
2010-12-08 15:40:57 -08:00
Eston Bond
079917449a
Add Create New Page dialog
2010-12-08 15:40:45 -08:00
rick
a8f74a7e7c
awkwardly named method
2010-12-08 15:39:41 -08:00
rick
9843f4c739
use grit's #apply_patch method
2010-12-08 15:37:22 -08:00
Eston Bond
53c2fee24f
Remove unused file
2010-12-08 15:30:58 -08:00
Eston Bond
c42091870b
Remove unused file
2010-12-08 15:30:19 -08:00
Eston Bond
d8fed1ee84
Changing formatting to be more tolerant
2010-12-08 15:23:41 -08:00
rick
074b2119fa
use a temp GIT_INDEX_FILE when working with the real git index (during reverts)
2010-12-08 15:17:18 -08:00
rick
057baac3ce
rm cloned git paths
2010-12-08 15:03:21 -08:00
rick
25a56725f9
add ability to revert wiki pages
2010-12-08 14:57:29 -08:00
rick
54eca090ee
do or do not
2010-12-08 13:35:16 -08:00
rick
d4da0f8670
explicitly set the local var for 1.9
2010-12-08 13:28:20 -08:00
rick
e7d37eaf38
refactor common index-writing logic in wiki update methods
2010-12-08 13:24:15 -08:00
rick
5bb7417495
unnecessary test files
2010-12-08 08:48:38 -08:00
rick
a657b12a88
revert last commit due to parsing issues
2010-12-07 15:29:25 -08:00
Eston Bond
2c932cee5d
Get dialogs working in IE
2010-12-07 14:05:12 -08:00
rick
5e0919efe1
remove unused method that breaks due to dependence on unreleased grit. whew
2010-12-07 13:26:18 -08:00
Eston Bond
5cb54e0a36
Merge branch 'redesign' of github.com:eston/gollum into redesign
2010-12-07 13:19:33 -08:00
Eston Bond
2de9f5f396
Fixing backreference bug in WebKit
2010-12-06 18:03:26 -08:00
rick
0472a95ac0
fix some 'create' view errors if @page is nil
2010-12-06 17:58:40 -08:00
rick
6bada4cef5
useless
2010-12-06 17:43:22 -08:00
Eston Bond
641605b9fa
Whoops, bad copy/replace job
2010-12-06 16:13:29 -08:00
Eston Bond
05f259cee8
Change regexes in language definitions to strip trailing spaces in Windows textareas
2010-12-06 16:11:19 -08:00
Eston Bond
add9402b7e
Change regex replacement methods to allow for replacement at cursor
2010-12-06 16:10:58 -08:00
Eston Bond
c5631ae376
Get MathJax workin'
2010-12-06 14:37:11 -08:00
Eston Bond
8e432f1abd
2010-12-06 15:36:27 -07:00
Eston Bond
9e00acc60e
2010-12-06 15:36:16 -07:00
Eston Bond
389b7cbbe1
2010-12-06 15:35:57 -07:00
Eston Bond
57d40c48e3
Add has_sidebar/has_footer to editor
...
Get data-markup-lang attribute working dynamically
2010-12-04 16:20:49 -08:00
Eston Bond
6cc398ae26
IE7/8: Align buttons, fix compare overflow issue
...
WebKit: Restyle search query box
2010-12-04 16:07:30 -08:00
Eston Bond
8879f95f39
Merge branch 'redesign' of github.com:eston/gollum into redesign
2010-12-04 00:19:13 -08:00
Eston Bond
4d9e48b9a5
I hate Internet Explorer
2010-12-04 00:13:42 -08:00
Eston Bond
8a954f4435
IE7/8: Simplify textRange
2010-12-03 22:46:59 -08:00
Eston Bond
f952c5feef
better text
2010-12-03 23:34:43 -07:00
Eston Bond
0d6c4e2f89
ACTUALLY update TODO
2010-12-03 22:28:54 -08:00
Eston Bond
a42a30e232
Update TODO
2010-12-03 22:28:34 -08:00
Eston Bond
9feb553196
IE7/8: Fix replacement text selection
2010-12-03 22:27:25 -08:00
Eston Bond
d4a78db017
IE7/8: Fix selection range function
2010-12-03 22:20:25 -08:00
rick
d32ab724d3
Don't modify content inside <pre> tags during rendering.
2010-12-02 19:28:31 -08:00
rick
7a0f6333d6
busted
2010-12-02 18:26:37 -08:00
rick
948cfa0f01
add sidebar methods to the Page mustache view
2010-12-02 18:25:31 -08:00
rick
2cbe3957cf
add Page _Sidebars
2010-12-02 18:16:37 -08:00
rick
2f648d05b4
Merge branch 'master' into redesign
2010-12-02 17:54:25 -08:00
rick
280afb42ea
extract sub-page logic from Gollum::Page#footer
2010-12-02 17:53:16 -08:00
rick
09d62fa327
history lesson
2010-12-02 14:57:38 -08:00
rick
2fe6b7b7f1
provide access to the parsed Nokogiri document fragment when rendering marked up content.
2010-12-02 14:47:20 -08:00
rick
bffa4be78f
re-use Sanitize instances in Gollum::Markup
2010-12-02 14:40:24 -08:00
rick
76064da131
A Gollum::Wiki saves Sanitize instances
2010-12-02 14:35:31 -08:00
Eston Bond
7976a6fc44
Fix markdown image so it displays the right field
2010-12-01 18:33:14 -08:00
Eston Bond
4fb36dc263
Hide help if there is no help definition for the given language
2010-12-01 18:27:20 -08:00
Eston Bond
4222289236
Have editor function bar fail nicely to bad language definitions
2010-12-01 18:18:24 -08:00
Eston Bond
c11c61c286
Clean up stuff in IE7/8
2010-12-01 16:45:44 -08:00
Eston Bond
1fa490abc0
2010-12-01 17:35:50 -07:00
Eston Bond
449515792a
Adding help for ASCIIDoc, fixing pod help
2010-12-01 15:40:54 -08:00
Eston Bond
d4cba8aeb2
Finally finished pod documentation
2010-11-30 16:10:32 -08:00
Eston Bond
4e9fa6d03a
2010-11-27 16:47:50 -07:00
Eston Bond
d1d7405190
2010-11-27 14:28:10 -07:00
Eston Bond
b399538f80
2010-11-27 14:14:42 -07:00
Eston Bond
d78f56db86
2010-11-27 14:07:10 -07:00
Eston Bond
b6da078ca3
2010-11-27 14:06:42 -07:00
Eston Bond
61b1c7f8d1
2010-11-27 14:05:45 -07:00
Eston Bond
e8f0f01a1d
Merge branch 'redesign' of github.com:eston/gollum into redesign
2010-11-27 13:04:40 -08:00
eston
4b6eb34504
Make help and gollum action work the same, bind to 0.0.0.0
2010-11-27 12:59:29 -08:00
Eston Bond
1351f3743c
Monday is code tedium day: commenting the editor
2010-11-22 18:01:01 -08:00
Eston Bond
e49309d3f7
Completing inline help for Textile
2010-11-22 16:26:38 -08:00
rick
db2a6deca9
tomdoc reorg for git_access.rb
2010-11-20 14:14:47 -08:00
rick
4dda9fb2ae
tomdoc'd
2010-11-20 13:08:39 -08:00
Eston Bond
790ee5d636
Adding a comment
2010-11-18 18:52:35 -08:00
Eston Bond
652f68bb54
Markdown has help now
2010-11-18 16:41:31 -08:00
Eston Bond
9fc3e8a2ff
Sick of this crap in Firefox
2010-11-17 01:56:12 -08:00
Eston Bond
aff6d09cfc
Fun with box shadows?
2010-11-17 01:54:25 -08:00
Eston Bond
cd73378748
Yeah, I need to sleep
2010-11-17 01:47:49 -08:00
Eston Bond
3f36921186
Updating TODOs… not too much left
2010-11-17 00:56:41 -08:00
Eston Bond
4a990330dc
Inline help engine complete; beginnings of Markdown inline help
2010-11-17 00:55:08 -08:00
Eston Bond
c993099c9c
Beginnings of Help display generation, inline help for Markdown
2010-11-16 17:25:30 -08:00
Eston Bond
456fc4de57
Template out inline help functionality
2010-11-16 16:00:17 -08:00
Eston Bond
2658364ca7
Compare needs back to page history button on bottom, too
2010-11-15 19:59:50 -08:00
Eston Bond
ac68dd0f73
Adding help button to editor
2010-11-15 19:57:53 -08:00
Eston Bond
b838d678a1
Style compare revisions page
...
modified: ../../scratch/css/gollum.css
2010-11-15 19:57:16 -08:00
Eston Bond
6ed5899601
Add layout to compare revisions page
2010-11-15 19:21:07 -08:00
Eston Bond
4ff4358729
Fix the fact I overwrote the search icon in the sprite
2010-11-15 19:20:31 -08:00
Eston Bond
5d6c9c5943
Add help button to menubar
2010-11-15 16:17:51 -08:00
Eston Bond
ce27400125
Add Help icon to icon sprite
2010-11-15 16:12:26 -08:00
Eston Bond
f6bb61f999
killin' TODOS
2010-11-15 16:04:55 -08:00
Eston Bond
6aace6f21f
Add Page Preview, fix weirdness in app.rb
2010-11-15 16:03:26 -08:00
Eston Bond
03569e3134
Hook up format selector
2010-11-15 15:01:12 -08:00
Eston Bond
aa0d9c3652
Upgrade jquery to 1.4.4 to fix getScript in FF4
2010-11-15 13:11:23 -08:00
Eston Bond
01e3f7b4f7
Hook up compare revisions selector
2010-11-15 13:07:57 -08:00
Eston Bond
ee8d72a137
Fix searchbar, remove all hellips from shortened shas
2010-11-12 16:08:09 -08:00
Eston Bond
ae89b245ea
s/revision/commit/
2010-11-12 16:06:41 -08:00
Eston Bond
36f890d28d
Add search results page
2010-11-12 16:01:29 -08:00
Eston Bond
18b648a7b0
Add Search placeholder
2010-11-12 15:11:57 -08:00
Eston Bond
6a9c9ac0fe
Pull Placeholder out of editor, too
2010-11-12 15:09:15 -08:00
Eston Bond
1aeabc79b8
Add search action
2010-11-12 15:01:20 -08:00
Eston Bond
f8edc0d33a
Style new search box
2010-11-12 14:55:02 -08:00
Eston Bond
46ab67b211
Adding searchbar markup
2010-11-12 14:17:56 -08:00
Eston Bond
42c7058ecc
Fix JSLint issues in Dialog; add revert dialog on history page
2010-11-12 14:04:58 -08:00
Eston Bond
c8f6059abf
Fix visited links
2010-11-12 14:04:33 -08:00
Eston Bond
3d30cffee6
Adding abstracted dialog CSS
2010-11-12 14:04:22 -08:00
Eston Bond
5ff5212148
Comments, oops
2010-11-12 13:39:05 -08:00
Eston Bond
62c5de1414
Re-namespace Gollum Dialogs
2010-11-12 13:38:32 -08:00
Eston Bond
00a934b85d
Abstracting Dialog out of editor
2010-11-12 13:37:59 -08:00
Eston Bond
1a2ba11abe
Meh, whitespace
2010-11-11 16:21:53 -08:00
Eston Bond
ba35b2249c
Hide MathJax loading messages
2010-11-11 16:15:43 -08:00
Eston Bond
530700932f
Adding to Pod
2010-11-11 16:15:04 -08:00
Eston Bond
4afc7dce64
Fix nodeSelector bug where out-of-range node is selected
2010-11-11 16:14:29 -08:00
Eston Bond
8b0590ff8e
Reintegrate MathJax
2010-11-10 17:26:12 -08:00
Eston Bond
a9ea80f430
Commenting is wrong
2010-11-10 17:10:02 -08:00
Eston Bond
24e1305fe4
Basic Pod definition file
2010-11-10 17:09:30 -08:00
Eston Bond
6d11f1bc85
Adding basic rdoc editor definition
2010-11-10 17:00:17 -08:00
Eston Bond
91313962ed
Updating TODO
2010-11-10 15:06:50 -08:00
Eston Bond
c04d22675b
Don't select checkboxes between ranges
2010-11-10 15:06:07 -08:00
Eston Bond
a37272d4e5
Select revision ranges instead of individual revisions
2010-11-10 15:00:08 -08:00
Eston Bond
e019a38621
Fix CSS bug where long commit messages break checkbox padding
2010-11-09 19:36:30 -08:00
Eston Bond
d6d4e8b26a
Getting edit/create flows working, changing flag names
2010-11-09 19:33:50 -08:00
Eston Bond
6a3522c0be
Add error page CSS
2010-11-09 19:28:16 -08:00
Eston Bond
dff6121a5b
updating TODO
2010-11-09 19:28:01 -08:00
Eston Bond
fcbb54772b
Recursion problem fixed
2010-11-09 19:26:50 -08:00
Eston Bond
404ec5935e
Adding error page
2010-11-09 18:45:42 -08:00
rick
ec4b93be95
update todos
2010-11-09 14:53:21 -08:00
rick
b9aad7e2c9
Merge branch 'master' of github.com:eston/gollum into eston
2010-11-09 14:16:41 -08:00
rick
0b8bc597a7
merge latest tweaks to master
2010-11-09 12:39:28 -08:00
rick
39d16b8c43
Merge branch 'text_data_method' of https://github.com/hiroshi/gollum into hiroshi-text_data_method
2010-11-09 12:19:29 -08:00
rick
f276dd0fb6
bundler support, using gemspec
2010-11-09 12:17:34 -08:00
rick
38a5c296d7
update history
2010-11-09 12:14:00 -08:00
rick
d41cff3ef8
Merge branch 'local_config' of https://github.com/okbreathe/gollum into okbreathe-local_config
2010-11-09 12:12:55 -08:00
rick
648aade4d6
update history
2010-11-09 12:09:13 -08:00
rick
3b94a6723c
integrate Sanitization class
2010-11-09 12:07:54 -08:00
Eston Bond
34b75c2a60
Changing display of page title depending on edit/create state
2010-11-08 14:48:04 -08:00
Eston Bond
46104dcb83
Fixing some CSS bugs
2010-11-08 14:34:52 -08:00
Eston Bond
92aa7f2cd7
Write a small message here explaining this change. (Optional)
2010-11-08 15:26:58 -07:00
Eston Bond
83e5c7fe5d
Fixing sprite BG
2010-11-08 14:03:39 -08:00
Eston Bond
bc00c0f2ae
Adding footer and sidebar fields to editor
2010-11-08 13:57:48 -08:00
rick
740ed4362b
only allow <a> to have href and <img> to have src
2010-11-05 16:46:44 -07:00
Eston Bond
055e80bbee
Build a rudimentary placeholder engine into the editor
2010-11-04 17:06:46 -07:00
Eston Bond
a24d1ca78e
Adding history field
2010-11-04 16:47:20 -07:00
Eston Bond
a1c6829cfc
Added title field for create page
2010-11-04 16:27:53 -07:00
Eston Bond
ca5bf8b31e
Beginning of gollum redesign
2010-11-04 14:10:58 -07:00
Eston Bond
c9870fb6cb
Finally done with this editor style
2010-11-04 13:32:22 -07:00
Eston Bond
b03d361f0e
Editor dialog style complete
2010-11-03 23:50:56 -07:00
Eston Bond
ff4fc6f708
Well well. We have a functional editor. Now some CSS.
2010-11-03 16:52:14 -07:00
Eston Bond
4f166dc144
Fixing markup defs to conform to new OK event style
2010-11-03 16:36:47 -07:00
Eston Bond
bc0c611ea4
Using jQuery dev, got editor OK events working in dialog
2010-11-03 16:31:30 -07:00
Eston Bond
338c51e019
Egregious bugs
2010-11-03 15:18:52 -07:00
Eston Bond
8645927cbc
Adding textile definition
2010-11-03 15:00:20 -07:00
Eston Bond
649393eb6e
Don't need this plugin anymore
2010-11-03 14:52:02 -07:00
Eston Bond
742ca5e6dc
Adding creole & asciidoc
2010-11-03 14:51:33 -07:00
Eston Bond
9ffa79e44e
Adding this before my battery dies
2010-11-02 16:37:46 -07:00
Eston Bond
6c76ba20a2
keep things event-driven
2010-11-01 18:52:28 -07:00
Eston Bond
ca92b0a8c6
Adding little format box, new markdown exec syntax
2010-11-01 18:28:34 -07:00
Eston Bond
402eb2edaa
Bad console.log! Bad!
2010-11-01 15:53:06 -07:00
Eston Bond
b4006ec007
Most of the editor css, working editor
2010-11-01 15:32:46 -07:00
Tom Preston-Werner
74b7248334
Use @wiki.page_class in Gollum::Markup where appropriate. Fixes #63 .
2010-10-28 15:15:34 -07:00
Tom Preston-Werner
996f81d63d
Release 1.1.0
2010-10-28 12:18:27 -07:00
Eston Bond
135156cea5
Adding code replacement techniques
2010-10-27 17:29:11 -07:00
Eston Bond
c9cc0d3d37
Added markdown definition, workin' on the editor
2010-10-27 16:47:30 -07:00
Eston Bond
0b1f1a5338
Beginnings of new editor
2010-10-27 16:03:16 -07:00
7rans
ac1d1c47e2
fix misspelling of sanitization
2010-10-27 14:20:33 -04:00
7rans
3e8d2773be
allow deactivation of sanitization
2010-10-27 14:17:24 -04:00
7rans
26df05374c
provide customizable sanitization
2010-10-27 14:04:26 -04:00
Eston Bond
927b012d6c
Tightening up table
2010-10-25 18:52:45 -07:00
Eston Bond
e0c1ea0ec1
Adding rudimentary hover anims on history
2010-10-25 18:49:24 -07:00
Eston Bond
67651afb48
This should do
2010-10-25 16:57:33 -07:00
Eston Bond
d0b793366f
Looks like UA detection is necessary for CSS
2010-10-25 16:52:31 -07:00
Eston Bond
1227dd6841
Hmm, these lists will conflict with commenting
2010-10-25 16:05:38 -07:00
Eston Bond
b9d44662fa
This is cute
2010-10-25 15:56:46 -07:00
Eston Bond
21ff30af4d
Shadows, minibuttons and more
2010-10-25 15:54:42 -07:00
Eston Bond
3b6b06a599
Basic text formatting
2010-10-25 14:46:52 -07:00
Eston Bond
60901ddd75
Added history, page
2010-10-22 17:50:44 -07:00
Eston Bond
3260c120c1
Adding boilerplate files
2010-10-22 17:24:16 -07:00
Eston Bond
23ec55cd52
Adding my scratch directory
2010-10-22 17:03:47 -07:00
Asher Van Brunt
738d171f6b
Resolve Issue 15: Allow passing configuration option
2010-10-14 19:09:22 -07:00
rick
1a19278fc7
GitAccess#tree should always return an array
2010-10-13 12:06:23 -07:00
rick
54917bbdb9
recover from bad shas
2010-10-13 09:52:04 -07:00
rick
497b36ad2b
give the markup caching methods a bit more info
2010-10-12 15:46:55 -07:00
rick
e7f2da2d4a
add caching hooks for Gollum::Markup
2010-10-12 15:36:36 -07:00
rick
94c3ac767e
Merge branch 'master' into exp
2010-10-12 10:22:56 -07:00
rick
f2ed24ef8c
extract multi_commit! method from GitAccess
2010-10-12 10:02:48 -07:00
Marko Anastasov
16ef859073
Ignore case when matching image paths.
...
Otherwise images with file extensions in caps don't get rendered.
2010-10-12 12:07:07 +02:00
rick
c6dc4acc02
add extension points for GitAccess caching
2010-10-11 18:05:02 -07:00
rick
b7474b7e41
Merge branch 'master' into exp
2010-10-11 17:40:27 -07:00
rick
e7b1265873
Gollum::Wiki#size returns 0 if the repo is invalid or empty
2010-10-11 17:40:09 -07:00
rick
b8a50c0ccc
updated experimental gemspec
2010-10-11 17:03:44 -07:00
rick
300d8eacc5
optimize Gollum::Wiki#tree_list
2010-10-11 16:58:46 -07:00
rick
6552323797
implement GitAccess#commits using grit head
2010-10-11 16:58:46 -07:00
rick
a92a882021
restore ref_map and tree_map tests
2010-10-11 16:58:46 -07:00
rick
ebf7855c09
integrate Gollum::GitAccess
2010-10-11 16:58:46 -07:00
rick
62c4b795be
add basic GitAccess class
2010-10-11 16:58:46 -07:00
rick
c0f8c897e7
update gemspec file listing
2010-10-11 16:58:22 -07:00
Hiroshi Saito
dc7693dbd0
FIX: Sanitize.clean raise Encoding::CompatibilityError if a page contains non ASCII-7 characters
2010-10-08 23:39:18 +09:00
Hiroshi Saito
f8e7fcf2d2
FIX: results of Wiki#search contains files out of page_file_dir
2010-10-07 23:01:27 +09:00
Hiroshi Saito
fcdffc39ff
Added --page-file-dir option to gollum command
2010-10-07 17:55:40 +09:00
rick
33aad801bd
update history
2010-10-06 13:20:29 -07:00
rick
dd7dddddcf
Revert "Gollum::Wiki#pages come back sorted by title, not permalink or the default ordering from git ls-tree."
...
This reverts commit e37a8b9da4 .
2010-10-06 13:17:47 -07:00
Tim Sharpe
4cad535baa
Tomdoc'd
2010-10-01 16:18:09 +10:00
Tim Sharpe
5fc3c298c1
Some docs for the README
2010-10-01 16:10:24 +10:00
Tim Sharpe
e5fe89a4fd
Simple test case
2010-10-01 16:05:20 +10:00
Tim Sharpe
ccaea78901
Helps if I commit this bit too
2010-10-01 15:44:53 +10:00
Tim Sharpe
1111dbb9a2
Holy crap, it works
2010-10-01 15:44:32 +10:00
rick
251d5c8201
add to history
2010-09-30 17:20:31 -07:00
rick
4dbe3ea844
ensures rel="nofollow" is added to all anchors if a page is retrieved with a SHA
2010-09-30 17:19:37 -07:00
rick
cc929bbc56
tomdoc'd
2010-09-30 15:36:14 -07:00
rick
5e59e39d67
add to history
2010-09-30 15:32:38 -07:00
rick
05a7b4c06c
Allow users to pass anchors to page links.
...
http://github.com/github/gollum/issues/\#issue/21
2010-09-30 15:32:02 -07:00
rick
7924db8e01
mention cgi escapage and git grep in the history
2010-09-30 14:26:27 -07:00
rick
4b313944fe
merge
2010-09-30 14:22:18 -07:00
rick
9786f5f347
Merge branch 'master' into special-chars-in-page-names
2010-09-30 14:02:39 -07:00
Tom Preston-Werner
42985dc5c1
Explicitly set default port to 4567.
2010-09-29 14:42:24 -07:00
Tom Preston-Werner
ee6b71ff80
Change 'bind' CLI option to 'host'. Set default to 127.0.0.1. Closes #47 .
2010-09-29 14:40:36 -07:00
Tom Preston-Werner
cdf75d20ef
Merge remote branch 'etaque/sinatra-options'
2010-09-29 13:56:03 -07:00
Tom Preston-Werner
1e2932fd21
Merge remote branch 'henrikh/test-sections'
2010-09-29 13:09:08 -07:00
rick
4bb7d53854
history update
2010-09-16 09:23:02 -07:00
rick
e37a8b9da4
Gollum::Wiki#pages come back sorted by title, not permalink or the default ordering from git ls-tree.
2010-09-16 09:16:42 -07:00
Emilien Taque
48bfe954d1
add Sinatra --bind option through gollum binary
2010-09-15 22:53:15 +02:00
rick
9cc8790d4f
history lesson
2010-09-13 16:09:05 -07:00
rick
d51f42e647
theres no blank? in ruby
2010-09-13 15:49:10 -07:00
rick
430436ce8d
handle non strings passed to Page.cname
2010-09-13 15:48:54 -07:00
rick
e774ceaf1f
dont bomb when trying to find a page with a blank name
2010-09-12 20:04:21 -07:00
rick
42bd6c221a
invalid shas return empty treemaps
2010-09-03 10:59:30 -07:00
Paul Baumgart
50e9a42503
fix documentation for Wiki.size
2010-09-02 20:30:13 -07:00
Paul Baumgart
5fcb5d971a
Add support for RFC 1738 special characters in page names.
...
Escape all links and redirects to support this. Some changes to app.rb
necessary for correct routing by Sinatra.
2010-09-01 22:02:19 -07:00
Jon Frisby
e9239050e0
Properly handle pages that exist in sub-dirs in search results
2010-08-31 10:48:10 +02:00
Jon Frisby
50c207ad91
Update gemspec with search files
2010-08-31 10:47:51 +02:00
rick
7c70174725
handle invalid options
2010-08-30 18:50:02 -07:00
rick
e0d234c255
use grit to get the file's mime type, as suggested.
...
http://github.com/github/gollum/commit/6de9ddfd3f79a9cb320aab3c43b8e0a912107b2e#commitcomment-137656
2010-08-30 18:25:48 -07:00
rick
bf37f44970
pull default name/email for commits from wiki repo's git config
2010-08-30 18:11:03 -07:00
rick
847e6c00a4
Merge branch 'master' of github.com:github/gollum
2010-08-30 18:04:36 -07:00
Jon Frisby
6de9ddfd3f
Make an attempt at setting a proper mime-type when showing a file.
...
Prevents things like having the browser show raw binary data when you have a PDF in your repo.
2010-08-31 09:04:27 +08:00
Jon Frisby
1f8a67598a
Use Grit to determine committer instead of executing a sub-shell and calling the git CLI.
2010-08-31 09:04:27 +08:00
Jon Frisby
515f8610c4
Make --version not cough up a furball.
...
Commit 8c625419b8 moved the require down,
which broke --version.
2010-08-31 08:59:56 +08:00
rick
ba18cbebe8
more tree_map tests
2010-08-30 17:56:03 -07:00
rick
646c8e21b2
Add Wiki#size to efficiently count pages without loading them.
2010-08-30 17:52:20 -07:00
rick
6dab4f7fe6
Wiki#pages uses the treemap
2010-08-30 17:45:32 -07:00
rick
7e2b1fdbc6
Wiki#tree_map_for returns an array of BlobEntry instances
2010-08-30 17:31:19 -07:00
rick
6f077702e1
Page#find_page_in_this_tree is redundant
2010-08-30 17:04:30 -07:00
Dean Strelau
f4c4b2e49c
Update development dependencies. Closes github#18
...
Tests require a few markdown libraries to pass.
2010-08-30 16:38:01 -07:00
Tom Preston-Werner
db1ccc4525
DRY up test commit details.
2010-08-30 16:38:01 -07:00
Tom Preston-Werner
dddb73672a
Minor readme typo and various whitespace fixups.
2010-08-30 16:38:01 -07:00
Tom Preston-Werner
94f05b0796
Update working dir (if present) when edited via the API. Closes #6 .
2010-08-30 16:37:59 -07:00
Sirupsen
6d3b40c1d4
Using Grit instead of backticked bash.
...
A bit unclear what's going on though, would be more explicit to say:
{:count => query}, however Grit::Git#transform_options converts to this
syntax:
`--count='query'` and `git grep` can't take this syntax, it has to be:
`git grep --count query`, and this is why we're using :c, and not
:count. As {:c => query} converts to: `git grep -c 'query'` which works
as expected.
Linked to this commit, for above information in comment.
Updated comment in Wiki.search to link describing commit.
2010-08-29 15:25:04 +02:00
Sirupsen
45eb364a6d
Refactoring of Wiki.search.
2010-08-29 14:30:30 +02:00
Henrik Hansen
959f02b50e
Use correct capitalization of TeX
2010-08-29 14:26:14 +02:00
Henrik Hansen
49d88a0370
Add search API and update frontend
...
The frontend has been updated to use the new search API.
2010-08-29 13:58:06 +02:00
Henrik Hansen
ed41152228
Refactor of search view
2010-08-29 13:54:38 +02:00
Henrik Hansen
294847ed99
Remove display of search code
2010-08-29 13:54:21 +02:00
Henrik Hansen
8301428974
Add sections to clean up markup test code
2010-08-29 10:08:08 +02:00
rick
0500c7e10c
cache the ref => sha lookup
2010-08-24 12:39:26 -07:00
rick
3eeed9ba1e
update Wiki#find_page_in_tree to use cached tree map
2010-08-24 12:15:11 -07:00
rick
292f6ec8dc
update Wiki#find_page_in_this_tree to use the new cached tree map.
2010-08-24 11:47:20 -07:00
rick
068a902a00
don't modify path names in cached wiki treemaps
2010-08-24 11:47:02 -07:00
rick
d606511fdf
use cached tree map when finding files
2010-08-24 11:29:39 -07:00
rick
cc3d9529cc
add a cached Wiki#tree_map_for method
2010-08-24 11:24:49 -07:00
rick
74ca65b045
history updates
2010-08-23 16:39:10 -07:00
rick
05283347b0
more descriptive irb output
...
also, code poetry arguments
2010-08-23 16:35:17 -07:00
rick
99995f7364
convert $path global to a gollum_path sinatra setting
2010-08-23 16:16:39 -07:00
rick
8c625419b8
add irb option for the cli script
2010-08-23 16:13:38 -07:00
Henrik Hansen
d1003f5331
Change search-field to use type="search"
...
The search-field will now show with a little magnifying-glass on Webkit
based browsers.
type="search" is part of HTML5.
2010-08-23 16:59:47 +02:00
Tobias Adam
4905ce99da
Add a very rough and dirty search mechanism that uses Git’s grep.
2010-08-22 23:17:54 +02:00
Tom Preston-Werner
48b143c6ed
Update history for massive performance optimization.
2010-08-19 18:21:26 -07:00
Tom Preston-Werner
dae2e0c79c
Remove obsolete tree map methods.
2010-08-19 17:40:05 -07:00
Tom Preston-Werner
9b32d3bfb1
Update Wiki#delete_page to use Index#read_tree awesomes.
2010-08-19 17:37:49 -07:00
Tom Preston-Werner
b1fc173a3f
Update Wiki#update_page to use Index#read_tree goodness.
2010-08-19 17:35:18 -07:00
Tom Preston-Werner
6a53e3d037
Clean up some whitespace.
2010-08-19 15:43:26 -07:00
Tom Preston-Werner
15879a5a88
Use Index#read_tree for Wiki#write_page instead of rebuilding the entire index.
2010-08-19 15:42:36 -07:00
rick
c6e2acbf62
history is written by the victors
2010-08-16 17:39:17 -07:00
rick
28a29f49f2
Gollum::Wiki#add_to_tree_map updates pages if a file with the matching name + extension exists
2010-08-16 17:37:53 -07:00
Tom Preston-Werner
acdb04ba4e
Handle duplicate page error in frontend. Closes #10 .
2010-08-16 16:54:01 -07:00
rick
dd30a7bdc2
fix markup on framed absolute image urls
2010-08-16 15:49:47 -07:00
rick
c7e172f5ca
can't access trees as files
2010-08-16 14:57:39 -07:00
rick
c69a5f80dd
prevent Gollum::Wiki instances from creating new pages that overwrite pages with the same name.
2010-08-16 07:56:46 -07:00
rick
ee04dd84aa
normalize commit hashes so they at least show 'anonymous' if no git user is set.
2010-08-16 07:36:32 -07:00
Tom Preston-Werner
763387979a
Update history for op4g/1.9_compat.
2010-08-15 11:54:02 -07:00
Chris Hoffman
4e3b4e23da
Ruby 1.9 compatibility
...
* Adds current directory to load path for tests because 1.9 does not
* Aliases String#lines to String#to_a under 1.8 to match 1.9 behavior
* Sets encoding magic comment in test file with characters outside ascii
* Require 'ostruct' explicitly
This depends on a patch to Grit to have full functionality through the
whole stack.
2010-08-14 21:37:00 +00:00
Tom Preston-Werner
8b0c971552
Merge remote branch 'dblugeon/correct_url_markup'
2010-08-14 11:34:18 -07:00
Tom Preston-Werner
f4069f1dfb
Update history for rgrove/newer-sanitize.
2010-08-14 11:17:41 -07:00
Tom Preston-Werner
3d730295b3
Merge remote branch 'rgrove/newer-sanitize'
2010-08-14 10:57:09 -07:00
rick
edcfdfa402
return nil for bad file version
2010-08-13 16:11:37 -07:00
dblugeon
45446f3481
update the source code url of github markup
2010-08-13 18:23:57 +02:00
Tom Preston-Werner
2a905cedc9
Release 1.0.1
2010-08-12 16:04:51 -07:00
Ryan Grove
f159c54dc8
Increase minimum Sanitize version requirement to 1.1.0.
...
1.0.x versions of Sanitize require Hpricot instead of Nokogiri
and have bugs that may allow non-whitelisted HTML to sneak
through.
2010-08-12 14:18:43 -07:00