9fcdca1bdc
Upload: Fix uploading with a : in the filename
2019-01-15 07:57:48 +01:00
e3eb75bd23
Upload: Fix uploading with a ? in the filename
2019-01-15 07:40:39 +01:00
e8eff9fe03
Fix Elixir 1.8 type annotation issue
2019-01-15 02:58:48 +02:00
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
2019-01-14 18:52:23 +00:00
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
2019-01-14 18:49:53 +00:00
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
2019-01-14 20:04:45 +03:00
42b7584068
URI escape file upload URLs
2019-01-14 11:31:44 -05:00
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
2019-01-14 07:28:04 +00:00
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
2019-01-14 07:27:05 +00:00
5f9786288d
Prefer ids to usernames
2019-01-14 09:52:52 +03:00
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
2019-01-14 05:42:38 +00:00
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
b8a77c5d70
Add OEmbed parser
2019-01-13 02:06:50 +02:00
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
2019-01-12 20:24:41 +01:00
581edd5a91
Add route to get object like activities
2019-01-12 20:24:38 +01:00
36711e1c83
Handle client submitted activitypub like activity
2019-01-12 20:24:35 +01:00
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
9daf162461
Honour parameters on MastoAPI /favourites
2019-01-12 14:42:52 +00:00
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
2019-01-12 14:03:35 +00:00
b594a54d0c
unpin when deleting a status
2019-01-11 12:31:31 +07:00
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
2019-01-10 18:42:36 +00:00
1f851a0723
Add Twitter Card parser
2019-01-10 18:09:56 +00:00
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
2019-01-10 03:54:29 +00:00
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
2019-01-10 03:45:58 +00:00
2ecf81f10c
common api: fix newlines in markdown code blocks
2019-01-10 03:37:37 +00:00
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +00:00
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
2019-01-10 02:31:29 +00:00
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
2019-01-09 18:42:00 +00:00
a2d7f0e0e9
Remove :commit since a tuple is already returned
2019-01-09 21:35:01 +03:00
a99e156f2c
Add integer casts.
2019-01-09 18:17:23 +01:00
7ac152ed38
TwitterAPI: Add follower/following pagination.
2019-01-09 18:14:32 +01:00
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
2019-01-09 16:26:38 +00:00
5027f82cde
Add activity visibility index.
2019-01-09 16:45:09 +01:00
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
2019-01-09 12:38:23 +01:00
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
2019-01-09 17:40:15 +07:00
65fc2df7cc
Use follow_all in autofollow.
2019-01-09 11:38:45 +01:00
26938d65fd
Add User mass following function.
2019-01-09 11:35:23 +01:00
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
2019-01-09 16:56:31 +07:00
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
2019-01-09 07:09:39 +00:00
f15183178c
user: fix auth_active?/1 for remote users
2019-01-09 06:45:17 +00:00
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
2019-01-09 06:44:50 +00:00
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
2019-01-09 06:21:21 +00:00
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
2019-01-09 06:02:18 +00:00
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-08 16:32:07 +07:00
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
e679da4c34
add `pinned` property to `StatusView`
2019-01-08 15:27:02 +07:00
63dbd87568
rename `post` to `status`
2019-01-08 15:25:50 +07:00
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
2019-01-07 20:59:30 +01:00
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
2019-01-07 17:09:52 +00:00
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-07 20:55:32 +07:00
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
2019-01-07 12:41:31 +01:00
36fa5e8802
Check visible_for_user when performing a search using a direct link.
2019-01-07 10:36:31 +00:00
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
2019-01-06 10:19:00 +00:00
042852ecf3
Add check to prevent multiple follow notifications from the same user
2019-01-05 22:54:25 +00:00
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
2019-01-05 22:34:47 +00:00
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
2019-01-05 22:29:08 +00:00
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
2019-01-05 21:52:02 +00:00
6556be344d
Resolve some test failures.
2019-01-05 18:20:42 +00:00
3c86d907d4
add some brakets to the emoji list.
2019-01-05 17:35:39 +00:00
0787f0dfbe
Strip HTML in and allow emoji in summaries.
2019-01-05 17:28:47 +00:00
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
2019-01-04 20:32:55 -08:00
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
2019-01-04 23:56:42 +00:00
487c00d36d
rich media: disable cachex in test mode
2019-01-04 23:53:26 +00:00
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
2019-01-04 23:35:56 +00:00
0964c207eb
rich media: use cachex to avoid flooding remote servers
2019-01-04 23:32:01 +00:00
1e2d58982e
oopsies
2019-01-05 00:25:31 +01:00
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
2019-01-05 00:19:46 +01:00
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
2019-01-04 20:50:18 +00:00
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
2019-01-04 20:32:10 +00:00
5b23dfa1c5
handle null
2019-01-04 01:35:26 -08:00
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
2019-01-03 22:30:02 +00:00
eaaf701319
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
...
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
2019-01-03 18:53:30 +00:00
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
eb1a18d22f
user: check that the follow request actually has an active account associated with it
...
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
2019-01-02 22:47:12 +00:00
943211b035
rewrites List.foldl to Enum.each
2019-01-02 21:21:40 +00:00
48e81d3d40
Add RichMediaController and tests
2019-01-02 17:02:50 +03:00
4e1cc2bab6
Implement delete activity
2019-01-01 23:20:43 +01:00
551c3d9391
Split create activity specifics from update_outbox
2019-01-01 23:20:28 +01:00
917d48d09b
Better variable name
2019-01-01 23:29:47 +03:00
2aab4e03c3
Add OGP parser
2019-01-01 23:26:40 +03:00
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
2019-01-01 20:12:34 +00:00
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
2019-01-01 18:55:59 +00:00
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
2019-01-01 13:48:59 +00:00
400337b0a7
Make Federator options configurable.
2019-01-01 14:46:55 +01:00
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
2019-01-01 14:19:55 +01:00
d4799e0dc2
Remove default pool, it's used automatically anyway.
2019-01-01 13:49:24 +01:00
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
2018-12-31 19:50:14 +01:00
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
2018-12-31 15:49:34 +00:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
2018-12-31 09:56:26 +00:00
6ed9b31a5f
Eh?
2018-12-31 08:25:48 +01:00
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
2018-12-31 08:19:48 +01:00
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
2018-12-30 21:47:50 +00:00
dec23500d8
Resolve merge conflict
2018-12-30 21:00:40 +01:00
ab3089d6a7
Fix comment in object.ex
2018-12-30 20:51:31 +01:00
c50353e6ae
shame on me for not testing after revert
2018-12-30 20:44:17 +01:00
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
2018-12-30 20:16:42 +01:00
62af23bd26
Revert some changes in html.ex
2018-12-30 20:12:12 +01:00
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
2018-12-30 20:00:01 +01:00
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
2018-12-30 19:33:36 +01:00
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
2018-12-30 16:51:16 +01:00
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
2018-12-30 15:16:26 +00:00
bce152aba0
Tidy up the code. Rename key to signature
2018-12-30 15:58:19 +01:00
66d1c31461
Fix some stupid typos
2018-12-30 13:51:01 +01:00
f40562b4e1
Respond with full activity to outbox post
2018-12-30 12:01:39 +01:00
1e781715c8
Limit activity types accepted to outbox to only 'Create'
2018-12-30 12:01:39 +01:00
569bad8210
Create activity when client posts to outbox
2018-12-30 12:01:39 +01:00
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
2018-12-30 12:01:39 +01:00
a32e23905a
Use Object.change instead of Ecto.Changeset.change
2018-12-30 11:08:19 +01:00
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
9a0163db53
use Kernel.put_in instead of Map.merge
2018-12-29 21:50:34 +01:00
816db3f494
Remove the debugging IO.inspect
2018-12-29 17:44:26 +00:00
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
2018-12-29 17:45:50 +01:00
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
2018-12-29 11:34:51 +00:00
523848d1fd
Salmon# fixed publish an activity to remote accounts
2018-12-29 12:48:54 +03:00
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
2018-12-29 12:26:23 +03:00
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
2018-12-29 12:15:46 +03:00
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
2018-12-29 12:02:37 +03:00
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
2018-12-29 03:03:18 +00:00
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
2018-12-28 23:01:03 +03:00
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
2018-12-28 22:47:42 +03:00
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
2018-12-28 18:33:14 +00:00
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
2018-12-28 21:08:07 +03:00
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
2018-12-28 17:38:32 +01:00
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
2018-12-28 14:35:25 +03:00
d8cc96cb1f
Fix Twitter timelines for private instances
2018-12-27 22:43:40 -08:00
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
2018-12-27 19:37:55 +00:00
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
2018-12-27 19:35:06 +00:00
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
2018-12-27 15:46:18 +03:00
be70272ab0
Treat only true and "true" as true
2018-12-27 13:21:04 +03:00
708a228919
Set ttl_interval to the seconds_valid time
2018-12-27 07:42:03 +00:00
e4562105e7
Implement exclude_reblogs and include_rts
2018-12-26 21:38:00 -08:00
838c024231
Treat any present value in "no_attachment_links" as true
2018-12-27 02:39:41 +03:00
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
2018-12-27 00:16:43 +03:00
551d80cc01
Expose restricted names in nodeinfo.
2018-12-26 12:46:16 +01:00
5811e65e67
Add some hard limits on inserted activities.
2018-12-26 12:39:35 +01:00
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25 20:10:45 +01:00
ca2e9ce9cc
Revert unneeded changes
2018-12-25 03:44:48 +03:00
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
2018-12-25 03:00:06 +03:00
2bbec33c71
Fix failing tests
2018-12-25 00:29:13 +03:00
18a4cbb244
Capitalize "tombstone"
2018-12-24 20:09:18 +03:00
0f412cf6e6
Create tombstone instead of object deletion
2018-12-24 02:25:36 +03:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
2018-12-23 14:46:58 +00:00
34a4ed22c4
twitter api: add "Video" to supported activity types list
2018-12-23 14:00:54 +00:00
79b51a97fe
twitter api: activity representer: remove peertube hack
2018-12-23 14:00:50 +00:00
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
2018-12-23 13:40:33 +00:00
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
2018-12-23 13:31:08 +00:00
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
2018-12-23 13:17:25 +00:00
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
2018-12-23 13:00:25 +00:00
a7f07bb6e5
Implement kaniini's tweaks
2018-12-23 12:24:53 +01:00
c76179419d
Renamed the things
2018-12-23 11:14:29 +01:00
409ff60bf8
Fix formatting
2018-12-22 23:32:38 +01:00
92362e1e22
Implement large thread filter
2018-12-22 23:18:31 +01:00
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
2018-12-22 22:42:14 +03:00
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
2018-12-20 14:48:48 +03:00
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
2018-12-20 13:05:42 +03:00
501ce34d7f
[ #114 ] Stylistic adjustments.
2018-12-20 12:55:12 +03:00
f1b93b5be7
[ #413 ] fix parse mentions
2018-12-20 09:35:01 +00:00
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
2018-12-20 04:01:54 +00:00
652f49d176
Remove extra bracket
2018-12-19 23:06:10 +04:00
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
b520d44b58
[ #114 ] `mix format`
2018-12-19 19:03:39 +03:00
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
2018-12-19 18:56:52 +03:00
a532ad5d72
[ #114 ] User.register/1 tweak.
2018-12-19 17:24:55 +03:00
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
2018-12-19 16:31:03 +03:00
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
2018-12-19 16:27:16 +03:00
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
2018-12-19 00:12:39 +00:00
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
2018-12-18 21:39:36 +03:00
059dd6f681
Ignore HTML characters in formatter.ex
2018-12-18 21:38:15 +03:00
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
2018-12-18 17:05:36 +01:00
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
2018-12-18 15:34:27 +01:00
3371a45884
[ #114 ] Formatting fix.
2018-12-18 17:30:30 +03:00
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18 17:22:42 +03:00
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
2018-12-17 20:16:15 +00:00
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
2018-12-17 19:38:24 +00:00
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
2018-12-17 19:30:05 +00:00
e4763cd459
Fix tagging problems for existing instances.
2018-12-17 20:12:01 +01:00
35522fef09
Use :ets.match_delete to delete old captchas
2018-12-17 20:35:21 +03:00
77b5154c82
Cowboy handler for Mastodon WebSocket
2018-12-17 17:06:18 +01:00
cc87880488
Support both OAuth token record and token string in UserView
2018-12-17 16:02:26 +01:00
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
2018-12-17 09:19:27 +00:00
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
2018-12-16 23:53:44 +03:00
3a31fdaf06
Change minutes_retained config to seconds_retained
2018-12-16 22:40:44 +03:00
6062885df6
Add a configurable auto-cleanup for captchas
2018-12-16 22:08:17 +03:00
5dcb7aecea
More put_view.
2018-12-16 17:51:22 +01:00
f672555ad3
Upgrade to Phoenix 1.4
2018-12-16 17:15:07 +01:00
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
2018-12-16 13:15:34 +02:00
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
2018-12-15 22:43:28 +03:00
23549d3952
Formatting fixes
2018-12-15 22:08:26 +03:00
b5518da904
Separate captcha implementation into a behaviour and use it
2018-12-15 22:07:26 +03:00
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
2018-12-15 17:56:12 +01:00
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
2018-12-15 15:23:51 +00:00
28c43a417e
Add an ability to disabled captcha
2018-12-15 03:12:47 +03:00
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
2018-12-15 03:12:44 +03:00
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
2018-12-14 20:20:30 +00:00
ea72ac549b
fix case when tags is invalid
2018-12-14 23:16:12 +03:00
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
2018-12-14 21:07:06 +01:00
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
d3ec09bb38
fix tags
2018-12-14 22:09:04 +03:00
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
2018-12-14 18:50:44 +00:00
bc6262d250
fixed typo
2018-12-14 21:21:37 +03:00
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
2018-12-14 18:09:59 +01:00
412df2cd38
Warn if push is disabled..
2018-12-14 16:19:28 +01:00
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
2018-12-14 13:00:24 +00:00
0b4c61e8d5
Fix warning
2018-12-14 13:56:42 +01:00
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
2018-12-14 13:22:10 +01:00
331396cbcd
Properly disable Web Push if no VAPID key is set
2018-12-14 13:05:51 +01:00
6822916183
Typos
2018-12-14 13:05:51 +01:00
b1bcd97a0f
Push: respect alerts settings
2018-12-14 13:05:49 +01:00
d8984b7bf8
Push: add missing notification_type field
2018-12-14 13:05:48 +01:00
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
2018-12-14 13:05:47 +01:00
324933a0ac
improve push message format (compatibility with mastodon)
2018-12-14 13:05:46 +01:00
658edb166f
fix and improve web push; add configuration docs
2018-12-14 13:05:29 +01:00
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
2018-12-14 14:13:13 +03:00
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
2018-12-14 14:01:00 +03:00
07e93f9940
[ #114 ] Improved tests.
2018-12-14 13:52:04 +03:00
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
2018-12-14 12:37:06 +03:00
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
2018-12-14 12:09:55 +03:00
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
2018-12-14 08:26:08 +00:00
61ad2ce422
TwitterAPI: Include favorited post in json
2018-12-14 08:24:18 +02:00
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
c5c3ad90d0
Fix tests. Remove oembed template
2018-12-14 03:00:50 +01:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:24:30 +03:00
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
2018-12-13 13:17:49 +03:00
7214d57463
Extended nicknames: allow dashes.
2018-12-12 21:48:54 +01:00
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
2018-12-12 20:15:43 +03:00
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
2018-12-12 17:14:31 +03:00
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
10c156d98f
[ #114 ] SMTP deps and config.
2018-12-12 17:01:34 +03:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
d6bf06ab4f
Fix warnings.
2018-12-10 20:49:06 +01:00
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
2018-12-10 19:08:35 +00:00
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
2018-12-10 19:05:16 +00:00
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
2018-12-10 19:04:06 +00:00
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
2018-12-10 19:03:06 +00:00
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
068353ac0b
formatting
2018-12-09 11:24:46 +03:00
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:48:49 +01:00
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
2018-12-08 09:12:06 +00:00
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
578051809f
Add uploadlimit to Twitter API config
2018-12-07 20:03:30 +01:00
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
2018-12-07 18:49:40 +00:00
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
2018-12-07 18:48:26 +00:00
134cc94cbd
Nodeinfo: remove null features; relay feature.
2018-12-07 19:44:45 +01:00
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
2018-12-07 19:36:44 +01:00
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
09f20de0d7
Make gopher respect ip
2018-12-07 19:21:58 +01:00
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
2018-12-07 14:07:11 +01:00
3c925e9d88
Emojis: Alphabetical ordering
2018-12-07 11:16:27 +01:00
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
2018-12-07 12:27:32 +03:00
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
7bcb6a183a
[ #394 ] Refactoring.
2018-12-06 20:23:16 +03:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
2018-12-06 16:01:58 +00:00
Haelwenn (lanodan) Monnier