Commit Graph

2228 Commits

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