actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2025-04-24 13:52:39 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity
455 Commits 8 Branches 90 Tags
Commit Graph

455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Rüger
21cf51efd7 Clean up logic a bit 2023-03-20 19:56:02 +01:00
Manuel Rüger
20d3d1f05c fix: Support relative links with titleFromH1 2023-03-20 19:43:01 +01:00
Manuel Rüger
eab5655456
Merge pull request #258 from bernd/add/content-appearance-option 
Add Content-Appearance header
 2023-03-06 15:00:18 +01:00
Bernd Ahlers
9e656ece15
Add Content-Appearance header 
Allows switching between the "full-width" and "fixed" page layouts.

The "fixed" layout renders the page in a narrow column. (Confluence
default)

If not configured, it defaults to "full-width".
 2023-03-06 10:09:28 +01:00
Manuel Rüger
4b5e9c23ec
Merge pull request #256 from mrueg/bump-8.8 
Bump version to 8.8
8.8 		2023-02-21 15:25:34 +01:00
Manuel Rüger
c0bc7dcd35 Bump version to 8.8 2023-02-21 14:56:37 +01:00
Manuel Rüger
cea051057a
Merge pull request #255 from mrueg/build-image 
Build image
 2023-02-21 14:49:22 +01:00
Manuel Rüger
2a9f830817 .github: Add build image step 2023-02-21 14:46:46 +01:00
Manuel Rüger
ca2dbe5fc4 Dockerfile: Freeze builder image versions 2023-02-21 14:46:42 +01:00
Manuel Rüger
e754bf17a0
Merge pull request #250 from Fethbita/master 
ac:image macro
 2023-02-13 15:50:17 +01:00
Fethbita
df3e95f5fd
Merge branch 'kovetskiy:master' into master 2023-02-13 16:46:45 +02:00
Fethbita
24aa73e243
Add width keyword for html comment 2023-02-13 16:46:06 +02:00
Manuel Rüger
fb8e589bc4
Merge pull request #252 from mrueg/add-blog-posts-macro 
Add blog-posts macro
 2023-02-07 15:43:48 +01:00
Manuel Rüger
20ba4dd8fe
Merge pull request #251 from jay-stillman/issue/173 
bugfix: Remove forced default width, forced full-width
 2023-02-07 13:50:12 +01:00
Manuel Rüger
738400c292 Add blog-posts macro 2023-02-06 18:16:39 +01:00
Jay Stillman
4d16a1f606 bugfix: Remove forced default width, forced full-width without editor config #175 2023-02-06 01:18:34 -05:00
Fethbita
e0222ae6bd
Add ac:image width and edited README.md 2023-02-04 15:20:21 +02:00
Sylvain Malnuit
8debc23476
ac:image 2023-02-04 15:15:47 +02:00
Manuel Rüger
b82e18f8b8
Merge pull request #248 from prokod/bugfix/prokod/#247 
To add fallback to blockquote when type is none
 2023-01-31 14:18:48 +01:00
Noam Asor
ce9573a86e To add fallack to blockquote when type is none 2023-01-28 21:15:31 +01:00
Manuel Rüger
cd08a70ba9 .github: Build with go 1.19 8.7 2023-01-27 11:40:46 +01:00
Manuel Rüger
d09ee6ea22 Bump version to 8.7 2023-01-27 11:38:15 +01:00
Manuel Rüger
adee0189bd
Merge pull request #244 from xiu/fix/214 
fix: Title not being extracted when not on the first line
 2023-01-27 11:37:00 +01:00
Guillaume Hérail
1b3c7b4127 fix: Properly handle macro when extracting Metadata 
When a macro is set in the header, only the first line will be read and then
discarded. This makes sure we keep the macro in and stop processing metadata
when we hit a macro.

Co-authored-by: Manuel Rüger <manuel@rueg.eu>
 2023-01-26 17:01:47 +01:00
Manuel Rüger
8a1bd88577
Merge pull request #246 from mrueg/bump-deps 
go.mod: Update dependencies
 2023-01-26 10:44:42 +01:00
Manuel Rüger
fb8213bc0d go.mod: Update dependencies 2023-01-26 09:49:40 +01:00
Guillaume Hérail
667e7be221 fix: Title not being extracted when not on the first line 
While a page with a macro is processed, having a macro leaves an unclean buffer
for further processing steps, including title extraction.  The problem seems to
come from `ExtractMeta`: as it runs through the metadata, it hits the first
line of the macro but since it doesn't look like a complete Metadata (e.g.
matching either `\[\]:\s*#\s*\(([^:]+):\s*(.*)\)` or
`<!--\s*([^:]+):\s*(.*)\s*-->` in
https://github.com/kovetskiy/mark/blob/master/pkg/mark/meta.go#L37:L38, it will
break the loop in
https://github.com/kovetskiy/mark/blob/master/pkg/mark/meta.go#L61 and return
the final document as:
```
  Template: ac:children
  Style: h2
  Excerpt: none
  Page:
  TestSpace:Test
  Reverse: false
  All: true -->

:children:
```

This then goes into `ExtractDocumentLeadingH1` which doesn't find a match for
the regex `^#[^#]\s*(.*)\s*\n`, returning an empty title since the title is not
on the first line. This commit, while it doesn't fix the unclean document,
fixes the regex to properly find the title.

Closes #214
 2023-01-25 11:51:56 +01:00
Manuel Rüger
5ff8daf5e1
Merge pull request #243 from mrueg/fix-lint 
Lint: Disable staticcheck for strings.Title
 2023-01-19 11:35:06 +01:00
Manuel Rüger
7204ef21f6 Lint: Disable staticcheck for strings.Title 
strings.Title is deprecated, but we need to keep using it since there is
no 1:1 replacement and otherwise this might change page names on
confluence.
 2023-01-18 19:46:27 +01:00
Manuel Rüger
1a4ae1afb5
Merge pull request #242 from lucasoskorep/master 
fix: rendermode typo broke builds
 2023-01-18 19:31:02 +01:00
Lucas Oskorep
6083ddcc88 fix: rendermode typo broke builds 2023-01-17 12:46:49 -05:00
Manuel Rüger
2f39cd80e7
Merge pull request #234 from Nr18/feat/jiraissues 
feat: support ac:jiraissues macro
 2023-01-16 15:23:18 +01:00
Manuel Rüger
abc91203bb
.github: Move CI into the right folder (#239) 2023-01-06 17:34:49 +00:00
Manuel Rüger
4ef1d47b5c
Merge pull request #238 from mrueg/ci 
Add a CI pipeline that runs on PRs
 2023-01-05 23:05:36 +01:00
Manuel Rüger
8deecfd67a Lint 2023-01-05 11:37:42 +01:00
Manuel Rüger
bde4b70242 .github: Add CI pipeline 2023-01-05 11:26:50 +01:00
Manuel Rüger
721dd1b642 Makefile: Add test target 2023-01-05 11:25:14 +01:00
Egor Kovetskiy
7eb7ccc68e no funding needed 
Signed-off-by: Egor Kovetskiy <e.kovetskiy@gmail.com>
 2023-01-04 09:09:37 +00:00
Egor Kovetskiy
843089aea0 all-contributors: generate thank you list 
Signed-off-by: Egor Kovetskiy <e.kovetskiy@gmail.com>
8.6 		2023-01-04 09:08:15 +00:00
Egor Kovetskiy
ab5407091b bump version 
Signed-off-by: Egor Kovetskiy <e.kovetskiy@gmail.com>
 2023-01-04 08:59:03 +00:00
Noam Asor
8c02497b5f
Feature/prokod/#194 (#237) 
* Initial commit (w/ debug)

* To remove debug
 2023-01-04 08:54:15 +00:00
Egor Kovetskiy
5920dbf67a bump version 
Signed-off-by: Egor Kovetskiy <e.kovetskiy@gmail.com>
8.5 		2023-01-03 17:58:28 +00:00
Zackery Griesinger
90d8729a7d
Fix for jira.com hosted sites (#231) 2023-01-03 17:54:30 +00:00
Manuel Rüger
3e558ac2e3
Replace deprecated io/ioutils (#230) 2023-01-03 17:54:04 +00:00
Stephan Hradek
f4bbbb19ca
Feature/themed blocks (#223) 
* Allow themed blocks

* add macro code for themed blocks
 2023-01-03 17:53:41 +00:00
Stephan Hradek
0b745c25e4
This should fix #171 by allowing a markdown link to start with ac: (#222) 2023-01-03 17:53:20 +00:00
Manuel Rüger
55b58bd59b
Allow Title via h1 without any other metadata (#229) 2023-01-03 17:52:48 +00:00
Joris Conijn
5f3238b48a
feat: support ac:jiraissues macro 
Add support for the `ac:jiraissues` macro. By adding the template to the stdlib. Not sure if there are other places where you need to add stuff for macros. Or how I could test this locally.
 2022-12-13 11:56:27 +01:00
Egor Kovetskiy
ef71aa1792 bump version 
Signed-off-by: Egor Kovetskiy <e.kovetskiy@gmail.com>
8.4 		2022-10-19 20:44:04 +06:00
Egor Kovetskiy
1ebb29eba0 small style fixes related to templates 2022-10-19 20:43:40 +06:00