4389 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roger Braun	5e7ceeba94	Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus	2017-04-20 10:16:41 +02:00
Roger Braun	cc330421fd	Better activities in ostatus.	2017-04-20 10:16:06 +02:00
dtluna	b248fc7dfb	Refactor unfollow/2	2017-04-20 10:57:37 +03:00
dtluna	01901d9835	Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name	2017-04-20 10:46:27 +03:00
dtluna	d952b6cd7b	Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name	2017-04-20 10:39:18 +03:00
Roger Braun	9167a2ebe3	Send frontend through phoenix.	2017-04-19 15:25:18 +02:00
lambadalambda	eda742c78b	Merge branch 'feature/user-timeline' into 'develop' ... Feature/user timeline See merge request !8	2017-04-19 05:50:24 -04:00
Roger Braun	d23f3e3cf3	Add webfinger and basic feed support.	2017-04-18 18:41:51 +02:00
dtluna	470f5f7cd6	Add user timeline spec test	2017-04-17 16:31:19 +03:00
Roger Braun	36e883cd4b	Add basic Ostatus user representer.	2017-04-17 14:12:36 +02:00
Roger Braun	ce6cc84a4a	Add basic webfinger.	2017-04-17 13:44:41 +02:00
lambadalambda	ac9817bdb0	Merge branch 'bugfix/repeated-follow-unfollow' into 'develop' ... Add error messages for repeated follows and unfollows See merge request !7	2017-04-17 05:46:59 -04:00
Roger Braun	6a0e69a8a3	Fix syntax error.	2017-04-17 11:43:44 +02:00
Roger Braun	a185ea63af	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop	2017-04-17 11:37:21 +02:00
Roger Braun	6bfd521974	Switch cache implementation for size limiting.	2017-04-17 11:36:17 +02:00
dtluna	369be708b2	Remove unnecesary queries	2017-04-16 17:42:15 +03:00
dtluna	f6e632d25b	Remove unnecesary asserts	2017-04-16 17:39:34 +03:00
lambadalambda	9a8f05e96d	Merge branch 'feature/help-test' into 'develop' ... Add help/test resource See merge request !3	2017-04-16 10:25:38 -04:00
dtluna	ef5033d7a7	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow	2017-04-16 17:18:34 +03:00
dtluna	f6547f7b7f	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name	2017-04-16 17:13:42 +03:00
dtluna	82914e1e4d	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name	2017-04-16 17:12:28 +03:00
dtluna	85bd480be3	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test	2017-04-16 17:10:25 +03:00
dtluna	5229b01944	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline	2017-04-16 17:08:17 +03:00
Roger Braun	e158e32124	Update frontend.	2017-04-16 16:07:14 +02:00
Roger Braun	eb9358c8d6	Add basic Avatar updating code.	2017-04-16 16:06:19 +02:00
dtluna	63f04b314d	Fix typo	2017-04-16 17:05:48 +03:00
dtluna	4b4ece2c74	Add user timeline fetching without credentials	2017-04-16 16:44:30 +03:00
Roger Braun	03a9c11d25	Display the users avatar if he has one set.	2017-04-16 15:40:50 +02:00
Roger Braun	d7e3b72c6a	Add avatar objects to user, fix specs.	2017-04-16 15:28:28 +02:00
Roger Braun	7617a593b9	Support data uris in uploads.	2017-04-16 14:23:30 +02:00
dtluna	7a0046d127	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline	2017-04-16 13:32:56 +03:00
dtluna	9a8c348aed	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name	2017-04-16 13:28:23 +03:00
dtluna	ce1eef9c98	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test	2017-04-16 13:25:38 +03:00
Roger Braun	b179b3413e	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop	2017-04-16 11:52:04 +02:00
Roger Braun	b41f3eff84	Preserve newlines in messages.	2017-04-16 11:51:00 +02:00
lambadalambda	a867842d75	Add license	2017-04-16 05:37:52 -04:00
Roger Braun	ca4d7f4607	Update frontend again.	2017-04-16 11:16:00 +02:00
Roger Braun	2652f5a684	Update frontend.	2017-04-16 11:04:30 +02:00
Roger Braun	5dac3727f1	Add registration to the TwAPI controller.	2017-04-16 11:01:24 +02:00
Roger Braun	b1edd94baa	Add user registration to TwAPI.	2017-04-16 10:25:27 +02:00
Roger Braun	40706b4c4f	Use changeset in user registration mix task.	2017-04-15 16:42:02 +02:00
Roger Braun	03c6148bb3	Add user registration changeset.	2017-04-15 16:40:09 +02:00
Roger Braun	4f7adb343c	Address liking / announcing to the original author.	2017-04-15 14:16:01 +02:00
Roger Braun	4799dc6991	Add retweeting to TwAPI controller.	2017-04-15 14:09:54 +02:00
Roger Braun	60c60de330	Add announcements / retweets to TwAPI.	2017-04-15 13:54:46 +02:00
Roger Braun	21c397820f	Add announcements to activitypub.	2017-04-15 12:11:20 +02:00
Roger Braun	7a47afed3c	Update object correctly after setting context.	2017-04-14 18:59:11 +02:00
Roger Braun	c83f279a7d	Add unliking to TwAPI controller.	2017-04-14 18:27:17 +02:00
Roger Braun	f4eea0847b	Add unfavoriting to TwAPI.	2017-04-14 18:15:15 +02:00
Roger Braun	a926038cd0	Add unliking to activitypub.	2017-04-14 18:09:30 +02:00