alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,341 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

9341 Commits

Author SHA1 Message Date
lain 33a5d0a238 Fix some test warnings. 2018-02-12 09:33:01 +01:00
lain 91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop 2018-02-12 08:15:37 +01:00
lain 3c80d9b277 Fix spec. 2018-02-12 08:15:03 +01:00
lain e946f300ae update frontend 2018-02-11 20:58:08 +01:00
lain dfc23e717f update frontend 2018-02-11 20:55:02 +01:00
lain 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon. 2018-02-11 20:43:33 +01:00
lain ce31f3a922 Twitter Representers: Handle Mastodon attachments. 2018-02-11 17:21:06 +01:00
Roger Braun ae1ec858f4 Basic AP user building. 2018-02-11 17:20:43 +01:00
Roger Braun c1d26751e6 Mocks: Add mastodon user json example. 2018-02-11 17:19:06 +01:00
lambda 1d52afe83e Merge branch 'feature/instance-specific-panel' into 'develop' 
add instance specific panel

See merge request pleroma/pleroma!66
 2018-02-11 09:32:48 +00:00
Hakaba Hitoyo 9cf293c84b Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel 2018-02-11 18:08:27 +09:00
Roger Braun 52200998c9 Merge branch 'develop' into feature/activitypub 2018-02-11 09:50:55 +01:00
Roger Braun 0e2ca77eec update frontend 2018-02-09 17:14:11 +01:00
hakabahitoyo a61f21ff4f print <link rel="next"> element in atom.feed 2018-02-09 23:10:32 +09:00
Hakaba Hitoyo 7124f12a94 introduce max_id parameter in feed.atom (debug) 2018-02-09 21:46:05 +09:00
Roger Braun 08f458e6df UtilController: Fix statusnet config api compatibility. 2018-02-09 13:43:12 +01:00
Hakaba Hitoyo 9c61f60558 introduce max_id parameter in feed.atom 2018-02-09 21:41:30 +09:00
lambda af854f7e01 Merge branch 'develop' into 'develop' 
action_fallback for OAuth Controller

See merge request pleroma/pleroma!63
 2018-02-09 08:57:54 +00:00
lambda f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop' 
Add config option for enabling/disabling chat.

See merge request pleroma/pleroma!58
 2018-02-08 18:18:28 +00:00
Calv Collins 73249fa5ff Changed fallback controller to handle all cases from OAuthController 2018-02-08 18:15:59 +00:00
Calv Collins 314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop 2018-02-08 16:58:31 +00:00
Calv Collins bdb5dd2194 Create action_fallback for username/password incorrect input 2018-02-08 16:57:30 +00:00
Roger Braun 2f291576e4 Fix compile errors on 1.4.5 2018-02-08 16:03:30 +01:00
Roger Braun 103eca482c update frontend 2018-02-07 13:44:52 +01:00
eal b1edfba3b9 Update required Elixir version in README 
Also remove the erlang packages, they're specified in the Debian guide.
 2018-02-06 00:06:29 +02:00
eal 8df0aee889 Merge branch 'fix/no-image-upload-filetype' into 'develop' 
Detect file type if none given.

See merge request pleroma/pleroma!62
 2018-02-05 21:57:17 +00:00
eal 286f6698ee Detect file type if none given. 2018-02-04 15:22:30 +02:00
Hakaba Hitoyo a2fac9b0e8 adjust panel.html 2018-02-04 00:31:46 +09:00
Hakaba Hitoyo bffc78f2a8 add backend default for instance specific panel 2018-02-03 23:09:26 +09:00
lambda 61c16193de Merge branch 'move-backend-images' into 'develop' 
Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
 2018-02-03 13:05:20 +00:00
Hakaba Hitoyo c8a2931549 add backend endpoint /images 2018-02-03 20:52:01 +09:00
Hakaba Hitoyo ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images 2018-02-03 20:43:14 +09:00
eal f0745148a3 Add config option for enabling/disabling chat. 2018-02-03 13:42:37 +02:00
Roger Braun 9a9766d648 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-02-02 17:14:58 +01:00
Roger Braun 2203fa2fdb Update frontend. 2018-02-02 17:14:23 +01:00
lambda 3163311098 Merge branch 'feature/remote-follow' into 'develop' 
Add remote following of local profiles.

See merge request pleroma/pleroma!59
 2018-02-02 07:33:09 +00:00
eal 29be70c008 Add remote following of local profiles. 2018-02-02 00:14:05 +02:00
eal ab83e0de6d TwitterAPI: Add is_local to user view. 2018-02-01 21:41:19 +02:00
eal 15cb3f2b01 Revert renaming emoji.txt 2018-01-31 23:47:42 +02:00
eal 0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop' 
Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55
 2018-01-31 18:34:52 +00:00
lambda 3fa6f3ae42 Merge branch 'fix/split-custom-emoji' into 'develop' 
Split emoji to default and custom.

See merge request pleroma/pleroma!56
 2018-01-31 15:24:36 +00:00
eal ab8b9ababa Split emoji to default and custom. 2018-01-31 16:29:22 +02:00
Hakaba Hitoyo 03c15a54f5 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:09:47 +09:00
Hakaba Hitoyo e47f60c053 provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 23:04:34 +09:00
Hakaba Hitoyo 10753178ea provide instance thumbnail at /api/v1/instance (debug) 2018-01-31 22:57:43 +09:00
Hakaba Hitoyo a4335e391f provide instance thumbnail at /api/v1/instance 2018-01-31 22:51:25 +09:00
Roger Braun 5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2018-01-30 12:21:05 +01:00
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop 2018-01-30 12:20:39 +01:00
Roger Braun 4501094606 Make specs less breaky. 2018-01-30 12:20:14 +01:00
Roger Braun 1bb3ba02f3 Fix specs. 2018-01-30 12:17:01 +01:00