Commit Graph

2098 Commits

Author SHA1 Message Date
Bart Kamphorst 1c98a787ab Reopen the tempfile before passing it to Rack::Test::UploadedFile. 2019-09-03 22:03:43 +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
Bart Kamphorst 1a27f04577 Minor fix in handling conflict message in drag-and-drop uploading. 2019-08-29 11:56:34 +02:00
Dawa Ometto 2f2487150a Remove AnchorJS, native anchor styling 2019-08-28 23:51:05 +02:00
Dawa Ometto 6d44bd7bc8 Anchors with AnchorJS 2019-08-28 17:02:12 +02:00
Dawa Ometto e2d9d1f4d5 Add AnchorJS 2019-08-28 17:01:18 +02:00
Dawa Ometto 958410146b Add and rename .erb extension where needed 2019-08-28 17:01:01 +02:00
David Yates 0a9b9ff709 Align symbol for reStructuredText with github-markup (#1406) 2019-08-28 11:16:09 +02:00
Bart Kamphorst bce9800142 Restore upload_file route implementation from b40a344c49. 2019-08-27 20:49:33 +02:00
Bart Kamphorst 7f07f652d4 Also prepare drag-and-drop uploading for conflict detection. 2019-08-27 13:19:19 +02:00
Dawa Ometto 1b5f0b910b Remove FontAwesome 2019-08-27 12:42:21 +02:00
Bart Kamphorst e1aa4c02a0 Fix uploading (#1312). Requires updating git adapters. 2019-08-23 20:24:18 +02:00
Dawa Ometto 976f55e1b2 Pagination for history and latest changes. (#1396)
* Pagination for history and latest changes

* New footer for historical pages

* Fix pagination on history view.

* Do not directly use git adapter

* History view: allow selecting from different pages

* Use log_pagination_options to determine latest changes parameters

* Fix JS pageFullPath
2019-08-21 23:28:49 +02:00
Bart Kamphorst 29a8b893f1 Merge pull request #1399 from repotag/editor_fixes
Fix RTL button. Rename Edit Mode label to Markup.
2019-08-20 12:42:38 +02:00
Bart Kamphorst c991149422 Fix RTL button. Rename Edit Mode label to Markup. 2019-08-19 22:38:54 +02:00
Dawa Ometto 175c0ceab5 Show sidebars in preview (#1398) 2019-08-19 12:08:12 +02:00
Dawa Ometto 9d48ea0079 Fix typo (#1397) 2019-08-18 19:16:06 +02:00
Bart Kamphorst 042ad2d8c4 Merge pull request #1393 from gollum/primer_css
Major CSS/styling overhaul with Primer.css.
2019-08-14 20:24:13 +02:00
Bart Kamphorst 19868a10ef Minor fix for the footer div in preview pages. 2019-08-14 17:07:51 +02:00
Bart Kamphorst 92b17f9053 Removed some inline CSS. Removed footer from preview pages. 2019-08-14 16:39:55 +02:00
Bart Kamphorst 2dc527b60f Merge branch 'primer_css' of https://github.com/gollum/gollum into primer_css 2019-08-14 15:01:03 +02:00
Bart Kamphorst fa08ce35cc Add travis fix for running the tests properly. 2019-08-14 15:00:25 +02:00
Bart Kamphorst 8413e5b5ee Merge branch '5.x' into primer_css 2019-08-13 22:46:19 +02:00
Bart Kamphorst aa16f6ba2a Major CSS/styling overhaul with Primer.css. 2019-08-13 22:10:10 +02:00
Dawa Ometto bcec052e35 Add revert route helper. Resolves #1385 (#1386) 2019-05-18 14:43:10 +02:00
Dawa Ometto e28a41bb8f Fix breadcrumbs (#1387) 2019-05-18 14:42:42 +02:00
Dawa Ometto 17c574467f Merge pull request #1384 from gollum/dometto-patch-1
Don't lookup page's last version on edit
2019-05-17 11:06:58 +02:00
Dawa Ometto 8f350976a1 Don't lookup page's last version on edit
Slow and unused (?).
2019-05-17 01:34:57 +02:00
Dawa Ometto dfb4281a14 Add MediaWiki language def (#1382) 2019-05-16 21:03:07 +02:00
Dawa Ometto 7881237de2 Improve RTL support. Resolves #1314 (#1350)
* Improve RTL support with updated ACE 1.4.4
* Implement direction switch button
* RTL support on rendered pages
* Fix ace editor modes
* Fix language definitions
2019-05-16 20:38:33 +02:00
Bart Kamphorst 05daab661e Merge pull request #1218 from ProgramFan/bundle-mathjax-slim
Bundle a slim mathjax
2019-05-12 15:14:16 +02:00
Yang Zhang c0e6de899b Upgrade to mathjax-2.7.5 and use original mathjax config (fix comments in #1218) 2019-05-12 14:30:45 +08:00
Yang Zhang c103f3ebdc Fix mathjax loading and remove unused config 2019-05-11 09:04:14 +08:00
Yang Zhang 7cabd684a9 Bundle a slim mathjax (4.5MB uncompressed, 1.5MB compressed) 2019-05-11 09:04:14 +08:00
Dawa Ometto af344c1d25 Update dependencies (#1379) 2019-05-04 20:01:52 +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 e0a2b183ad Merge pull request #1373 from hirocaster/fix-h1-title-org-mode-for-ver5
Fix h1-title at org-mode
2019-03-21 09:46:16 +01:00
hirocaster 97857d0e3f Fix h1-title at org-mode 2019-03-20 22:09:07 +09:00
Bart Kamphorst 6fcfe7895e Merge pull request #1363 from gollum/page_breadcrumb
Implements a breadcrumb for normal wiki pages. Resolves #629.
2019-01-07 08:52:47 +01:00
Michael Gissing f5f655e3a1 Feature/fix gem 3 (#1364)
* change deprecated option which was removed in gem 3
2019-01-05 10:16:07 +01:00
Bart Kamphorst 94fe2f59d3 Implements a breadcrumb for normal wiki pages. Resolves #629. 2019-01-03 09:45:08 +01:00