Commit Graph

11 Commits

Author SHA1 Message Date
Bart Kamphorst aa16f6ba2a Major CSS/styling overhaul with Primer.css. 2019-08-13 22:10:10 +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 5de2442540 Merge branch '5.x' into critic_markup_styling 2018-11-12 16:39:45 +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
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
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
Matt Hill 51b5a11a54 Fix custom.x path when page-file-dir is not set 2015-08-20 23:19:25 -04: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
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
Jamie Oliver 1f79126b27 Move gollum back end to gollum-lib #647 2013-03-19 22:11:09 +00:00