Merge branch 'develop' into T713-oauth-account-management
cf4f08b264d4
Actions

Description

Merge branch 'develop' into T713-oauth-account-management

Details

Provenance

matt	Authored on Mar 19 2020, 4:02 PM

Parents

rWF75a9df82ab15: Merge pull request #283 from writeas/gitlab-oauth-cleanup
rWF7fe281df69c4: Use NULL for new attach_user_id column

Branches

Unknown

Tags

Unknown

Event Timeline

matt committed rWFcf4f08b264d4: Merge branch 'develop' into T713-oauth-account-management (authored by matt).Mar 19 2020, 4:02 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

75a9df82ab15 Merge pull request #283 from writeas/gitlab-oauth-cleanup
Author
matt
Browse Repository
No Builds
No Audits
9e25979e378c Run go fmt on modified GitLab files
Author
matt
Browse Repository
No Builds
No Audits
79a968f425bf Fix login.tmpl rendering
Author
matt
Browse Repository
No Builds
No Audits
06054a2cd72a Merge pull request #268 from writeas/noindex-invite-links
Author
matt
Browse Repository
No Builds
No Audits
da0455198d1d Merge pull request #194 from writeas/table-borders
Author
matt
Browse Repository
No Builds
No Audits
5b6e0081187f Merge pull request #277 from paddatrapper/oauth-gitlab
Author
matt
Browse Repository
No Builds
No Audits
26b6ed5f4fac simplify gitlab oauth config
Author
Kyle Robbertze <kyle@paddatrapper.com>
Browse Repository
No Builds
No Audits
f126ac624a03 Merge pull request #276 from writeas/dateless-pinned-posts
Author
matt
Browse Repository
No Builds
No Audits
c292512b9df6 add Gitlab OAuth
Author
Kyle Robbertze <kyle@paddatrapper.com>
Browse Repository
No Builds
No Audits
bad970c60a62 Merge pull request #275 from writeas/fix-v4-migrations
Author
matt
Browse Repository
No Builds
No Audits
2aeb994b04eb Don't show date on pinned post page
Author
matt
Browse Repository
No Builds
No Audits
172a6dba255f Merge pull request #263 from writeas/typography-alpha
Author
matt
Browse Repository
No Builds
No Audits
eda267e30aa7 Revert accidental h2 font-size change
Author
matt
Browse Repository
No Builds
No Audits
32f3fcb85959 Skip IF [TABLE] NOT EXISTS on v4 migrations
Author
matt
Browse Repository
No Builds
No Audits
61ddcff2c035 Add copyright notices to fixed files
Author
matt
Browse Repository
No Builds
No Audits
83b2c5a21ba0 Fix unique index on v5 SQLite migration
Author
matt
Browse Repository
No Builds
No Audits
471ef4d40324 Fix "NOT NULL column with NULL" error in v5 SQLite migration
Author
matt
Browse Repository
No Builds
No Audits
bb5da1d3f579 Break up v5 table ALTERs for SQLite
Author
matt
Browse Repository
No Builds
No Audits
f1ffcf96ec6f Remove user_id and remote_user_id constraints in v4&v5 migrations
Author
matt
Browse Repository
No Builds
No Audits
5b2612af5459 Fix `created_at` default val in v4 migration for SQLite
Author
matt
Browse Repository
No Builds
No Audits
793380c1d9ea Merge pull request #269 from writeas/lift-reader-limits
Author
matt
Browse Repository
No Builds
No Audits
c71d020e864b Merge pull request #261 from techknowlogick/update-cli
Author
matt
Browse Repository
No Builds
No Audits
2550804d93ae return clear error
Author
Matti R <matti@mdranta.net>
Browse Repository
No Builds
No Audits
b6044120efff go fmt & update per feedback
Author
Matti R <matti@mdranta.net>
Browse Repository
No Builds
No Audits
fca864c94a8c Merge pull request #266 from writeas/fix-social-images
Author
matt
Browse Repository
No Builds
No Audits
7283b174009f Merge pull request #267 from writeas/update-contributing-guide
Author
matt
Browse Repository
No Builds
No Audits
4595d480aec1 Merge pull request #264 from writeas/admin-dashboard-redesign
Author
matt
Browse Repository
No Builds
No Audits
cd2e72574693 Merge pull request #270 from nkoehring/js-html-aliases
Author
matt
Browse Repository
No Builds
No Audits
b42760abab46 add js, jsx and html aliases for highlightjs
Author
koehr <n@koehr.in>
Browse Repository
No Builds
No Audits
f903388a2826 Fix admin nav rendering on user viewing
Author
matt
Browse Repository
No Builds
No Audits
9fe528bf478f Fix admin nav rendering on page editing
Author
matt
Browse Repository
No Builds
No Audits
303144fd241e Fix 500 when update checks disabled
Author
matt
Browse Repository
No Builds
No Audits
46dbb1043339 Make Admin Settings page more user-friendly
Author
matt
Browse Repository
No Builds
No Audits
d17e82d34c39 Prevent update check from slowing app init
Author
matt
Browse Repository
No Builds
No Audits
05aad04b2162 Limit Reader posts by count, not publish date
Author
matt
Browse Repository
No Builds
No Audits
8933076296c5 Add invite button to admin Users page header
Author
matt
Browse Repository
No Builds
No Audits
6f3b502e6567 Add 'X-Robots-Tag: noindex' header to invite URLs
Author
matt
Browse Repository
No Builds
No Audits
e6e8cb5944a3 Add details and update CONTRIBUTING guide
Author
matt
Browse Repository
No Builds
No Audits
563ea5b25b30 Fix image extraction for URLs with query strings
Author
matt
Browse Repository
No Builds
No Audits
34d196376ead Include extracted images in draft social metadata
Author
matt
Browse Repository
No Builds
No Audits
8e8eb3c5633d Merge pull request #260 from writeas/fix-deletion-pleroma
Author
matt
Browse Repository
No Builds
No Audits
987c74c93a33 Add logging around automated update checks
Author
matt
Browse Repository
No Builds
No Audits
37b7755c08f8 Tell admin that automated check failed when necessary
Author
matt
Browse Repository
No Builds
No Audits
c2ece926e0ba Show update notification in admin nav bar
Author
matt
Browse Repository
No Builds
No Audits
389dc8b9dbd4 Show functional Updates page when checks are disabled
Author
matt
Browse Repository
No Builds
No Audits
a06bb457de77 Change copy and design on WF Updates page
Author
matt
Browse Repository
No Builds
No Audits
48ca695c463a Show last update check time in local timezone
Author
matt
Browse Repository
No Builds
No Audits
68e992a55e40 Fix bad #status anchor in view-user.tmpl
Author
matt
Browse Repository
No Builds
No Audits
8e2eab5b7319 Merge pull request #265 from shleeable/patch-1
Author
matt
Browse Repository
No Builds
No Audits
7d15b799f057 Update Dockerfile
Author
Shlee <github@shl.ee>
Browse Repository
No Builds
No Audits

Changes (51)

Path

Size

cmd/

writefreely/

config/

db/

less/

migrations/

	oauth_gitlab.go
	oauth_writeas.go

pages/

templates/

chorus-collection-post.tmpl

include/

user/

admin/

include/

rWFcf4f08b264d4

View Options

CONTRIBUTING.md

View Options

Dockerfile

View Options

account.go

View Options

activitypub.go

View Options

admin.go

View Options

app.go

View Options

cmd/writefreely/config.go

View Options

cmd/writefreely/db.go

View Options

cmd/writefreely/keys.go

View Options

cmd/writefreely/main.go

View Options

cmd/writefreely/user.go

View Options

cmd/writefreely/web.go

View Options

config.ini.example

View Options

config/config.go

View Options

database-lib.go

View Options

database.go

View Options

db/create.go

View Options

go.mod

View Options

go.sum

View Options

invites.go

View Options

less/admin.less

View Options

less/core.less

View Options

less/new-core.less

View Options

less/post-temp.less

View Options

migrations/v4.go

View Options

migrations/v5.go

View Options

oauth.go

View Options

oauth_gitlab.go

View Options

pages/login.tmpl

View Options

posts.go

View Options

read.go

View Options

routes.go

View Options

semver.go

View Options

templates/chorus-collection-post.tmpl

View Options

templates/collection-post.tmpl

View Options

templates/include/post-render.tmpl

View Options

templates/post.tmpl

View Options

templates/read.tmpl

View Options

templates/user/admin.tmpl

View Options

templates/user/admin/app-settings.tmpl

View Options

templates/user/admin/app-updates.tmpl

View Options

templates/user/admin/monitor.tmpl

View Options

templates/user/admin/users.tmpl

View Options

templates/user/admin/view-user.tmpl

View Options

templates/user/articles.tmpl

View Options

templates/user/collections.tmpl

View Options

templates/user/export.tmpl

View Options

templates/user/include/header.tmpl

View Options

templates/user/settings.tmpl

View Options

updates.go

View Options

Merge branch 'develop' into T713-oauth-account-managementcf4f08b264d4Actions

Description

Details

Event Timeline

Merged Changes

Changes (51)

rWFcf4f08b264d4

CONTRIBUTING.md

Dockerfile

account.go

activitypub.go

admin.go

app.go

cmd/writefreely/config.go

cmd/writefreely/db.go

cmd/writefreely/keys.go

cmd/writefreely/main.go

cmd/writefreely/user.go

cmd/writefreely/web.go

config.ini.example

config/config.go

database-lib.go

database.go

db/create.go

go.mod

go.sum

invites.go

less/admin.less

less/core.less

less/new-core.less

less/post-temp.less

migrations/v4.go

migrations/v5.go

oauth.go

oauth_gitlab.go

pages/login.tmpl

posts.go

read.go

routes.go

semver.go

templates/chorus-collection-post.tmpl

templates/collection-post.tmpl

templates/include/post-render.tmpl

templates/post.tmpl

templates/read.tmpl

templates/user/admin.tmpl

templates/user/admin/app-settings.tmpl

templates/user/admin/app-updates.tmpl

templates/user/admin/monitor.tmpl

templates/user/admin/users.tmpl

templates/user/admin/view-user.tmpl

templates/user/articles.tmpl

templates/user/collections.tmpl

templates/user/export.tmpl

templates/user/include/header.tmpl

templates/user/settings.tmpl

updates.go

updates_test.go

Merge branch 'develop' into T713-oauth-account-management
cf4f08b264d4
Actions