hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5520 commits 1 branch 0 tags 218 MiB
Commit graph

5520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henry Jameson
2faac1cc48 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (36 commits)
  [#570] add user:notification stream
  fix for new instances
  no print version to the shell
  OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now.
  Update Phoenix to 1.4.8
  Apply suggestion to CHANGELOG.md
  Documentation: Document chat token response.
  Changelog: Document chat token.
  Mastodon API: Return the token needed for the chat.
  bugfix
  little fix
  version generation
  it is changed in compile time
  Fix rate limit test
  [#948] /api/v1/account_search added optional parameters (limit, offset, following)
  Fix hashtags being picked up by rich media parser
  Add copyright info to containment.ex
  Mastodon API: Document changes.
  MastodonAPI: Add a way to update the background image.
  Improve rate limiter documentation
  ...
 2019-06-16 14:25:39 +03:00
rinpatch
efa445a75b Merge branch 'issues/570' into 'develop' 
[#570] add user:notification stream

See merge request pleroma/pleroma!1274
 2019-06-16 10:33:25 +00:00
Maksim
a04bf131e0 [#570] add user:notification stream 2019-06-16 10:33:25 +00:00
rinpatch
57d54a9f09 Merge branch 'fix/991-version-generation' into 'develop' 
version generation

Closes #991

See merge request pleroma/pleroma!1291
 2019-06-16 10:18:47 +00:00
lain
549a410fda Merge branch 'fix-for-new-isntances' into 'develop' 
fix for new instances

See merge request pleroma/pleroma!1294
 2019-06-16 10:01:15 +00:00
Alexander Strizhakov
7a4228be5a fix for new instances 2019-06-16 10:01:15 +00:00
Alex S
451593f45e no print version to the shell 2019-06-16 11:48:15 +08:00
lain
135c196769 Merge branch 'bugfix/980-polls-double-vote' into 'develop' 
MastodonAPI Controller: Band-Aid double vote problem.

See merge request pleroma/pleroma!1275
 2019-06-15 15:13:48 +00:00
lain
37ee6c6e2c Merge branch 'update/phoenix-and-plug' into 'develop' 
Update Phoenix

See merge request pleroma/pleroma!1290
 2019-06-15 15:09:14 +00:00
kaniini
52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop' 
[#963] No redirect on OOB OAuth authorize request with existing authorization

See merge request pleroma/pleroma!1276
 2019-06-15 13:45:50 +00:00
Mark Felder
9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f 
and this leftover artifact breaks compiling now.
 2019-06-15 07:04:01 -05:00
Mark Felder
2ad5a8511d Update Phoenix to 1.4.8 2019-06-15 07:03:26 -05:00
rinpatch
fb4af26d75 Merge branch 'feature/add-chat-token-to-masto-api' into 'develop' 
Mastodon API: Return the token needed for the chat.

See merge request pleroma/pleroma!1292
 2019-06-15 09:56:01 +00:00
lain
0632ed2f87 Apply suggestion to CHANGELOG.md 2019-06-15 09:27:27 +00:00
lain
6745bc951c Documentation: Document chat token response. 2019-06-15 11:11:45 +02:00
lain
5ea6e26da0 Changelog: Document chat token. 2019-06-15 11:02:05 +02:00
lain
a440cf856d Mastodon API: Return the token needed for the chat. 2019-06-15 10:59:35 +02:00
Alex S
e02f22d779 bugfix 2019-06-15 16:36:13 +08:00
Alex S
501705438f little fix 2019-06-15 16:24:49 +08:00
Alex S
baf58c1234 version generation 2019-06-15 12:02:21 +08:00
rinpatch
62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' 
AccountView: Add user background.

See merge request pleroma/pleroma!1280
 2019-06-14 16:49:28 +00:00
kaniini
270f09dbc2 Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop' 
Feature/905 dynamic configuration in sql

Closes #905

See merge request pleroma/pleroma!1195
 2019-06-14 15:45:05 +00:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time 
we can't change module attributes and endpoint settings in runtime
 2019-06-14 15:45:05 +00:00
rinpatch
b7fc722a2e Merge branch 'fix-rate-limit-test' into 'develop' 
Fix rate limit test

See merge request pleroma/pleroma!1289
 2019-06-14 14:50:19 +00:00
Egor Kislitsyn
ce823fa88e Fix rate limit test 2019-06-14 19:24:31 +07:00
lain
7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop' 
Fix hashtags being picked up by rich media parser

Closes #989

See merge request pleroma/pleroma!1288
 2019-06-14 11:52:04 +00:00
lain
a971b35785 Merge branch 'issues/948-account-search' into 'develop' 
[#948] /api/v1/account_search added optional parameters (limit, offset, following)

See merge request pleroma/pleroma!1270
 2019-06-14 11:39:57 +00:00
Maksim
ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
rinpatch
d0ebc0edf3 Fix hashtags being picked up by rich media parser 
Closes #989
 2019-06-14 14:34:42 +03:00
lain
f045d1437c Merge branch 'patch-2' into 'develop' 
Add copyright info to containment.ex

See merge request pleroma/pleroma!1286
 2019-06-14 09:42:04 +00:00
Egor
58a094b605 Add copyright info to containment.ex 2019-06-14 09:26:36 +00:00
lain
28cb9edde9 Merge branch '986-document-how-to-disable-rate-limiting' into 'develop' 
Resolve "Document how to disable rate limiting"

Closes #986

See merge request pleroma/pleroma!1285
 2019-06-14 09:26:26 +00:00
lain
774637a2f4 Mastodon API: Document changes. 2019-06-14 11:24:09 +02:00
lain
eac298083f MastodonAPI: Add a way to update the background image. 2019-06-14 11:19:22 +02:00
Egor Kislitsyn
b22b10d3aa Improve rate limiter documentation 
Documents how to disable rate limiting
 2019-06-14 15:02:10 +07:00
lain
00cc4880ce Merge branch 'feature/ci-release-build' into 'develop' 
CI: build otp releases for master and develop branches

See merge request pleroma/pleroma!1279
 2019-06-14 06:56:27 +00:00
lain
a1bbeef55c Merge branch 'release-move-out-application-dir' into 'develop' 
Set instance static/uploads to be outside of application directory in release config

See merge request pleroma/pleroma!1283
 2019-06-14 06:40:04 +00:00
rinpatch
ac3d43e620 Set instance static/uploads to be outside of application directory in release config 
In case of releases the application directory changes with each version
so the contents will not be accessible
 2019-06-14 01:42:56 +03:00
rinpatch
8fbe1a3b92 remove the feature branch from only 2019-06-13 22:31:15 +03:00
rinpatch
10c067cc47 Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop' 
pleroma_ctl: fix == instead of = and double quote the path to prevent globing

See merge request pleroma/pleroma!1282
 2019-06-13 19:25:48 +00:00
rinpatch
0876ac05ba pleroma_ctl: fix == instead of = and double quote the path to prevent globing 2019-06-13 22:16:57 +03:00
rinpatch
bb6a421afc Merge branch 'develop' into feature/ci-release-build 2019-06-13 21:37:56 +03:00
rinpatch
da4af72180 Merge branch 'remove-prometheus-nif' into 'develop' 
Prometheus: Remove flaky process collection NIF.

See merge request pleroma/pleroma!1281
 2019-06-13 18:37:12 +00:00
lain
315f090f59 Prometheus: Remove flaky process collection NIF. 2019-06-13 20:30:04 +02:00
rinpatch
fc4a8026d8 Remove a TODO 2019-06-13 21:23:37 +03:00
lain
5965efb216 AccountView: Add user background. 2019-06-13 19:08:05 +02:00
rinpatch
6426aefb16 Expire artifacts in 42 years 2019-06-13 18:24:39 +03:00
lain
6f5a0cc14e Merge branch 'fix/ogp-title' into 'develop' 
Rich Media Parser: Attempt to use <title> from HTML as a fallback

Closes #979

See merge request pleroma/pleroma!1277
 2019-06-13 13:26:39 +00:00
feld
163fa180f5 Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title' 
Improve <title> fallback; Add a test

See merge request feld/pleroma!1
 2019-06-13 12:49:01 +00:00
rinpatch
e322c665e0 Merge branch 'develop' into feature/ci-release-build 2019-06-13 13:54:24 +03:00