tim/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
725 commits 3 branches 74 tags 292 MiB
Commit graph

725 commits

This branch
This branch
All branches
Author SHA1 Message Date
eal
146ec80285 Merge branch 'fix/mastofe-login-redirect' into 'develop' 
Redirect to Getting Started on login.

See merge request pleroma/pleroma!21
 2017-11-18 14:38:05 +00:00
eal
7b397ed125 Merge branch 'sensitive-content-bit' into 'develop' 
Add #nsfw tag if sensitive content bit is set

Closes #78

See merge request pleroma/pleroma!23
 2017-11-18 14:34:37 +00:00
eal
f53cdabcdf Add #nsfw tag if sensitive content bit is set 2017-11-18 16:30:18 +02:00
Roger Braun
4647bcd6e6 Don't start streamer during tests. 2017-11-18 12:22:07 +01:00
eal
9c60cc88df Redirect to Getting Started on login. 2017-11-16 20:47:44 +02:00
Roger Braun
a743940463 MastoAPI: Implement all streaming functions. 2017-11-16 16:49:51 +01:00
Roger Braun
5719f69ae3 MastodonAPI: Stream fixes. 2017-11-16 13:48:58 +01:00
lambda
a2d7e0f4d4 Merge branch 'feature/masto-styled-login-page' into 'develop' 
Add styles to make login page resemble mastodon's

See merge request pleroma/pleroma!20
 2017-11-16 12:01:07 +00:00
Roger Braun
43499848d0 Small css fix. 2017-11-16 12:58:33 +01:00
Shpuld Shpuldson
189513e4ff Add styles to make login page resemble mastodon's 2017-11-16 13:26:56 +02:00
Roger Braun
8de890a0d9 Add custom emoji to Mastodon UI initial state. 2017-11-16 09:40:06 +01:00
Roger Braun
3d1360c4d6 Add mastodon emoji folder. 2017-11-16 09:35:14 +01:00
Roger Braun
ced0d64d75 MastoAPI: Make attachment ids strings. 2017-11-15 18:58:39 +01:00
lambda
1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop' 
TwitterAPI: Add missing endpoints for bitlbee.

Closes #67

See merge request pleroma/pleroma!18
 2017-11-14 16:47:54 +00:00
lambda
1eb7a862d2 Merge branch 'twitterapi-show-user' into 'develop' 
TwitterAPI: Add /users/show.

See merge request pleroma/pleroma!19
 2017-11-14 16:44:25 +00:00
eal
f9828e578c TwitterAPI: Add /users/show. 2017-11-14 17:34:48 +02:00
lambda
0a69611884 Merge branch 'api-links' into 'develop' 
Add links to API documentation.

See merge request pleroma/pleroma!17
 2017-11-14 14:19:39 +00:00
eal
312d389f56 Add links to API documentation. 2017-11-14 16:15:52 +02:00
eal
163c658202 TwitterAPI: Add unimplemented /mutes/users/ids. 2017-11-14 16:12:52 +02:00
eal
22bbe27115 TwitterAPI: Add unimplemented /friendships/no_retweets/ids. 2017-11-14 16:10:13 +02:00
lambda
dd76036cbb Merge branch 'mastoapi-media-timeline' into 'develop' 
MastoAPI: Add media timelines.

Closes #63

See merge request pleroma/pleroma!16
 2017-11-14 14:09:36 +00:00
eal
3533bf7eac TwitterAPI: Add /friends/ids. 2017-11-14 16:04:58 +02:00
eal
06c3ee3bac Accept 1 as true. 2017-11-14 15:54:50 +02:00
eal
c84723b679 MastoAPI: Add media timelines. 2017-11-14 15:41:16 +02:00
Roger Braun
773eba4f0b Update frontend. 2017-11-14 09:34:28 +01:00
Roger Braun
083cd169d2 MastoAPI: Fix repeat api bug. 
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
 2017-11-13 09:48:56 +01:00
Roger Braun
5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-12 14:25:15 +01:00
Roger Braun
d293ceb1b5 Add Mastodon frontend. 2017-11-12 14:23:05 +01:00
lambda
08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop' 
MastoAPI: Add notification endpoints get, clear and dismiss.

Closes #42

See merge request pleroma/pleroma!13
 2017-11-12 11:08:06 +00:00
lambda
87dee3902a Merge branch 'filetype-recognition' into 'develop' 
Use headers for file content type recognition.

See merge request pleroma/pleroma!14
 2017-11-12 09:27:59 +00:00
lambda
efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop' 
MastoAPI: Add update credentials endpoint.

Closes #61

See merge request pleroma/pleroma!15
 2017-11-12 09:24:32 +00:00
eal
18a95cd375 Add common video and audio types. 2017-11-12 01:20:50 +02:00
eal
fc7483cb3c MastoAPI: Add update credentials endpoint. 2017-11-12 00:27:09 +02:00
eal
260b148b92 Use headers for file content type recognition. 2017-11-11 23:24:54 +02:00
Roger Braun
414c52509b MastoAPI: Websocket streaming for federated timeline. 2017-11-11 20:00:11 +01:00
Roger Braun
bd5bdc4c24 MastoAPI: Basic streaming. 2017-11-11 14:59:25 +01:00
Roger Braun
a1923d20e8 MastoAPI: Fix reblog emojis. 2017-11-11 11:18:05 +01:00
Roger Braun
fd12e585c9 Handle existing redirect params. 2017-11-10 18:24:50 +01:00
Roger Braun
1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-10 17:37:54 +01:00
Roger Braun
6e9c22c0af MastoAPI: Use string ids everywhere. 2017-11-10 17:18:19 +01:00
eal
e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss. 2017-11-10 15:24:52 +02:00
Roger Braun
1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-09 16:49:32 +01:00
Roger Braun
266d9c008d MastoAPI: Fetch statuses in search. 2017-11-09 16:48:45 +01:00
lambda
2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop' 
Correct mimetype on bad uploads.

See merge request pleroma/pleroma!12
 2017-11-09 14:41:44 +00:00
Roger Braun
ccde03285d add sort index for activities 2017-11-09 15:16:10 +01:00
eal
e942e1e552 Correct mimetype on bad uploads. 2017-11-09 15:01:59 +02:00
Roger Braun
9e60de695d Fix migration for empty db. 2017-11-09 13:45:17 +01:00
Roger Braun
6bf261589f Update activities in own migration. 2017-11-09 13:32:53 +01:00
Roger Braun
20b8b87743 Update in chunks. 2017-11-09 12:33:38 +01:00
Roger Braun
f1d27a5fbb Add actor column to activities. 2017-11-09 10:41:19 +01:00