145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
6556be344d
Resolve some test failures.
6 years ago
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
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
6 years ago
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
dec23500d8
Resolve merge conflict
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
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
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
6 years ago
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
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
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
23549d3952
Formatting fixes
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
scarlett