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
698 commits 52 branches 26 tags 42 MiB
Commit graph

698 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
c7b797929b
Merge pull request #238 from writeas/oauth-bugfix-alias-signature 
OAuth alias field not set correctly
 2020-01-14 10:59:48 -05:00
Nick Gerakines
f7995bee48 Fixing bug where display name was not set correctly. 2020-01-14 10:28:40 -05:00
Matt Baer
659392ac4f
Merge pull request #235 from writeas/date-stamps 
Add dates to blog posts

Resolves T669
 2020-01-14 09:51:12 -05:00
Matt Baer
c00daf64b0
Merge pull request #236 from writeas/oauth-provider-callback-hotfix 
Fixing bug in oauth callback URL registration.
 2020-01-14 09:12:28 -05:00
Nick Gerakines
a77d403dfb
Fixing bug in oauth callback URL registration. 
Fixing a bug in the oauth callback URL registration where the lack of provider context was overwriting the previous oauth callback route registration call.
 2020-01-10 16:16:43 -05: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
812136357e Move Format from DisplayCollection to CollectionObj 2020-01-09 16:48:22 -05: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
a2a9f60976
Merge pull request #232 from writeas/T712-oauth-registration-improvements 
OAuth registration improvements

Resolves T712
 2020-01-08 14:09:32 -05:00
Nick Gerakines
8ddfce4f19 oauth signup page changes per PR feedback. T712 2020-01-07 22:13:29 -05:00
Nick Gerakines
6d79ed3cfd Updating oauth form validation per PR feedback. T712 2020-01-07 21:52:55 -05:00
Nick Gerakines
5e76565271 Code cleanup per PR feedback. T712 2020-01-07 21:52:55 -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
d66091a356 Bump Travis build to Go 1.13 2020-01-07 16:27:25 -05:00
Nick Gerakines
28cf4dd5f5 Added state location register hook. T712. 2020-01-07 15:22:25 -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
77e0126808 Move and restyle OAuth login links 
- Move them above local login form
- Restyle as side-by-side buttons

Ref T712
 2020-01-05 11:00:58 -05:00
Matt Baer
5249456ec6 Add .btn.cta link styles 2020-01-05 11:00:11 -05:00
Nick Gerakines
6429d495a2 Implemented /oauth/signup. T712 2020-01-03 13:50:21 -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
a4e373065c Merge branch 'T710-oauth-slack' into T712-oauth-registration-improvements 2020-01-03 11:39:40 -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
b985292b18 First take at template updates. T712 2020-01-02 15:33:39 -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