Commit graph

568 commits

Author SHA1 Message Date
Matt Baer
c9f7219831 Move user status in list out of <a>
The link here is a little redundant, and might make people think that it
actually changes the status by clicking on it.
2019-11-07 16:49:52 +09:00
Matt Baer
da7dcfee6a Move admin template IsSuspended logic into method
This adds a User.IsSuspended() method and uses it when displaying the
user's status on admin pages, instead of doing a magic number check.
This should also help in the future, in case this logic ever changes.

Ref T661
2019-11-07 14:07:00 +09:00
Rob Loranger
5429ca4ab0
add check for suspended user on single posts
also fix logic bug in posts.go viewCollectionPost checking the page
owner
2019-10-25 13:40:32 -07:00
Rob Loranger
f85f0751a3
address PR comments
- update error messages to be correct
- move suspended message into template and include for other pages
- check suspended status on all relevant pages and show message if
logged in user is suspended.
- fix possible nil pointer error
- remove changes to db schema files
- add version comment to migration
- add UserStatus type with UserActive and UserSuspended
- change database table to use status column instead of suspended
- update toggle suspended handler to be toggle status in prep for
possible future inclusion of further user statuses
2019-10-25 12:04:24 -07:00
Matt Baer
9873fc443f Merge branch 'develop' into T661-disable-accounts 2019-10-24 13:22:26 -04:00
Matt Baer
3759f16ed3
Merge pull request #183 from writeas/T690-invite-instructions
add user invite instructions

Resolves T690
2019-09-23 10:52:26 -04:00
Matt Baer
5a9182f688 Tweak "already invited" message
Ref T690
2019-09-23 10:44:23 -04:00
Matt Baer
c6564b3d16 Shorten invite-instructions.tmpl filename 2019-09-23 10:31:38 -04:00
Matt Baer
ddce177784 Fix invite input box size in non-Firefox browsers
font-size-adjust is still a flag-enabled feature in Chrome 77, and
doesn't have widespread support across browsers. So instead this uses
font-size to make the text large enough.

Ref T690
2019-09-23 10:21:03 -04:00
Matt Baer
26a4f48e8b Add expiration information to invite help
This uses the Invite fetched from the database to explain a bit more
about how the invite URL expires. It also reduces some space around the
input box.

Ref T690
2019-09-23 10:06:12 -04:00
Matt Baer
f01b439ff5 Tweak invite page title and intro
Ref T690
2019-09-23 10:02:36 -04:00
Matt Baer
7e9e3cb7eb Show status on logged-in expired invite links
Ref T690
2019-09-23 09:45:36 -04:00
Matt Baer
891b15b8a8 Always return invite errors
This ensures we see a 404 page when looking up an invalid invite URL,
even if the user is logged in.

Ref T690
2019-09-23 09:19:21 -04:00
Matt Baer
afa3792e8e
Merge pull request #165 from writeas/lessc-check
check for lessc executable in any location
2019-09-20 18:24:24 -04:00
Matt Baer
a01e280890 Tweak "LESS not installed" message 2019-09-20 18:22:54 -04:00
Rob Loranger
cb78fd227e
use inline bash instead 2019-09-20 10:17:58 -07:00
Rob Loranger
43849d95d3
add back all generation steps
accidentally removed two lines from make all

fix check when trying to install lessc
2019-09-20 10:06:49 -07:00
Rob Loranger
9d0027ec53
don't need less to install less 2019-09-20 09:17:47 -07:00
Rob Loranger
d129894ba7
fix check for missing less 2019-09-18 15:56:22 -07:00
Matt Baer
0066fecc20 Fix LESSC assignment in less/Makefile 2019-09-18 17:06:40 -04:00
Matt Baer
66974dcbff
Merge pull request #184 from writeas/title-attrs
allow titles for abbreviation elements
2019-09-18 12:27:04 -04:00
Rob Loranger
a6c1f4ae41
allow titles for abbreviation elements
this allows abbreviation elements to keep their title attributes when
containing special characters.
2019-09-18 08:21:33 -07:00
Rob Loranger
d954b7c8e3
add user invite instructions
this adds a new page with instructions for sharing user invites

if a user clicks the link for one of their own invite codes they are
directed to a page with clear instructions for it's use.

if a user clicks another users link they are redirectec to their account
settings witha flash telling them they do not need to register.
2019-09-13 10:58:17 -07:00
Matt Baer
5310e6d509
Merge pull request #182 from writeas/rm-gogs-pkg-tool
remove gogs/gogs/pkg/tool dependency
2019-09-13 19:31:40 +02:00
Rob Loranger
0286dcf214
move tool from gogs into appstats pkg 2019-09-13 08:22:38 -07:00
Matt Baer
66b0945b70 Add copyright header to copied Gogs code 2019-09-13 07:17:22 -04:00
Rob Loranger
feba200916
remove gogs/gogs/pkg/tool dependency
this borrows some code from github.com/gogs/gogs/pkg/tool to avoid
pulling it in as a dependency, along with many other indirect deps.
2019-09-11 12:50:04 -07:00
Matt Baer
6b99d75aa9
Merge pull request #157 from writeas/chorus
Reader-first multi-user instances

Resolves T680 T681 T684
2019-09-11 16:00:11 +02:00
Matt Baer
c7a90d2ace Fix blog post links when chorus enabled
This ensures the "new post" link under each blog on the user Blogs page
goes to /new instead of /.

Ref T681
2019-09-10 22:07:14 +02:00
Matt Baer
40ffb3a5f9 Merge branch 'develop' into chorus 2019-09-10 21:41:28 +02:00
Matt Baer
9256293123
Merge pull request #169 from writeas/future-pins
prevent future posts from showing in pins
2019-09-10 21:37:28 +02:00
Matt Baer
151e996387 Use new isOwner var in tests
With the var there now, this makes the code a bit more readable.
2019-09-10 21:21:45 +02:00
Matt Baer
ca388d6536 Merge branch 'develop' into chorus 2019-09-09 17:26:40 +02:00
Matt Baer
94b8fa7756
Merge pull request #171 from writeas/empty-coll-host
fix missing collection hostname
2019-09-09 14:04:05 +02:00
Matt Baer
811a0a3cfb
Merge pull request #179 from writeas/fix-pad-edit
set a default pad tempate on all pad renders
2019-09-09 13:34:58 +02:00
Rob Loranger
6396749f31
default pad tempate on all pad renders
this fixes a bug where if the `editor` config is set to an unsupported
value there is a nil pointer error and the pad fails to render when
editing only, not on a new post.
2019-09-06 19:49:15 -07:00
Matt Baer
4419632f83 Fix false login state on failed login
Previously, a failed login would change the site-wide navigation so that
it looked like the user was logged in, even though they weren't. This
fixes that.
2019-09-03 17:56:27 -04:00
Matt Baer
8ec25f1fb4 Fix pinning on chorus collection page
Previously, the new pinned post link would appear in the site header,
instead of the blog header.
2019-09-03 17:42:23 -04:00
Matt Baer
954e57897b Fix unpinning on chorus post page 2019-09-03 17:40:02 -04:00
Rob Loranger
77f7b4a522
Add account suspension features
This renders all requests for that user's posts, collections and related
ActivityPub endpoints with 404 responses.

While suspended, users may not create or edit posts or collections.

User status is listed in the admin user page

Admin view of user details shows status and now has a button to activate
or suspend a user.
2019-08-29 09:09:11 -07:00
Matt Baer
4d97856ec5
Merge pull request #164 from writeas/tar-bombs
fix tar bombs
2019-08-22 15:32:37 -04:00
Rob Loranger
6e9000659c
fix typo in Makefile GITREV release target 2019-08-22 12:16:37 -07:00
Rob Loranger
42a2219335
add ui back to target release linux 2019-08-22 10:48:58 -07:00
Matt Baer
de7acb5abe
Merge pull request #168 from OddBloke/log-version
Emit the server software and version to the log on startup
2019-08-22 13:05:48 -04:00
Matt Baer
55808233fd Fix logic for showing sign up link
This prevents the link from showing when an instance lands on the sign
up page anyway.

Ref T681
2019-08-14 23:25:02 -04:00
Matt Baer
8a29a4dfc9 Link to home page in bare editor in chorus mode
Ref T681
2019-08-14 23:14:34 -04:00
Rob Loranger
55dc1917fe
use established future posts pattern 2019-08-12 14:13:02 -07:00
Rob Loranger
f241d69425
reduce GetPinnedPosts calls to single line 2019-08-12 14:12:35 -07:00
Rob Loranger
1d80e47e07
change subdirectory to writefreely
instead of writefreely_versionstring
2019-08-12 13:51:29 -07:00
Rob Loranger
ca957c4b6d
fix missing collection hostname
GetCollections and GetPublishableCollections now take a hostname
parameter to allow setting the collecion hostname.

All collections used in memory now have their hostname set.
2019-08-12 12:35:17 -07:00