wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
2,368 Commits 23 Branches 89 Tags
0d2ab11604792bd718f6ba501e5e6a30e1be95da
Commit Graph

2368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 v4.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 v4.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 v4.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