lain
1dd2c8163f
Order masto searches by date.
2018-04-10 18:38:52 +02:00
lambda
d7654f4b3c
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
...
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
See merge request pleroma/pleroma!104
2018-04-10 14:46:04 +00:00
lambda
6ff583e5e1
Merge branch 'feld-varnish' into 'develop'
...
Remove attempted caching of toots
See merge request pleroma/pleroma!106
2018-04-10 14:45:46 +00:00
Mark Felder
fcb32345d7
Remove attempted caching of toots
...
This does not work as expected. We should not attempt to be clever here.
Varnish will do the right thing if we just teach Pleroma to set headers
properly for content we know can be cached.
2018-04-10 14:17:23 +00:00
lambda
fcc941adfd
Merge branch 'patch-1' into 'develop'
...
Indentation for Apache vhost
See merge request pleroma/pleroma!105
2018-04-10 08:14:38 +00:00
Stanislas
73ca18744e
Indentation for Apache vhost
2018-04-10 08:08:27 +00:00
Morgan Bazalgette
fc13a3ff24
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
2018-04-09 22:00:42 +02:00
lambda
d7c2909ce2
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'
...
user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99
2018-04-09 08:42:01 +00:00
lambda
210755ac46
Merge branch 'develop' into 'develop'
...
Fix max upload size in nginx config.
See merge request pleroma/pleroma!102
2018-04-09 08:41:34 +00:00
William Pitcock
2edde06042
user: strip leading @ from user query when searching for users if present
...
closes #117
2018-04-09 02:42:37 -05:00
lambda
2d0a2d9466
Merge branch 'develop' into 'develop'
...
Apache config for everything on one host.
See merge request pleroma/pleroma!103
2018-04-09 06:58:28 +00:00
nepfag
5cb3d441bc
Apache config for everything on one host.
2018-04-08 19:22:24 +00:00
Hector A. Escobedo
7e262c2997
Fix max upload size in nginx config.
...
The built-in nginx default does not allow users to upload images
larger than 1 MB. This increases the maximum request size to match
the default Pleroma config upload_limit parameter. Some helpful
comments were also added.
2018-04-08 11:21:29 -04:00
lambda
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
lambda
9a2d3705c6
Merge branch 'fix/persisted-mastofe-settings' into 'develop'
...
MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98
2018-04-08 06:01:06 +00:00
William Pitcock
1857f403be
mastodon api: report version as the Mastodon API version supported with the real version in parenthesis
2018-04-07 17:29:28 -05:00
William Pitcock
52a1a40d7d
mastodon api: implement /api/v1/lists stub
2018-04-07 17:29:27 -05:00
lain
8f9bcc4ab0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-07 16:41:47 +02:00
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.
2018-04-07 16:40:45 +02:00
lain
a9203ab363
Update Readme.
2018-04-07 16:35:55 +02:00
eal
7c47534970
MastoAPI: Persist frontend timelines and settings.
2018-04-07 17:26:56 +03:00
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
2018-04-07 12:19:49 +00:00
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
2018-04-07 12:19:08 +00:00
eal
e7ddda44c0
Follow import: allow URI in addition to screen_name.
2018-04-07 15:00:23 +03:00
William Pitcock
bf9d3d4aba
XML: use try/catch with XPath functions
2018-04-06 22:56:09 -05:00
lain
60f92e406c
Accept port number in urls.
2018-04-06 16:35:54 +02:00
lain
303289d7da
MastodonAPI search: return only create activities.
2018-04-05 13:59:53 +02:00
lambda
f5943f4a59
Delete Caddyfile
...
It doesn't work correctly.
2018-04-05 11:15:02 +00:00
lambda
45627dde17
Merge branch 'develop' into 'develop'
...
Fix failure to serve media from custom upload path
See merge request pleroma/pleroma!95
2018-04-05 10:54:07 +00:00
RX14
033771d9f1
Fix failure to serve media from custom upload path
2018-04-05 11:46:33 +01:00
lain
d70d1c427a
TwitterAPI: Don't put follows into the public tls.
2018-04-04 15:23:27 +02:00
lain
81600c94f4
Handle + in links.
2018-04-04 11:29:03 +02:00
lain
bf953989cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-03 18:34:07 +02:00
lain
806550c921
Use user url in mention if we have it.
2018-04-03 18:32:46 +02:00
lambda
925fb2f871
Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'
...
Bring mastofe up to date
See merge request pleroma/pleroma!93
2018-04-02 17:05:02 +00:00
Morgan Bazalgette
676f2ca479
Bring mastofe up to date
...
Commit 5edce20302#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
```
2018-04-02 18:31:57 +02:00
lain
b3b7ab5d9a
Load all users at once in timelines.
2018-04-02 16:35:41 +02:00
lain
96007753ad
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-02 15:29:05 +02:00
lain
360c51f1f5
Use context_ids directly if we have them.
2018-04-02 15:28:35 +02:00
lain
bc31bee7c4
Generates contexts and ids on insertion time.
2018-04-02 15:17:09 +02:00
lain
a4db3a732f
Pre-fetch conversation ids.
2018-04-02 14:46:56 +02:00
lambda
807d243c64
Merge branch 'fix-107' into 'develop'
...
masto api: run emojis through mediaproxy
Closes #107
See merge request pleroma/pleroma!92
2018-04-02 11:24:12 +00:00
lain
cd543d58a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-04-02 13:15:38 +02:00
lain
0a14d155d6
Fail faster.
2018-04-02 13:13:14 +02:00
lain
1b57522bba
Fix some test stuff.
2018-04-02 13:13:04 +02:00
lain
4e4a3e5e13
Add mock.
2018-04-02 13:12:47 +02:00
Morgan Bazalgette
5e4bb4ad92
masto api: run emojis through mediaproxy
...
fixes #107
2018-04-02 12:04:11 +02:00
lain
468e41d50c
Respond to proper ActivityPub type.
2018-04-01 14:58:01 +02:00
lambda
7130e9ddb1
Merge branch 'mastofe-f48f11d4' into 'develop'
...
update mastofe
See merge request pleroma/pleroma!90
2018-04-01 09:51:34 +00:00
Morgan Bazalgette
6d20410314
update mastofe
2018-04-01 11:36:53 +02:00
