Francis Dinh [Sat, 12 May 2018 15:11:13 +0000 (11:11 -0400)]
Merge branch 'feature/unrepeat-tests' into feature/unrepeats
Francis Dinh [Sat, 12 May 2018 15:10:49 +0000 (11:10 -0400)]
Update test fixture
Francis Dinh [Fri, 11 May 2018 19:34:46 +0000 (15:34 -0400)]
Revert "Log error when handling unrepeats"
This reverts commit
c17c55e989a47f0722b115ffba48b7a1b45b7628.
Francis Dinh [Fri, 11 May 2018 19:30:47 +0000 (15:30 -0400)]
Add tests for unrepeats
Francis Dinh [Fri, 11 May 2018 19:29:19 +0000 (15:29 -0400)]
Log error when handling unrepeats
Francis Dinh [Fri, 11 May 2018 15:59:53 +0000 (11:59 -0400)]
Probably better way of handling non-follow undos in ostatus
Francis Dinh [Fri, 11 May 2018 15:53:28 +0000 (11:53 -0400)]
Revert "Do not send non-follow undos over ostatus for now"
This reverts commit
07fdc072382007812dc6af80fa2912f6b6d987b8.
Francis Dinh [Fri, 11 May 2018 15:53:06 +0000 (11:53 -0400)]
Revert "Use [] instead of nil"
This reverts commit
42268b0981e47cacd9f27b985dcd0bf08819258b.
Francis Dinh [Fri, 11 May 2018 05:48:56 +0000 (01:48 -0400)]
Use [] instead of nil
Francis Dinh [Fri, 11 May 2018 05:45:10 +0000 (01:45 -0400)]
Do not send non-follow undos over ostatus for now
Francis Dinh [Wed, 9 May 2018 04:04:14 +0000 (00:04 -0400)]
Match proper number of values from unannounce
Francis Dinh [Wed, 9 May 2018 03:59:36 +0000 (23:59 -0400)]
Change argument order and call correct # of args
Francis Dinh [Wed, 9 May 2018 03:50:19 +0000 (23:50 -0400)]
Handle Undo activites containing an Announce
Francis Dinh [Wed, 9 May 2018 01:52:21 +0000 (21:52 -0400)]
Federate correct activity
Francis Dinh [Fri, 4 May 2018 07:19:48 +0000 (03:19 -0400)]
Fix formatting
Francis Dinh [Wed, 25 Apr 2018 05:58:50 +0000 (01:58 -0400)]
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
Francis Dinh [Wed, 25 Apr 2018 05:43:45 +0000 (01:43 -0400)]
Formatting fixes
Francis Dinh [Wed, 25 Apr 2018 04:46:28 +0000 (00:46 -0400)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
Francis Dinh [Wed, 25 Apr 2018 04:46:06 +0000 (00:46 -0400)]
Fix comment grammar
lambda [Tue, 24 Apr 2018 19:26:01 +0000 (19:26 +0000)]
Merge branch 'gitignore' into 'develop'
Gitignore
See merge request pleroma/pleroma!131
lain [Tue, 24 Apr 2018 19:25:31 +0000 (21:25 +0200)]
Fix formatting.
Rachel H [Tue, 24 Apr 2018 19:18:23 +0000 (12:18 -0700)]
Add common files to gitignore
lambda [Tue, 24 Apr 2018 17:21:28 +0000 (17:21 +0000)]
Merge branch 'feature/message-rewrite-facility' into 'develop'
message rewrite facility
See merge request pleroma/pleroma!112
lambda [Tue, 24 Apr 2018 12:28:59 +0000 (12:28 +0000)]
Update .gitlab-ci.yml
lain [Tue, 24 Apr 2018 12:25:17 +0000 (14:25 +0200)]
Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop
Dashie [Tue, 24 Apr 2018 12:12:23 +0000 (14:12 +0200)]
Correct syntax with mix format
Dashie [Tue, 24 Apr 2018 09:34:18 +0000 (11:34 +0200)]
Add User.decrease_note_count and call it from ActivityPub.delete
lambda [Tue, 24 Apr 2018 05:54:28 +0000 (05:54 +0000)]
Merge branch 'favicon_tag' into 'develop'
Fix endpoint for favicon
See merge request pleroma/pleroma!84
lain [Mon, 23 Apr 2018 17:23:45 +0000 (19:23 +0200)]
update frontend
lain [Mon, 23 Apr 2018 17:09:24 +0000 (19:09 +0200)]
update frontend
Francis Dinh [Mon, 23 Apr 2018 01:28:51 +0000 (21:28 -0400)]
Embed announce activity data instead of linking to it
Francis Dinh [Sun, 22 Apr 2018 23:42:28 +0000 (19:42 -0400)]
Revert "Rename make_unannounce_data helper to make_undo_data"
This reverts commit
c649ca89586ec83407b298c20f51a25318d777b9.
lain [Sun, 22 Apr 2018 08:01:10 +0000 (10:01 +0200)]
Small cleanup.
lain [Sun, 22 Apr 2018 07:56:24 +0000 (09:56 +0200)]
Merge branch 'develop' into fix/note-count-not-updating
Francis Dinh [Sun, 22 Apr 2018 05:55:41 +0000 (01:55 -0400)]
Rename make_unannounce_data helper to make_undo_data
This makes it a bit more easier to adapt for unlikes as well in the
future.
lain [Sat, 21 Apr 2018 16:28:24 +0000 (18:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 21 Apr 2018 16:24:45 +0000 (18:24 +0200)]
Formatter: Use proper escaping for links.
eal [Sat, 21 Apr 2018 09:58:04 +0000 (12:58 +0300)]
Update note count in ActivityPub.create.
lambda [Sat, 21 Apr 2018 08:05:36 +0000 (08:05 +0000)]
Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'
Resolve "Enable custom panel by default and have default content"
Closes #146
See merge request pleroma/pleroma!124
lambda [Sat, 21 Apr 2018 08:05:04 +0000 (08:05 +0000)]
Merge branch 'readme-update' into 'develop'
Elaborate on setup steps and CLI commands.
See merge request pleroma/pleroma!126
lambda [Sat, 21 Apr 2018 07:59:49 +0000 (07:59 +0000)]
Merge branch 'nginx-certbot-doc' into 'develop'
Add info about certbot with the webroot plugin to pleroma.nginx
See merge request pleroma/pleroma!125
lambda [Sat, 21 Apr 2018 07:57:33 +0000 (07:57 +0000)]
Update README.md
lain [Sat, 21 Apr 2018 07:43:53 +0000 (09:43 +0200)]
Formatting fixes.
lain [Sat, 21 Apr 2018 07:34:23 +0000 (09:34 +0200)]
add formatter
lain [Sat, 21 Apr 2018 07:30:15 +0000 (09:30 +0200)]
.
lain [Sat, 21 Apr 2018 07:28:44 +0000 (09:28 +0200)]
.
lain [Sat, 21 Apr 2018 07:27:35 +0000 (09:27 +0200)]
..
lain [Sat, 21 Apr 2018 07:24:51 +0000 (09:24 +0200)]
Update CI.
lain [Sat, 21 Apr 2018 07:22:31 +0000 (09:22 +0200)]
Make search use id index too.
Seems to be faster in general, query planner chooses well.
Francis Dinh [Sat, 21 Apr 2018 03:22:16 +0000 (23:22 -0400)]
Use correct activity for undo
Francis Dinh [Sat, 21 Apr 2018 03:09:19 +0000 (23:09 -0400)]
Fix federation of unreblog activity
csaurus [Fri, 20 Apr 2018 22:17:01 +0000 (18:17 -0400)]
Elaborate on setup steps and CLI commands.
* How to use MIX_ENV
* How to create a user
* Link to certbot's site with the webform which advises how to obtain
a certificate based on web server/OS.
csaurus [Fri, 20 Apr 2018 22:43:49 +0000 (18:43 -0400)]
Add info about certbot with the webroot plugin to pleroma.nginx
Francis Dinh [Fri, 20 Apr 2018 20:47:44 +0000 (16:47 -0400)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
Kawen [Fri, 20 Apr 2018 17:21:48 +0000 (19:21 +0200)]
formatting
Kawen [Fri, 20 Apr 2018 17:04:57 +0000 (19:04 +0200)]
enable instance panel by default, added some content
lain [Fri, 20 Apr 2018 11:10:57 +0000 (13:10 +0200)]
Formatting.
lain [Fri, 20 Apr 2018 11:09:41 +0000 (13:09 +0200)]
Add format checking to CI.
lain [Thu, 19 Apr 2018 19:44:29 +0000 (21:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 19 Apr 2018 19:44:11 +0000 (21:44 +0200)]
fix again
lambda [Thu, 19 Apr 2018 19:03:35 +0000 (19:03 +0000)]
Merge branch 'feature/qvitter-notification-endpoint' into 'develop'
TwitterAPI: Add Qvitter notification endpoint.
Closes #142
See merge request pleroma/pleroma!123
eal [Thu, 19 Apr 2018 18:46:59 +0000 (21:46 +0300)]
TwitterAPI: Add Qvitter notification endpoint.
lambda [Thu, 19 Apr 2018 14:30:13 +0000 (14:30 +0000)]
Merge branch 'patch-2' into 'develop'
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
nenolod@dereferenced.org [Thu, 19 Apr 2018 12:29:35 +0000 (12:29 +0000)]
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
lain [Thu, 19 Apr 2018 11:04:29 +0000 (13:04 +0200)]
fix again
lain [Thu, 19 Apr 2018 10:50:25 +0000 (12:50 +0200)]
Fix generate config
Dominik V. Salonen [Thu, 19 Apr 2018 10:42:22 +0000 (10:42 +0000)]
Ignore setup_db.psql and ignore a folder for custom emojis
Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
eal [Thu, 19 Apr 2018 10:29:14 +0000 (13:29 +0300)]
Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
lambda [Thu, 19 Apr 2018 07:41:09 +0000 (07:41 +0000)]
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
CommonAPI post: kill \r with fire
See merge request pleroma/pleroma!120
Francis Dinh [Thu, 19 Apr 2018 00:41:12 +0000 (20:41 -0400)]
Fix TwitterAPI.delete call
William Pitcock [Wed, 18 Apr 2018 20:30:59 +0000 (20:30 +0000)]
CommonAPI post: kill \r with fire
eal [Wed, 18 Apr 2018 14:52:25 +0000 (17:52 +0300)]
rm_user: also ensure that cache is running.
lambda [Wed, 18 Apr 2018 14:41:03 +0000 (14:41 +0000)]
Merge branch 'fix/rm-user-task' into 'develop'
Fix rm_user task.
See merge request pleroma/pleroma!119
eal [Wed, 18 Apr 2018 14:39:27 +0000 (17:39 +0300)]
Fix rm_user task.
lambda [Wed, 18 Apr 2018 11:26:38 +0000 (11:26 +0000)]
Merge branch 'fix/login-with-username-or-email' into 'develop'
MastoAPI and OAuth: allow login with either email or username.
See merge request pleroma/pleroma!118
eal [Wed, 18 Apr 2018 10:13:57 +0000 (13:13 +0300)]
MastoAPI and OAuth: allow login with either email or username.
Francis Dinh [Wed, 18 Apr 2018 10:00:40 +0000 (06:00 -0400)]
Handle unrepeats via the TwitterAPI
Francis Dinh [Wed, 18 Apr 2018 07:39:42 +0000 (03:39 -0400)]
Expose unannounce activity so that it can be tested
Francis Dinh [Wed, 18 Apr 2018 00:35:07 +0000 (20:35 -0400)]
Add federation for unrepeats
lain [Tue, 17 Apr 2018 09:09:19 +0000 (11:09 +0200)]
update frontend
Francis Dinh [Tue, 17 Apr 2018 08:13:08 +0000 (04:13 -0400)]
Add make_unannounce_data helper function
Francis Dinh [Tue, 17 Apr 2018 08:12:16 +0000 (04:12 -0400)]
Remove unretweet function for now
Francis Dinh [Tue, 17 Apr 2018 03:30:52 +0000 (23:30 -0400)]
Return target status in MastoAPI endpoint instead of reblog activity
Francis Dinh [Mon, 16 Apr 2018 14:59:32 +0000 (10:59 -0400)]
doc fixes
Francis Dinh [Sun, 15 Apr 2018 02:34:06 +0000 (22:34 -0400)]
Add unreblogging tests
Francis Dinh [Sat, 14 Apr 2018 07:39:16 +0000 (03:39 -0400)]
Add unrepeat functionality
William Pitcock [Sat, 14 Apr 2018 11:31:12 +0000 (11:31 +0000)]
ActivityPub MRF: implement the SimplePolicy policy
William Pitcock [Sat, 14 Apr 2018 09:20:18 +0000 (09:20 +0000)]
ActivityPub: implement MRF core hook and baseline noop policy object
lambda [Fri, 13 Apr 2018 09:46:58 +0000 (09:46 +0000)]
Update README.md
lambda [Fri, 13 Apr 2018 07:43:32 +0000 (07:43 +0000)]
Merge branch 'mix_task_rm_user' into 'develop'
Add rm_user mix task
See merge request pleroma/pleroma!109
Phenethylamine [Thu, 12 Apr 2018 18:30:53 +0000 (14:30 -0400)]
Switch to User.delete for rm_user task
Phenethylamine [Thu, 12 Apr 2018 06:43:48 +0000 (02:43 -0400)]
Add rm_user mix task
lambda [Wed, 11 Apr 2018 20:58:25 +0000 (20:58 +0000)]
Merge branch 'develop' into 'develop'
Fix issue #124
Closes #124
See merge request pleroma/pleroma!108
lain [Wed, 11 Apr 2018 20:03:28 +0000 (22:03 +0200)]
update frontend
lain [Wed, 11 Apr 2018 19:55:38 +0000 (21:55 +0200)]
update frontend
Gian Sass [Wed, 11 Apr 2018 19:51:02 +0000 (15:51 -0400)]
Oops
Gian Sass [Wed, 11 Apr 2018 19:48:32 +0000 (15:48 -0400)]
Add unit test for pinned statuses
Gian Sass [Wed, 11 Apr 2018 18:55:49 +0000 (14:55 -0400)]
Fix issue #124
lambda [Wed, 11 Apr 2018 14:27:52 +0000 (14:27 +0000)]
Merge branch 'feld-hackneyupdate' into 'develop'
Update httpoison to get the latest hackney.
See merge request pleroma/pleroma!107
Mark Felder [Wed, 11 Apr 2018 13:55:54 +0000 (13:55 +0000)]
Update httpoison to get the latest hackney.
Works on my computer ^TM
projects / akkoma / log