Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,914 Commits 1 Branch 0 Tags 222 MiB
0e356cc800
Commit Graph

6914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Pitcock
873938d223 tests: twitter api: activity view test: enable tesla mock 2018-12-23 14:00:54 +00:00
William Pitcock
79b51a97fe twitter api: activity representer: remove peertube hack 2018-12-23 14:00:50 +00:00
William Pitcock
9f48485f64 tests: mastodon api: add test verifying that peertube videos are correctly rendered 2018-12-23 13:44:01 +00:00
William Pitcock
32dfc1d12a mastodon api: status view: remove obsolete peertube hack 2018-12-23 13:40:33 +00:00
William Pitcock
71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test 2018-12-23 13:31:08 +00:00
lambda
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
Haelwenn (lanodan) Monnier
3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment" 2018-12-23 13:00:25 +00:00
kaniini
093d39b634 Merge branch 'feature/hellthread-mitigation' into 'develop' 
implement hellthread mitigation

Closes #474

See merge request pleroma/pleroma!588
 2018-12-23 11:28:43 +00:00
Karen Konou
a7f07bb6e5 Implement kaniini's tweaks 2018-12-23 12:24:53 +01:00
Karen Konou
c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou
c92f91ffeb Add documentation 2018-12-23 10:41:56 +01:00
Karen Konou
409ff60bf8 Fix formatting 2018-12-22 23:32:38 +01:00
Karen Konou
92362e1e22 Implement large thread filter 2018-12-22 23:18:31 +01:00
Ekaterina Vaartis
d112990776 Specifically disable captcha for automatic tests, it makes them fail 2018-12-22 23:07:44 +03:00
Ekaterina Vaartis
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
Ekaterina Vaartis
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
lambda
61a88a6757 Merge branch 'ci-test-fix' into 'develop' 
SetUserSessionIdPlugTest: try again to fix random ci failures

See merge request pleroma/pleroma!579
 2018-12-20 16:31:08 +00:00
kaniini
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
Ivan Tashkinov
851db74f1c [#114] Fixed test. 2018-12-20 15:23:16 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
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
Ivan Tashkinov
8adcd1e80f [#114] Removed flash messages rendering on redirects. 2018-12-20 13:05:42 +03:00
Ivan Tashkinov
501ce34d7f [#114] Stylistic adjustments. 2018-12-20 12:55:12 +03:00
kaniini
8de3138de0 Merge branch 'support/issue_413' into 'develop' 
[#413] fix parse mentions

See merge request pleroma/pleroma!577
 2018-12-20 09:35:01 +00:00
Maksim
f1b93b5be7 [#413] fix parse mentions 2018-12-20 09:35:01 +00:00
kaniini
c52453fbd6 Merge branch 'fix/readme-md-config-typo' into 'develop' 
Fix config.md path in README

See merge request pleroma/pleroma!581
 2018-12-20 09:06:48 +00:00
rinpatch
acfd98689b Fix config.md path in README 2018-12-20 11:29:08 +03:00
rinpatch
6081c44961 Fix config.md path in README 2018-12-20 07:20:13 +03:00
kaniini
2e4f73a9c4 Merge branch 'readme' into 'develop' 
Improve systemd service documentation

See merge request pleroma/pleroma!580
 2018-12-20 04:12:50 +00:00
kaniini
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
Francis Dinh
8c4fa68428 Improve systemd service documentation 
Use `systemctl` instead of `service` since it's not guaranteed the
latter will be on the system (e.g. Arch does not have it).
 2018-12-19 16:06:05 -05:00
href
adbb265fc6
daaa8cd6 take two 2018-12-19 20:14:33 +01:00
raeno
652f49d176 Remove extra bracket 2018-12-19 23:06:10 +04:00
raeno
7fb3780431 Merge branch 'develop' into oembed_provider 2018-12-19 22:39:44 +04:00
Ivan Tashkinov
b520d44b58 [#114] mix format 2018-12-19 19:03:39 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
a532ad5d72 [#114] User.register/1 tweak. 2018-12-19 17:24:55 +03:00
Ivan Tashkinov
968d7490b6 [#114] User.Info: renamed confirmation_update to confirmation_changeset. 2018-12-19 16:31:03 +03:00
Ivan Tashkinov
59fc5d15df [#114] User.Info: renamed confirmation_update to confirmation_change. 2018-12-19 16:27:16 +03:00
kaniini
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
lambda
a3da8a56b6 Merge branch 'fix/ci-cache-improved' into 'develop' 
Per-branch CI cache with force-recompilation of Pleroma

See merge request pleroma/pleroma!574
 2018-12-18 21:11:40 +00:00
lambda
b7f6350107 Merge branch 'fix/formatter-ignore-html-chars' into 'develop' 
[#441] Fix characters converted to HTML being picked up by hashtag parser

See merge request pleroma/pleroma!575
 2018-12-18 20:23:21 +00:00
Rin Toshaka
facd30c9e8 Compile pleroma before ecto migrate 2018-12-18 21:20:49 +01:00
lain
f3eb414e28 Add a way to use the admin api without a user. 2018-12-18 21:08:52 +01:00
Rin Toshaka
f685351c1e Improve CI cache 2018-12-18 21:06:53 +01:00
Rin Toshaka
196d9c0fd0 Fix tests 2018-12-18 20:30:04 +01:00
rinpatch
8a67677d77 Add test 2018-12-18 22:10:56 +03:00
rinpatch
ef318fb8a9 Merge branch 'develop' into fix/formatter-ignore-html-chars 2018-12-18 21:39:36 +03:00
rinpatch
059dd6f681 Ignore HTML characters in formatter.ex 2018-12-18 21:38:15 +03:00
rinpatch
d6b133ec51
Pleroma-API.md: Additionnal endpoints 2018-12-18 18:33:39 +01:00