Mirrors/writefreely
2
0
Fork 0
mirror of https://github.com/writefreely/writefreely synced 2024-11-14 05:07:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
600 commits 52 branches 26 tags 42 MiB
Commit graph

600 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
bca678aee5
Merge pull request #174 from writeas/T661-disable-accounts 
Add account suspension features
 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
Rob Loranger
aa9efc7b37
allow admin to reset user passwords 
this adds a new button when viewing a user as an admin, that will
generate and store a new password for the user
 2019-10-03 13:53:04 -07:00
Rob Loranger
02dd190945
T697 default to user's first blog instead of draft 2019-10-02 10:20:51 -07: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