Mirrors/writefreely
2
0
Fork 0
mirror of https://github.com/writefreely/writefreely synced 2024-12-01 04:49:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
797 commits 52 branches 26 tags 42 MiB
Commit graph

164 commits

Author SHA1 Message Date
Matt Baer
f846cada4b Merge branch 'develop' into T713-oauth-account-management 2020-02-09 14:05:12 -05:00
Matt Baer
7023b74d12 Update calls and vars for Invites and elsewhere 
Ref T661
 2020-02-09 11:24:48 -05:00
Matt Baer
f70c1dfaa5 Merge branch 'develop' into rename-account-suspend 2020-02-09 11:14:51 -05:00
Matt Baer
468bbf2187 Merge branch 'develop' into rename-account-suspend 2020-02-09 11:14:14 -05:00
Matt Baer
252d59d3f7
Merge pull request #208 from writeas/silence-invites 
add silenced warning on invites page

Ref T661
 2020-02-09 11:02:42 -05:00
Matt Baer
8cfffb5650 Disable form items on Invite page when silenced 
Ref T661
 2020-02-09 10:51:34 -05:00
Matt Baer
6d3803bfe8
Merge pull request #241 from writeas/post-time-fix 
fixes imported post times
 2020-02-09 10:23:15 -05:00
Matt Baer
1fd4230267
Merge pull request #248 from writeas/fix-drafts-html-entities 
A minor Drafts page fix + improvement
 2020-02-05 12:26:42 +01:00
Matt Baer
bc9455db4f Fix datetime attributes on read.tmpl 2020-01-30 10:20:50 +01:00
Matt Baer
5de2f633e1 Fix localdate.js not included on Tags page 2020-01-29 13:03:04 -05:00
Matt Baer
50901d2446 Fix date format in datetime attribute 
Previously, the date format in this attribute for posts was invalid.
This caused local date rendering to fail in Firefox. This fixes that.

Closes #253
 2020-01-29 13:01:21 -05:00
Matt Baer
3e902461f1 Merge branch 'develop' into T670-local-time 2020-01-29 06:24:46 -05:00
Matt Baer
30032e74a0 Add helpful text on Drafts page 2020-01-20 15:25:37 -05:00
Matt Baer
b336e95e12 Render HTML entities in Drafts list 
Previously, we'd show the raw HTML entities in the summaries of Draft
posts, instead of rendering them. This fixes that.
 2020-01-20 15:20:45 -05:00
Nick Gerakines
5d834c1cd2 Minor code cleanup on settings page to improve oauth account management UI. T713 2020-01-15 13:37:57 -05:00
Nick Gerakines
c0317b4e93 Implemented oauth attach functionality, oauth detach functionality, and required data migration. T713 2020-01-15 13:16:59 -05:00
Rob Loranger
571460f08d
move timezone correction to client side 2020-01-15 09:04:38 -08:00
Rob Loranger
0766e6cb36
fixes imported post times 
changes the client side to round the unix time to avoid floats

alters the time to match the client time zone on the server side
 2020-01-14 10:44:56 -08:00
Matt Baer
75e2b60328
Merge pull request #172 from writeas/import-text 
add basic text file imports

Resolves T609
 2020-01-14 12:33:57 -05:00
Matt Baer
3e97625cca Fix Unix timestamps on client during import 
File API gives timestamp in milliseconds, not seconds, so this converts
it on the client-side and sends it the correct time to the server.

Ref T609
 2020-01-14 12:26:02 -05:00
Rob Loranger
aae2f28bb6
pass original file modified date for imports 2020-01-14 08:59:30 -08:00
Matt Baer
9958a1122b Show published date on post pages if Blog 
Dates now display on blog post pages if the collection's chosen display
format is "Blog". It updates the chorus-collection-post template to now
respect this value (previously, it always showed the date).

Ref T669
 2020-01-09 16:50:02 -05:00
Matt Baer
5b7f37aed8 Restyle Import page 
- Changes Import link location in dropdown menu
- Makes design consistent with Invite People page (and extracts some
  common CSS into core.less)
- Selects the user's first blog by default in the dropdown
- Changes the copy a bit

Ref T609
 2020-01-09 11:16:26 -05:00
Matt Baer
be76f865a4 Merge branch 'develop' into import-text 2020-01-07 16:35:23 -05:00
Matt Baer
aa405bc57c Remove "silenced" warning on password-collection.tmpl 
Logged-in users never see this particular page, so it's not needed here.
 2019-12-17 13:11:32 -05:00
Matt Baer
0b701c5f7f Update "account silenced" alert on edit-meta 
Use "silenced" phrasing instead of "suspended"
 2019-12-07 09:08:37 -05:00
Matt Baer
acb8f5fe5d Fix broken password-collection template 
Fixed "user-supsended" to "user-suspended"
 2019-12-07 09:06:31 -05:00
Matt Baer
af6e5dea3a Merge branch 'develop' into import-text 2019-11-26 17:41:29 -05: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 Loranger
7e014ca659
Rename Suspend status to Silence 
This changes all variables and functions from using Suspend{ed} to using
Silence{d} as well as documentation, errors and logging.
 2019-11-11 15:25:19 -08: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
Rob Loranger
9b69de166f
add silenced warning on invites page 2019-11-11 14:25:34 -08: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
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
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
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
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
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
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