Writefreely/writefreely
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
619 Commits 56 Branches 26 Tags
Commit Graph

619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Baer
ae5bbd273d Fix mention URL on multi-user instances 
Previously, links would go to /user/mention:@me@this.tld instead of
/mention:@me@this.tld
 2019-11-27 17:54:17 -05:00
Matt Baer
181af8c5c8 Update httpsig and activityserve 
This fixes activityserve crashes caused by mentioning WriteFreely
instances.
 2019-11-27 16:37:52 -05:00
Matt Baer
bbb7b28110 Bump Travis build to Go 1.12 
This fixes the `undefined: strings.ReplaceAll` build error.
 2019-11-26 13:32:33 -05:00
Matt Baer
d8df15855c Merge branch 'develop' into activitypub-mentions 2019-11-26 13:19:20 -05:00
Matt Baer
bd99044e9c Fix 500 on tags page 
This fixes a panic from a nil user when calling u.IsSuspended().
Instead, this checks and calls IsSuspended() on `owner`.
v0.11.1 		2019-11-12 20:01:14 +09:00
Matt Baer
2899d98cfd Fix collection post 500 when not logged in 
This reverts some code from 5429ca4a, which broke collection post
loading on blog posts when not logged in.
 2019-11-12 19:43:41 +09:00
Matt Baer
278e4f6242 Bump version to 0.11.1 2019-11-12 16:53:52 +09:00
Matt Baer
3d49baf39a Improve non-chorus site-wide header 
This adds a Reader tab when necessary while logged in, and generally
keeps the navigation consistent for logged-in users, particularly in
regard to the Reader:

- Now includes user buttons and dropdown
- Makes header on user pages consistent with Reader page
 2019-11-12 16:49:38 +09:00
Rob j Loranger
474a5d908d
Merge pull request #209 from writeas/fix-host-single-user-templates 
Fix collection template issues introduced in #205
 2019-11-11 15:26:38 -08:00
Matt Baer
80362000fe Skip logging default pad template fallback 
This reduces unnecessary logging by not showing the "no template" line
when the `editor` config value is empty (default).
 2019-11-12 08:07:51 +09:00
Matt Baer
79f35a0ccd Fix collection template issues introduced in #205 
This fixes a template rendering issue caused by bad references to $.Host
in pinned posts links on single-user instances.

Closes #207
 2019-11-12 08:03:00 +09:00
Matt Baer
bca678aee5
Merge pull request #174 from writeas/T661-disable-accounts 
Add account suspension features
v0.11.0 		2019-11-12 02:08:30 +09:00
Matt Baer
53586d9cb8 Merge branch 'develop' into T661-disable-accounts 2019-11-12 01:46:37 +09:00
Matt Baer
5839c2ac4d
Merge pull request #192 from writeas/T695-reset-user-pass 
Resolves T695
 2019-11-12 01:39:09 +09:00
Matt Baer
8f24da94a6 Bump version to 0.11.0 2019-11-12 00:47:49 +09:00
Matt Baer
5644e8d251 Fix "silenced" alert styles on more pages 
- Tagged posts
- Collection index

Ref T661
 2019-11-12 00:41:45 +09:00
Matt Baer
7f96e8c384 Rename UserSuspended to UserSilenced 
Some of the work needed to have the backend match user-facing wording.

Ref T661
 2019-11-12 00:41:25 +09:00
Matt Baer
c3f76a3ab8 Change "suspend" to "silence" where user-facing 
This puts the verbiage more in line with what the feature does, and
leaves room for other moderation controls in the future.

NOTE: this includes no backend refactoring, which may be confusing. We
should rename things to fit ASAP.

Ref T661
 2019-11-12 00:22:33 +09:00
Matt Baer
f7550a0da8 Change more suspension check logic 
From u.Status == UserSuspended to u.IsSuspended()

Ref T661
 2019-11-12 00:04:36 +09:00
Matt Baer
d4206cd5f8 Move to web-core v1.2.0 2019-11-11 23:19:34 +09:00
Matt Baer
a9b5bb2f6b Fix reset user's email address display 
Previously, this had bad template logic and showed the wrong email address.

Ref T695
 2019-11-11 21:40:49 +09:00
Matt Baer
d5dd007ff7 Change Reset Password button style 
Ref T695
 2019-11-11 21:37:02 +09:00
Matt Baer
3e8d1014d9 Tweak admin reset confirmation copy 
Also updates some whitespace in the JS.

Ref T695
 2019-11-11 18:04:20 +09:00
Matt Baer
422c16f39a Tweak admin user pass reset success copy 
This also adjusts the style and includes the user's password, so the
admin can easily notify them.

Ref T695
 2019-11-11 18:03:19 +09:00
Matt Baer
f673f9b562 Reset password to sorta-sensical string 
This resets user password to something random that also reminds the user
they should change it immediately after logging in, instead of a
completely random jumble of characters.

Ref T695
 2019-11-11 18:01:08 +09:00
Matt Baer
6d4ec0b17d Remove extra OwnUserPage field 
Move logic into template, rather than add another field to the page.

Ref T695
 2019-11-11 16:06:03 +09:00
Matt Baer
6e09fcb9e2 Change password reset endpoint to /admin/user/{Username}/passphrase 
Ref T695
 2019-11-11 16:02:22 +09:00
Matt Baer
a65917ae2e
Merge pull request #205 from writeas/fix-csv-export 
Fix URLs in CSV exports
 2019-11-11 15:42:45 +09:00
Matt Baer
2c2ee0c00c Tweak "suspended" notification copy 2019-11-11 15:16:04 +09:00
Rob Loranger
f66d5bf1e8
use .Host instead of adding .Hostname 2019-11-09 11:41:39 -08:00
Rob Loranger
c0b75f6b65
pass hostname to canonical url in post templates 
the change to take a hostname in Post.CanonicalURL broke a few template
using that function. This adds a Hostname string to the Post being
passed to templates and passes it to calls to Post.CanonicalURL
 2019-11-08 08:47:03 -08:00
Matt Baer
e1149cd1e9 Fix URLs in CSV exports 
This includes the instance's hostname in calls to export a CSV file and
PublicPost.CanonicalURL().

It also fixes a panic in that method during CSV export caused by draft
posts.
 2019-11-07 17:25:42 +09:00
Matt Baer
619b10c3e5 Fix "suspended" message location on Drafts 
Previously it was above the header.

Ref T661
 2019-11-07 17:10:17 +09:00
Matt Baer
280c32afdc Confirm suspension before submitting the form 
This also includes a bit of explanation about what suspending a user
actually does.

Ref T661
 2019-11-07 16:59:02 +09:00
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
Matt Baer
3167e19b77
Merge pull request #189 from writeas/T697-blog-default 
Default to user's first blog instead of draft.

Resolves T697
 2019-11-07 13:46:17 +09:00
Matt Baer
fea62b14ce
Merge pull request #185 from writeas/accept-json 
update IsJSON to check for Accept header
 2019-11-07 13:30:34 +09:00
Matt Baer
fcf074cf40
Merge pull request #166 from writeas/159-follow-panic 
fix panic on duplicate remoteuser key
 2019-11-07 12:26:57 +09:00
Matt Baer
bf4f879383 Update hosting options in README 
Now: Write.as Pro and Write.as for Teams
 2019-11-04 14:06:24 -05: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
Michael Demetriou
1bda0434de Unmarshal to webfinger.Resource instead of interface{} 
(https://github.com/writeas/writefreely/pull/195#discussion_r334567408)
 2019-10-15 10:01:22 +03:00
Michael Demetriou
972ec00c58 Update dependencies and add a comment 2019-10-11 10:33:51 +03:00
Michael Demetriou
b9d2689828 Fix comments on T627 pull request 
(https://github.com/writeas/writefreely/pull/195)
 2019-10-11 10:05:18 +03:00
Michael Demetriou
bc2016f00f Fix missing commit statement in migrations/v3.go 2019-10-10 16:49:44 +03:00
Michael Demetriou
db14f04b59 Redirects from the intermediate page work and if there's an old mention 
there it updates the table to include the handle.

migrations WIP
 2019-10-10 16:04:43 +03:00
Michael Demetriou
99bb77153e Handles are saved in remoteusers while the links take you to an 
intermediate page (WIP) that shows the user profile page url
 2019-10-10 15:11:46 +03:00
Michael Demetriou
e5bbd45b49 Change the result that webfinger returns from the first alias 
to the last because mastodon doesn't like

https://my.instance/@me but https://my.instance/users/me
 2019-10-10 10:59:14 +03:00