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

679 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Matt Baer
65e2e5126b Revert "Fix unix timestamp in file upload" 
This reverts commit 2b066997d1.
 2020-01-14 12:24:57 -05:00
Matt Baer
2b066997d1 Fix unix timestamp in file upload 
File API gives timestamp in milliseconds, not seconds, so this converts
it correctly.

Ref T609
 2020-01-14 12:23:01 -05:00
Rob Loranger
aae2f28bb6
pass original file modified date for imports 2020-01-14 08:59:30 -08:00
Matt Baer
f5d21c8c1a Reorder federation check logic on upload 
Ref T609
 2020-01-09 13:29:30 -05:00
Matt Baer
18d3456a23 Tweak user-facing upload errors + internal logs 
Ref T609
 2020-01-09 13:29:07 -05:00
Matt Baer
03eeca179e Fix potential resource leaks from defer calls in for loop 
This moves file operations inside the `for` loop into an anonymous func,
so the `defer` calls don't wait until the end of the handler call to
actually execute.

Ref T609
 2020-01-09 12:36:58 -05:00
Matt Baer
6860c0a3ff Fix collection logic on import 
- Only retrieve a collection from database if an alias is submitted
- Only call GetCollection() once (previously, it was inside the loop)
- Return error if user doesn't own the collection

Ref T609
 2020-01-09 12:08:06 -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
e5671cd1e6 Fix GetCollections() call 2020-01-07 16:51:40 -05:00
Matt Baer
be76f865a4 Merge branch 'develop' into import-text 2020-01-07 16:35:23 -05:00
Matt Baer
9be534038b
Merge pull request #233 from writeas/markdown-api-rename 
Rename base_url to collection_url in Markdown API
 2020-01-05 12:50:07 -05:00
Matt Baer
9fb8de48d4 Rename base_url to collection_url in MD API 
Ref T519
 2020-01-05 11:22:22 -05:00
Matt Baer
a4579719cd
Merge pull request #197 from writeas/markdown-API 
add basic API endpoint for rendering markdown

Ref T519
 2020-01-03 13:47:50 -05:00
Matt Baer
97b25628fb
Merge pull request #230 from writeas/T710-oauth-slack 
OAuth Provider: Slack

Resolves T710
 2020-01-03 13:32:05 -05:00
Nick Gerakines
0b229a5ede Updating oauth user lookup call as per PR feedback. T710 2020-01-03 11:31:38 -05:00
Nick Gerakines
6d8da2bffd Encrypting email from oauth signup as per PR feedback. T710 2020-01-03 11:28:06 -05:00
Matt Baer
2486b3c100
Merge pull request #231 from writeas/oauth-wrapper 
Pass OAuth requests through OAuth handler
 2020-01-02 16:55:18 -05:00
Nick Gerakines
6823f10821 Updated unit tests to reflect handler wrapper. 2020-01-02 16:29:23 -05:00
Nick Gerakines
2aea9560bc Merged T710-oauth-slack into oauth-wrapper. 2020-01-02 16:19:26 -05:00
Nick Gerakines
31e2dac118 Adding slack display name to inspect response to use in user creation as per PR feedback. T710 2020-01-02 15:55:28 -05:00
Nick Gerakines
cd5fea5ff1 write.as oauth client cleanup as per PR feedback. T710 2020-01-02 15:50:54 -05:00
Nick Gerakines
ee1473aa56 Rolling back v1 migration change as per PR feedback. T710 2020-01-02 15:36:21 -05:00
Nick Gerakines
37f0c281ab Removing test skip as per PR feedback. T710 2020-01-02 15:35:15 -05:00
Nick Gerakines
9170c84617 Merged in final changes from PR 225 into T705-oauth-slack. T710 2019-12-31 11:48:08 -05:00
Matt Baer
f343cebce7
Merge pull request #225 from writeas/T705-oauth 
OAuth 2 support

Resolves T705
 2019-12-31 11:34:13 -05:00
Nick Gerakines
b5f716135b Changed oauth table names per PR feedback. T705 2019-12-31 11:28:05 -05:00
Matt Baer
ad5f72d8a4 Merge branch 'T705-oauth' into oauth-wrapper 2019-12-30 18:47:40 -05:00
Matt Baer
6bcc4cfa46 Check for error response in code exchange 
This checks to see if we get a response with a populated `error` field
in exchangeOauthCode(). If so, we return that error message as an error,
to ensure the callback logic doesn't continue with a bad response.

Ref T705
 2019-12-30 18:25:24 -05:00
Matt Baer
39d0f1de98 Add logging in viewOauthCallback() 
Ref T705
 2019-12-30 18:23:45 -05:00
Matt Baer
af23e28d05 Pass OAuth requests through new OAuth handler 
This gives us our standard logging and passes around errors with
impart.HTTPError.

Ref T705
 2019-12-30 18:14:01 -05:00
Nick Gerakines
cf87ae9096 Code cleanup in prep for PR. T710 2019-12-30 13:32:06 -05:00
Nick Gerakines
462f87919a Feature complete on MVP slack auth integration. T710 2019-12-28 15:15:47 -05:00
Nick Gerakines
13121cb266 Merging T705-oauth into T710-oauth-slack. T705,T710 2019-12-27 13:40:11 -05:00
Nick Gerakines
4266154749 Code cleanup from PR 255 feedback. T705 2019-12-27 13:35:48 -05:00
Nick Gerakines
bf3b6a5ba0 Unit tests, integration testing, and code cleanup for oauth support. Part of T705. 2019-12-23 14:30:32 -05:00
Nick Gerakines
7a0863f71b Added oauth handlers and tests with mocks. Part of T705. 2019-12-19 11:51:19 -05:00
Rob Loranger
dae65b7d1f
retain output structure in response 2019-12-19 08:28:06 -08:00
Matt Baer
dc1af91cf6
Merge pull request #213 from yalh76/arm64 
Add ARM64 Build
 2019-12-18 11:47:42 -05:00
Matt Baer
e16ea3b419
Merge pull request #224 from writeas/hotfix-0.11.2 
v0.11.2 hotfix
 2019-12-17 21:39:19 -05:00
Matt Baer
8dc1ef0fdb
Merge pull request #215 from writeas/prevent-fail-on-suspend-check 
Prevent failed requests on failed user silence check
 2019-12-17 21:12:58 -05:00
Matt Baer
ed40e9dea5
Merge pull request #222 from writeas/fix-template-typo 
Fix password-protected page template
 2019-12-17 21:11:33 -05:00
Matt Baer
6afafa4d67 Fix whitespace 2019-12-17 21:10:39 -05:00
Matt Baer
cfea887b78 Suppress "user not found" log when post not found 
This also saves a user suspension check when a post isn't found.
 2019-12-17 20:58:32 -05:00
Rob Loranger
26d906ae92
clean up responses and logging, change endpoint 
- return an error with invalid request types
- simplify json decoding
- return error and success consistent with app conventions
- endpoint change from /api/generate/markdownify to /api/markdown
- fix nil pointer dereference when passing a base_url
 2019-12-17 12:27:34 -08:00
Rob Loranger
4c0e4d04c1
404 for protected posts when previously authorized 
a user who had previously authenticated on a protected collection would
still see the post after the owner was silenced, with a banner meant for
the owner displayed.
 2019-12-17 10:42:31 -08: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
6f6204a849 Return 404 for suspended pass-protected colls 
Previously, any password-protected collection on a suspended account
would prompt visitors for a password, and *then* take them to the "not
found" page. This fixes that.
 2019-12-17 13:02:21 -05:00
Matt Baer
6a5d49eeb7
Merge pull request #218 from writeas/fix-empty-hostname-editing 
Suppress log when editing a collection post or its metadata
 2019-12-11 16:35:07 -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