Reviewing merge request #1: Some fixes

Please merge :)

Commits that would be merged:

Version 4
  • Version 1
  • Version 2
  • Version 3
  • Version 4
  • 8c6ab58
  • Adrian Lang
over 1 year ago
  • dbc57e2
  • Adrian Lang
over 1 year ago
  • 8715874
  • Adrian Lang
over 1 year ago
  • e87ffc6
  • Adrian Lang
over 1 year ago
  • c33b7f9
  • Adrian Lang
over 1 year ago
  • 20d2c0d
  • Adrian Lang
over 1 year ago
  • 3bd1d9a
  • Adrian Lang
over 1 year ago
  • cc51dec
  • Adrian Lang
over 1 year ago
Showing f195eab-8c6ab58

Comments

Hey Adrian, thanks for your contribution.

Here’s my view on the commits:

  • 8c6ab58 and dbc57e2: that’s a good idea, I’ll rewrite a small part of the implementation though, to avoid code duplication with _odtAddImage().
  • 8715874: merged
  • e87ffc6 and 3bd1d9a: I need some more time to look at this. The idea is good, but I'm not sure that a _export.odt and __export.odt files are the best way to go.
  • c33b7f9: merged
  • 20d2c0d: this changes what’s documented and possibly breaks some user’s export pages, so I'm not going to merge it for now. The colon was chosen to have a similar syntax to the note plugin and the include plugin. Unless the Dokuwiki core chooses a side, or unless there’s a big win somewhere else, I'm not going to change it.
  • cc51dec: merged

In summary, thanks a lot for your contributions, I’ll finish merging them in the next few days, and I’ll put out a new release afterwards.

Aurélien.
P.S.: next time, please create a separate merge request for each feature, it’s easier to track :)

→ State changed from Open to Merged

Thanks for your comments; I prefered equal sign since page IDs can contain colons, but at the current point it makes no difference. Merge requests will be atomical next time :)

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository