sorrow17/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
1638 commits 4 branches 74 tags 294 MiB
Commit graph

1638 commits

This branch
This branch
All branches
Author SHA1 Message Date
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

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
```
 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
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
KANEKO Yoshitaka
b3d67750f0 Fix conflict 2018-04-01 16:58:35 +09:00
KANEKO Yoshitaka
ee2503df3a revert to modified pleroma fe 2018-04-01 16:28:17 +09: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