f4cfcead88
Mix: Bring ecto-sql back to mainline.
2019-05-22 11:44:17 +02:00
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
718b59a263
Dependencies: Update ecto sql once more.
2019-05-17 11:19:30 +02:00
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
f831acf912
Excoveralls for code coverage
2019-05-15 15:19:20 +00:00
88cc423fa3
Dependencies: Update Ecto SQL.
2019-05-15 16:45:26 +02:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
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
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
c81b707030
Fix/ex_doc source links
2019-05-07 00:32:07 +00:00
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
a23206a4ae
Just have Benchee in all environments.
2019-05-03 20:28:06 +02:00
a7709cc267
Mix: Also have benchee in test.
2019-05-03 19:42:49 +02:00
0e37fddd5a
Search: Add fts index on objects table.
2019-05-03 19:21:09 +02:00
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
04fd7cf817
Update `auto_linker`
2019-05-01 15:18:12 +07:00
2bd880be88
mix: add bbcode dependency
2019-04-26 22:34:59 +00:00
37da03499e
Bump ex_doc
2019-04-16 14:53:17 +03:00
050339c223
Merge branch 'docs/changelog' into 'develop'
...
Add a changelog
See merge request pleroma/pleroma!1053
2019-04-13 20:29:05 +00:00
3a805cc35c
Add a changelog
2019-04-13 00:31:18 +03:00
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
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
b395aebf24
Pin recon dependency to 2.4.0
2019-04-06 09:30:36 -05:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
66e7b03372
Merge branch 'develop' into feature/prometheus
2019-04-04 15:39:42 -05:00
3b12eeda19
Add ability to ship logs to a Slack channel
2019-04-04 19:52:22 +00:00
b655a8ea83
Add recon
2019-04-04 11:22:30 -05:00
d313a0c49c
Update `auto_linker` dependency
2019-04-03 19:41:15 +07:00
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
2019-04-01 09:28:56 +03:00
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
17ab9fa45b
BBS: Some more functionality.
2019-03-31 18:01:16 +02:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
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
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
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
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
40c58d3383
Ignore compilation warnings for undefined module :eldap
2019-03-20 13:28:06 +02:00
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
2019-03-15 10:58:15 +01:00
63ab61ed3f
Sign in via Twitter (WIP).
2019-03-11 20:37:26 +03:00
cc7b35e097
Add status text to notifications (mentions and reposts)
2019-03-04 20:47:34 +03:00
e10ca35b3d
mix: update dependencies for cowboy 2.0
2019-02-28 15:44:07 +00:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
1c87102d01
mix: add timex dependency
2019-02-21 00:19:49 +00:00
a2f4fc49fe
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
...
# Conflicts:
# mix.exs
2019-02-17 17:39:45 +00:00
ccd30a1875
Fix formating
2019-02-17 12:07:49 +03:00
006bec8c6a
Add differences in MastoAPI responses to mix.exs extras
2019-02-17 10:34:00 +03:00
lain