Commit Graph

2001 Commits

Author SHA1 Message Date
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 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 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
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
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
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
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