eal
|
e30a056476
|
Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
|
2018-04-19 13:29:14 +03:00 |
|
William Pitcock
|
ee6f15529d
|
CommonAPI post: kill \r with fire
|
2018-04-18 15:46:39 -05:00 |
|
|
eal
|
b586ead6b8
|
rm_user: also ensure that cache is running.
|
2018-04-18 17:52:25 +03:00 |
|
lambda
|
8b5ea91f68
|
Merge branch 'fix/rm-user-task' into 'develop'
Fix rm_user task.
See merge request pleroma/pleroma!119
|
2018-04-18 14:41:03 +00:00 |
|
|
eal
|
4e3fc530db
|
Fix rm_user task.
|
2018-04-18 17:39:27 +03:00 |
|
|
eal
|
947431e9aa
|
MastoAPI and OAuth: allow login with either email or username.
|
2018-04-18 13:13:57 +03:00 |
|
Phenethylamine
|
13a64b82e3
|
Switch to User.delete for rm_user task
|
2018-04-12 14:30:53 -04:00 |
|
|
Phenethylamine
|
4478b9115c
|
Add rm_user mix task
|
2018-04-12 02:43:48 -04:00 |
|
Gian Sass
|
907df9b8ed
|
Fix issue #124
|
2018-04-11 14:55:49 -04:00 |
|
lain
|
b910483c16
|
Fix register_user task.
|
2018-04-10 21:05:53 +02:00 |
|
|
lain
|
1dd2c8163f
|
Order masto searches by date.
|
2018-04-10 18:38:52 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
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
|
806550c921
|
Use user url in mention if we have it.
|
2018-04-03 18:32:46 +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 |
|
Morgan Bazalgette
|
5e4bb4ad92
|
masto api: run emojis through mediaproxy
fixes #107
|
2018-04-02 12:04:11 +02:00 |
|
|
lambda
|
978df55a86
|
Merge branch 'feature/mastodon-search-tags' into 'develop'
mastodon search api: implement a reasonable hashtags stub
See merge request pleroma/pleroma!89
|
2018-04-01 08:37:45 +00:00 |
|
|
William Pitcock
|
2dcc6037d0
|
mastodon search api: implement a reasonable hashtags stub
|
2018-04-01 02:12:10 -05:00 |
|
|
William Pitcock
|
4bf86d4cf5
|
config: make the upload limit configurable
|
2018-03-31 19:53:23 -05:00 |
|
|
lambda
|
5fa8237bc1
|
Merge branch 'new-mastofe' into 'develop'
Bring Mastodon frontend up-to-date
See merge request pleroma/pleroma!87
|
2018-03-31 19:33:17 +00:00 |
|
|
lain
|
86525e3a34
|
Use correct linefeed.
|
2018-03-31 21:14:33 +02:00 |
|
|
lain
|
1b03981783
|
Small fix.
|
2018-03-31 21:11:46 +02:00 |
|
|
lain
|
94bbe1addc
|
Fix typo.
|
2018-03-31 21:10:56 +02:00 |
|
|
lain
|
8cbda7c0ee
|
Modify newlines.
|
2018-03-31 21:09:58 +02:00 |
|
|
lain
|
fe1dcf0027
|
Remove inspect.
|
2018-03-31 21:02:54 +02:00 |
|
|
lain
|
9f45e33ae8
|
Proper info.
|
2018-03-31 21:00:23 +02:00 |
|
|
lain
|
ae6e3cb981
|
No tabs.
|
2018-03-31 20:48:04 +02:00 |
|