0a9b35c039
Restoring config files to repo root
2015-08-12 22:26:20 +02:00
67c64c17d5
README makeover
2015-08-09 19:22:16 +02:00
b4c70a62a9
Removing Home.md due to being a mere lorem ipsum
2015-08-08 15:21:30 +02:00
c9d5921f4e
Moving docs/sanitization.md to the wiki
2015-08-08 15:21:00 +02:00
0f47a4de5d
Removing config.rb due to being pointless
2015-08-08 15:20:35 +02:00
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
73e61dbcff
Changed layout template, to correctly handle custom.js when --page-file-dir is set
2015-08-05 13:26:19 +01:00
ba142e3b19
Merge pull request #1038 from rgroux/development
...
upgrade/update a number of dependencies.
2015-07-27 22:14:55 +02:00
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
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
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
d586567c3b
deps(update): upgrade the useragent version to 0.14
2015-07-27 13:15:50 +02:00
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
d8354faa49
Merge pull request #1035 from rgroux/search
...
Search default query to ''
2015-07-26 20:23:09 +02:00
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
596afe9451
Merge pull request #1034 from mehulkar/patch-1
...
Fix a typo in the readme
2015-07-16 23:35:51 +02:00
f7b5de986a
Fix a typo in the readme
2015-07-16 13:57:11 -07:00
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
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
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
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
279b028c5e
Fix #1012 : /Pages should render Folders First, then files, alphabetically
2015-05-20 18:58:10 -04:00
f268827a2e
Merge pull request #995 from tfogo/html-cleanup
...
Remove extraneous li tags
2015-04-26 19:05:00 +02:00
d8bc065057
Merge pull request #1003 from akston/readme_typo
...
Fix typo in README
2015-04-26 19:04:26 +02:00
6301bbbb66
Fix typo in README
2015-04-25 15:32:30 -07:00
3ad65eaef8
Update README.md
2015-04-11 11:53:59 +02:00
3d1bc7949d
Update README.md
2015-04-11 11:43:40 +02:00
26e092fd20
Update HISTORY.md
2015-04-11 11:42:21 +02:00
be7ddec1b0
Update README.md
2015-04-11 11:40:43 +02:00
5781ac6bbd
Release 4.0.0
2015-04-11 11:32:03 +02:00
a51bc4427a
Merge pull request #994 from repotag/kramdown
...
Move to Kramdown and support JRuby
2015-04-11 11:07:34 +02:00
80854584bb
Make test regex more lenient
2015-04-11 01:29:08 +02:00
93af289d3b
Remove extraneous li tags
2015-04-06 02:40:02 -04:00
a27b882493
Test on jruby
2015-04-06 00:57:18 +02:00
ba6f957692
Move to Kramdown
2015-04-06 00:28:31 +02:00
ec0e1bf26f
Merge pull request #992 from kirat-singh/fix-upload-file-url
...
prepend baseUrl to /uploadFile
2015-04-05 23:34:07 +02:00
e4df298bb4
prepend baseUrl to /uploadFile
2015-04-05 14:22:41 -04:00
804d21e31d
Release 3.1.3
2015-04-04 11:45:17 +02:00
6d33687866
Merge pull request #990 from repotag/issue940
...
Block on no-edit without using middleware
2015-04-03 17:32:20 +02:00
21bb1efb46
Block on no-edit without using middleware
2015-04-03 17:22:51 +02:00
9d0986f1ca
Merge pull request #964 from simonzack/mathjax_livepreview
...
Enable mathjax in live preview
2015-04-02 13:13:25 +02:00
fd483f397f
Merge pull request #988 from andrewarrow/fix_template_dir
...
adding template dir logic to app.rb vs. just the bin
2015-03-30 13:27:54 +02:00
09364850ee
adding template dir logic to app.rb vs. just the bin
2015-03-27 15:13:55 -07:00
4d3a8bad4c
Merge pull request #985 from uraimo/patch-1
...
Fixed two broken links in README.md
2015-03-13 14:40:19 +01:00
cc39b0aa41
Fixed two broken links in README.md
...
The textile site was shut down a few years ago, better refer to wiki for format details.
2015-03-13 14:28:04 +01:00
6fc3b4be75
Merge pull request #970 from repotag/issue969
...
Add root slash to drag-and-drop upload path. Resolves #969 .
2015-01-30 22:13:01 +01:00
af6d690fc8
Add root slash to drag-and-drop upload path. Resolves #969 .
2015-01-30 22:06:31 +01:00
eea5152444
Update README.md
2015-01-30 18:34:18 +01:00
1ca38b625b
Update README.md
2015-01-30 18:33:52 +01:00
f964407c47
Merge pull request #965 from simonzack/ace_hook
...
added an initAce hook to allow configuration of the live editor
2015-01-28 17:00:43 +01:00
SkyCrawl
Dawa Ometto
Joshua Swanson
Bart Kamphorst
GROUX Richard
Mehul Kar
Nathan Lowe
Conor Schaub
Tim Fogarty
Kirat Singh
Andrew Arrow
Umberto Raimondi
Sunny Ripert