Commit Graph

1502 Commits (develop)

Author SHA1 Message Date
Matt Baer bdcacbc632
Merge pull request #34 from koehn/master
Updated Dockerfile
2018-11-24 11:01:02 -05:00
Matt Baer cf784388f0
Merge pull request #31 from mrvdb/codehighlight
Add code highlighting
2018-11-23 13:23:50 -05:00
Matt Baer 3dd6e34914 Fix whitespace in templates 2018-11-23 12:42:30 -05:00
Matt Baer 2b5e869916 Rename render.tmpl to post-render.tmpl 2018-11-23 12:37:59 -05:00
Matt Baer 03c36af2f9 Optimize template loading on non-post pages
Avoids loading render.tmpl where it isn't needed.
2018-11-23 12:37:59 -05:00
Matt Baer 246a6dc554 Fix whitespace in highlight JS 2018-11-23 12:37:59 -05:00
Marcel van der Boom a54f5fc9d8 Fix typos 2018-11-22 16:03:44 +01:00
Marcel van der Boom d63db27917 Merge remote-tracking branch 'upstream/master' into codehighlight
* upstream/master:
  Work as a standalone server, including TLS
  Include About/Privacy page content in page description
  Show instance stats on About page
  Change default database name to writefreely
  Use and validate database type before connecting
  Mention Contributing Guide in README
  Fix About page link in Admin dash
  Include version in archives made by `make release`
  Remove from make release
  Add make release
2018-11-22 15:09:58 +01:00
Marcel van der Boom e400fe1649 Only load highlght css when needed 2018-11-22 15:01:11 +01:00
Marcel van der Boom add06ee56c Only load js when there are blocks to highlight
Crux was the load event for the script tag inserted.
2018-11-22 14:31:25 +01:00
Brad Koehn 6f0c7aed66 removed an unnecessary debugging statement 2018-11-22 06:57:05 -06:00
Brad Koehn aebad1ce54 added .git to make builds cache more effectively and run faster 2018-11-22 06:56:29 -06:00
Matt Baer 09f5953431 Work as a standalone server, including TLS
This supports running the server on port 443, serving secure pages, with
automatic redirects from the insecure site. It also modifies the
configuration process to better guide users through configuring for
running behind a reverse proxy or as a standalone server.

This closes T537
2018-11-21 18:26:19 -05:00
Matt Baer 77e79acd06 Include About/Privacy page content in page description 2018-11-21 15:04:47 -05:00
Matt Baer be2c7ef86b Show instance stats on About page
This also moves the stats database logic out of nodeinfo.go and into
2018-11-21 14:08:47 -05:00
Brad Koehn f2a07db23a switched to much smaller alpine image since golang not required at runtime 2018-11-21 12:51:37 -06:00
Matt Baer b9d7d4ce24 Change default database name to writefreely
(not writeas)
2018-11-21 13:36:00 -05:00
Matt Baer f3df2b4159 Use and validate database type before connecting
Just the start of changes needed for T529.
2018-11-21 13:10:10 -05:00
Matt Baer 82e45ef5ae Mention Contributing Guide in README 2018-11-21 11:54:01 -05:00
Matt Baer 4c7969d808 Add 2018-11-21 11:46:23 -05:00
Brad Koehn 5039853edc Updated Dockerfile to produce smaller image with minimum content and a few extra features; added .dockerignore 2018-11-21 10:38:56 -06:00
Matt Baer 8a5811e3e9 Fix About page link in Admin dash 2018-11-21 11:12:44 -05:00
Matt Baer bf5ed00484 Include version in archives made by `make release` 2018-11-20 18:35:52 -05:00
Matt Baer 1b57ea6f37 Merge branch 'master' of 2018-11-20 16:36:52 -05:00
Marcel van der Boom 8144c9581d Use the samen render common template for user pages 2018-11-20 22:11:53 +01:00
Marcel van der Boom 7181fd9d9e Remove code for CodeHighlighting UI
We load it always, no need for a user config UI
2018-11-20 22:11:09 +01:00
Marcel van der Boom a659acdc14 Bring all MathJax logic into one common template
Might as well do this right away, we're here anyway.
2018-11-20 22:01:25 +01:00
Marcel van der Boom a82882fddc Put the highlight logic into one common template
It now loads unconditionally and highlights all code blocks.

TODO: optimize to not load when there are no blocks
2018-11-20 21:51:39 +01:00
Marcel van der Boom 03ac402c37 Use the same highlightjs library everywhere 2018-11-20 18:37:56 +01:00
Marcel van der Boom ed3ea37537 Merge branch 'master' into codehighlight
* master:
  Don't automatically include "v"  from git
  Get versioninfo from the git repository
2018-11-20 18:24:36 +01:00
Matt Baer a4751c7abf
Merge pull request #32 from mrvdb/versioninfo
Get versioninfo from the git repository
2018-11-20 12:18:18 -05:00
Marcel van der Boom b030921691 Don't automatically include "v" from git
- "v" should not be part of the version (softwareVer variable is used
  in other places)
- formatting
2018-11-20 18:14:02 +01:00
Marcel van der Boom c25d0bef67 Get versioninfo from the git repository
Sets value of softwareVer during build
2018-11-20 14:21:13 +01:00
Marcel van der Boom 348d548793 Add code highlighting option
This is a first stab at having a configurable code highlighting option,
similar to the MathJax rendering option. This change makes a checkbox
in the settings for code highlighting using the
What works: code highlighting in multi-user env is like I would
expect. single and anon(?) needs work

Things to resolve/consider:
- does the .IsCode test for code highlighting need to stay? At least
this and that should use the same version of the highlight.js lib.
- can the common templating part be 'included' somehow?
- the anon vs single-user vs multi-user code is not completely
clear (to me)
- bring js to local instead of cloudfare cdn (perhaps combine with
2018-11-20 11:29:12 +01:00
Matt Baer 87ffafeb54 Remove from make release 2018-11-18 22:31:32 -05:00
Matt Baer 64e52ba00d Add make release 2018-11-18 22:29:35 -05:00
Matt Baer bdc4f270f8 Support editing About and Privacy pages from Admin panel
This allows admin to edit these pages from the web, using Markdown. It
also dynamically loads information on those pages now, and makes loading
`pages` templates a little easier to find in the code / more explicit.

It requires this new schema change:

  `id` varchar(36) NOT NULL,
  `content` mediumtext CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
  PRIMARY KEY (`id`)

This closes T533
2018-11-18 21:58:50 -05:00
Matt Baer 7d87aad55a Add basic admin dashboard with app stats
Start of T538
2018-11-18 20:18:22 -05:00
Matt Baer 99a10a2563 Accept different `created` time on post publish
This helps with post importing and clients that want to support post
scheduling. It also changes how Collection.ForPublic() works, no longer
resetting the ID.

Closes T532
2018-11-18 14:39:50 -05:00
Matt Baer 7321f6d5a0 Upgrade Lora to v2.202 (cyrillic)
This fixes things like em-dashes and adds new glyphs.
2018-11-17 22:28:58 -05:00
Matt Baer b58cb1e541 Fix Novel blog post order in feeds and outbox 2018-11-17 21:59:04 -05:00
Matt Baer 2ad2270973 Merge branch 'master' of 2018-11-17 21:57:59 -05:00
Matt Baer 093837b3a9 Fix wrong collection data in feed
Previously the logic was mixed up -- multi-user blogs would always load
collection number 1.
2018-11-17 21:51:14 -05:00
Matt Baer f7cc3764d0
Merge pull request #29 from BenOvermyer/improve-docker-workflow
Improved the Docker dev workflow slightly.
2018-11-17 18:36:06 -05:00
Ben Overmyer 2de37a4ddb Improved the Docker dev workflow slightly. 2018-11-16 14:53:42 -06:00
Matt Baer ad1180f202 Bump version to 0.3 2018-11-16 13:20:40 -05:00
Matt Baer 8e6d0daa06 Federate draft when published to a blog
This now sends out a `Create` activity when a post is moved from a draft
to a blog.

This closes #9. Closes T526.
2018-11-16 12:42:21 -05:00
Matt Baer 778098d925 Remove JS editor remnants
This was another issue mentioned in #28
2018-11-16 12:20:36 -05:00
Matt Baer a0f8a2df3b Fix MathJax value not sticking
This closes #28
2018-11-16 12:19:56 -05:00
Matt Baer 3595c8163c Use Accept ID on blog's origin
instead of the requesting user's. This closes #16
2018-11-15 17:05:33 -05:00