Commit graph

122 commits

Author SHA1 Message Date
Mark Felder 2ad5a8511d Update Phoenix to 1.4.8 2019-06-15 07:03:26 -05:00
lain 315f090f59 Prometheus: Remove flaky process collection NIF. 2019-06-13 20:30:04 +02:00
Egor Kislitsyn bf22ed5fbd Update auto_linker dependency 2019-06-12 15:53:33 +07:00
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn 2e5affce61 Add RateLimiter 2019-06-11 14:27:41 +07:00
rinpatch c47dc0de2c Load ex_syslog and copy pleroma_ctl 2019-06-08 17:17:10 +03:00
lain b5e3b1e58a Mix: Swallow git error messages during version number handling.
Otherwise sometimes a 'fatal' message will be printed, confusing users.
2019-06-04 16:58:40 +02:00
Ivan Tashkinov 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. 2019-06-02 17:45:32 +03:00
kaniini f0516d9114 Merge branch 'ssh-fixes' into 'develop'
Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
2019-05-22 18:57:34 +00:00
lain f323031927 Mix: Only start sshd when needed, second try. 2019-05-22 12:57:20 +02:00
lain f4cfcead88 Mix: Bring ecto-sql back to mainline. 2019-05-22 11:44:17 +02:00
lain db9a82d168 Linting. 2019-05-22 10:40:15 +02:00
lain b6cf62ddea Mix: Don't start esshd application if we don't need it. 2019-05-22 10:28:50 +02:00
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update 2019-05-17 11:33:04 +02:00
lain 718b59a263 Dependencies: Update ecto sql once more. 2019-05-17 11:19:30 +02:00
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library

See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
feld f831acf912 Excoveralls for code coverage 2019-05-15 15:19:20 +00:00
lain 88cc423fa3 Dependencies: Update Ecto SQL. 2019-05-15 16:45:26 +02:00
William Pitcock 071f78733a switch to pleroma/http_signatures library 2019-05-14 20:03:13 +00:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
feld c953ae8c3d Initial bundle of basic AdminFE
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
Conversations once more.

See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
xse c81b707030 Fix/ex_doc source links 2019-05-07 00:32:07 +00:00
lain 4c76f49e60 BBS: small fixes. 2019-05-04 15:06:18 +02:00
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
lain a23206a4ae Just have Benchee in all environments. 2019-05-03 20:28:06 +02:00
lain a7709cc267 Mix: Also have benchee in test. 2019-05-03 19:42:49 +02:00
lain 0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain 81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
Egor Kislitsyn 04fd7cf817 Update auto_linker 2019-05-01 15:18:12 +07:00
William Pitcock 2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00:00
rinpatch 37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Haelwenn 050339c223 Merge branch 'docs/changelog' into 'develop'
Add a changelog

See merge request pleroma/pleroma!1053
2019-04-13 20:29:05 +00:00
rinpatch 3a805cc35c Add a changelog 2019-04-13 00:31:18 +03:00
Egor f9af90c5aa Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
Mark Felder b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld 3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
href b655a8ea83 Add recon 2019-04-04 11:22:30 -05:00
Egor Kislitsyn d313a0c49c Update auto_linker dependency 2019-04-03 19:41:15 +07:00
Ivan Tashkinov eadafc88b8 [#923] Deps config adjustment (no override for httpoison), code analysis issues fixes. 2019-04-01 09:28:56 +03:00
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-01 08:49:32 +03:00
lain 17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02:00
Egor 9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
rinpatch dfae0050af Move out of Gitlab Wiki
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28 19:46:30 +03:00
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop'
Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
Ivan Tashkinov af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00