lain
|
8f9bcc4ab0
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
7 years ago |
|
lain
|
70bcdf32bd
|
Only search in public data for now.
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
|
7 years ago |
|
lain
|
a9203ab363
|
Update Readme.
|
7 years ago |
|
eal
|
7c47534970
|
MastoAPI: Persist frontend timelines and settings.
|
7 years ago |
|
lambda
|
d41bfd1d47
|
Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'
webfinger: handle situations where the well-known endpoint returns HTML
See merge request pleroma/pleroma!94
|
7 years ago |
|
lambda
|
2dc0c41946
|
Merge branch 'fix/follow-import-by-uri' into 'develop'
Follow import: allow URI in addition to screen_name.
See merge request pleroma/pleroma!96
|
7 years ago |
|
eal
|
e7ddda44c0
|
Follow import: allow URI in addition to screen_name.
|
7 years ago |
|
William Pitcock
|
bf9d3d4aba
|
XML: use try/catch with XPath functions
|
7 years ago |
|
lain
|
60f92e406c
|
Accept port number in urls.
|
7 years ago |
|
lain
|
303289d7da
|
MastodonAPI search: return only create activities.
|
7 years ago |
|
lambda
|
f5943f4a59
|
Delete Caddyfile
It doesn't work correctly.
|
7 years ago |
|
lambda
|
45627dde17
|
Merge branch 'develop' into 'develop'
Fix failure to serve media from custom upload path
See merge request pleroma/pleroma!95
|
7 years ago |
|
RX14
|
033771d9f1
|
Fix failure to serve media from custom upload path
|
7 years ago |
|
lain
|
d70d1c427a
|
TwitterAPI: Don't put follows into the public tls.
|
7 years ago |
|
lain
|
81600c94f4
|
Handle + in links.
|
7 years ago |
|
lain
|
bf953989cd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
7 years ago |
|
lain
|
806550c921
|
Use user url in mention if we have it.
|
7 years ago |
|
lambda
|
925fb2f871
|
Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'
Bring mastofe up to date
See merge request pleroma/pleroma!93
|
7 years ago |
|
Morgan Bazalgette
|
676f2ca479
|
Bring mastofe up to date
Commit 5edce20302
summary:
```
* 5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD)
|\
| * 2c51bc0c - (4 hours ago) Add missing rejection handling for Promises (#7008) - unarist (upstream/master)
| * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith
| * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith
| * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi
| * b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov
| * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82
| * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko
| * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko
| * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood
| * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi
| * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith
* | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette
* | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette
* | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette
* | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette
* | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette
* | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette
* | 00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
|\ \
| |/
| * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82
* | 05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
\ \
|/
* 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak
```
|
7 years ago |
|
lain
|
b3b7ab5d9a
|
Load all users at once in timelines.
|
7 years ago |
|
lain
|
96007753ad
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
7 years ago |
|
lain
|
360c51f1f5
|
Use context_ids directly if we have them.
|
7 years ago |
|
lain
|
bc31bee7c4
|
Generates contexts and ids on insertion time.
|
7 years ago |
|
lain
|
a4db3a732f
|
Pre-fetch conversation ids.
|
7 years ago |
|
lambda
|
807d243c64
|
Merge branch 'fix-107' into 'develop'
masto api: run emojis through mediaproxy
Closes #107
See merge request pleroma/pleroma!92
|
7 years ago |
|
lain
|
cd543d58a1
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
7 years ago |
|
lain
|
0a14d155d6
|
Fail faster.
|
7 years ago |
|
lain
|
1b57522bba
|
Fix some test stuff.
|
7 years ago |
|
lain
|
4e4a3e5e13
|
Add mock.
|
7 years ago |
|
Morgan Bazalgette
|
5e4bb4ad92
|
masto api: run emojis through mediaproxy
fixes #107
|
7 years ago |
|
lain
|
468e41d50c
|
Respond to proper ActivityPub type.
|
7 years ago |
|
lambda
|
7130e9ddb1
|
Merge branch 'mastofe-f48f11d4' into 'develop'
update mastofe
See merge request pleroma/pleroma!90
|
7 years ago |
|
Morgan Bazalgette
|
6d20410314
|
update mastofe
|
7 years ago |
|
lambda
|
24296047dc
|
Merge branch 'feature/cors' into 'develop'
web endpoint: better document CORS stuff with nginx
See merge request pleroma/pleroma!82
|
7 years ago |
|
lambda
|
978df55a86
|
Merge branch 'feature/mastodon-search-tags' into 'develop'
mastodon search api: implement a reasonable hashtags stub
See merge request pleroma/pleroma!89
|
7 years ago |
|
lambda
|
1dcc700cca
|
Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable
See merge request pleroma/pleroma!88
|
7 years ago |
|
KANEKO Yoshitaka
|
b3d67750f0
|
Fix conflict
|
7 years ago |
|
KANEKO Yoshitaka
|
ee2503df3a
|
revert to modified pleroma fe
|
7 years ago |
|
William Pitcock
|
2dcc6037d0
|
mastodon search api: implement a reasonable hashtags stub
|
7 years ago |
|
William Pitcock
|
d8464b603e
|
nginx: document how to enable CORS support
|
7 years ago |
|
William Pitcock
|
4bf86d4cf5
|
config: make the upload limit configurable
|
7 years ago |
|
lambda
|
5fa8237bc1
|
Merge branch 'new-mastofe' into 'develop'
Bring Mastodon frontend up-to-date
See merge request pleroma/pleroma!87
|
7 years ago |
|
lain
|
86525e3a34
|
Use correct linefeed.
|
7 years ago |
|
lain
|
1b03981783
|
Small fix.
|
7 years ago |
|
lain
|
94bbe1addc
|
Fix typo.
|
7 years ago |
|
lain
|
8cbda7c0ee
|
Modify newlines.
|
7 years ago |
|
lain
|
fe1dcf0027
|
Remove inspect.
|
7 years ago |
|
lain
|
9f45e33ae8
|
Proper info.
|
7 years ago |
|
lain
|
ae6e3cb981
|
No tabs.
|
7 years ago |
|
lain
|
2222e5599c
|
Don't fetch anything except ap_id for follower / following
collections.
Should speed up the queries because ecto doesn't have to parse the json.
|
7 years ago |
