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 |
|
lambda
|
24296047dc
|
Merge branch 'feature/cors' into 'develop'
web endpoint: better document CORS stuff with nginx
See merge request pleroma/pleroma!82
|
2018-04-01 08:38:31 +00: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 |
|
lambda
|
1dcc700cca
|
Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable
See merge request pleroma/pleroma!88
|
2018-04-01 08:36:48 +00:00 |
|
William Pitcock
|
2dcc6037d0
|
mastodon search api: implement a reasonable hashtags stub
|
2018-04-01 02:12:10 -05:00 |
|
William Pitcock
|
d8464b603e
|
nginx: document how to enable CORS support
|
2018-04-01 01:28:27 -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 |
|
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.
|
2018-03-31 20:02:09 +02:00 |
|
lain
|
57b24b2cba
|
Gopher: Add like / repeat count.
|
2018-03-31 20:01:55 +02:00 |
|
Morgan Bazalgette
|
7f2174d811
|
Remove pl-dark-masto-fe, add preloading for common scripts
|
2018-03-31 19:14:47 +02:00 |
|
Morgan Bazalgette
|
ce1f66aa2d
|
Update with mastofe repo
|
2018-03-31 19:14:05 +02:00 |
|
Morgan Bazalgette
|
10773888ad
|
Bring Mastodon frontend up-to-date
with my fork of it, @ https://git.pleroma.social/howl/mastofe .
|
2018-03-31 18:15:28 +02:00 |
|
lain
|
4e5aa3b3a0
|
Add gopher server.
|
2018-03-31 18:12:20 +02:00 |
|
lain
|
5cc1cfcfd7
|
update frontend
|
2018-03-31 12:52:34 +02:00 |
|
lain
|
802736679c
|
Remove unused ActivityRepresenter module.
|
2018-03-30 16:50:30 +02:00 |
|
lain
|
7ab94ae22d
|
TwitterApiController: Use ActivityView.
|
2018-03-30 16:30:16 +02:00 |
|
lain
|
e90f8f6c4b
|
TwApi ActivityView: Add delete activities.
|
2018-03-30 15:32:43 +02:00 |
|
lain
|
1f32ba052c
|
TwApi ActivityView: Add follows.
|
2018-03-30 15:17:13 +02:00 |
|
lain
|
4afbef39f4
|
Format the code.
|
2018-03-30 15:01:53 +02:00 |
|
lain
|
480932c8e5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-03-30 14:48:08 +02:00 |
|
lain
|
c1d529ee94
|
TwApi ActivityView: Add announces.
|
2018-03-30 14:46:36 +02:00 |
|
lain
|
1f1caab138
|
TwApi ActivityView: Add Like rendering.
|
2018-03-30 13:49:09 +02:00 |
|
lain
|
361016349f
|
Add ActivityViewTest.
|
2018-03-30 12:57:55 +02:00 |
|
lain
|
675839e13c
|
Fix TwApi reply visibility.
|
2018-03-30 12:19:57 +02:00 |
|
lambda
|
b9ee17a853
|
Merge branch 'char-limit-mastofe' into 'develop'
Add char_limit to initial-state of mastofe
See merge request pleroma/pleroma!86
|
2018-03-30 06:31:06 +00:00 |
|
Morgan Bazalgette
|
457e040473
|
Add char_limit to initial-state of mastofe
|
2018-03-30 00:59:49 +02:00 |
|
lain
|
6dc98aaf89
|
Clean up prod.exs a bit.
|
2018-03-28 16:03:42 +02:00 |
|
lambda
|
f8f3abe1be
|
Update pleroma.nginx
|
2018-03-28 09:34:08 +00:00 |
|
lain
|
df8fc72491
|
Don't go through all available emoji.
object carry their emoji information.
|
2018-03-28 09:56:32 +02:00 |
|
lain
|
e30752bc79
|
Add basic activity view.
|
2018-03-27 22:24:19 +02:00 |
|