Commit graph

10541 commits

Author SHA1 Message Date
Haelwenn
34d6009d82 Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames

See merge request pleroma/pleroma!2737
2020-07-09 09:50:08 +00:00
lain
393a588265 Merge branch 'patch-1' into 'develop'
added link to changelog, removed repetition

See merge request pleroma/pleroma!2736
2020-07-09 09:42:39 +00:00
lain
6d688f14fa Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion

See merge request pleroma/pleroma!2721
2020-07-09 09:37:52 +00:00
Dym Sohin
ab773fa5c9 [static-fe] limit according to- and within- existing ruleset 2020-07-09 09:37:50 +00:00
lain
8be0c04b40 Merge branch 'issue/1880' into 'develop'
[#1880] fixed delete `Like` activity in remove user

See merge request pleroma/pleroma!2725
2020-07-09 09:31:15 +00:00
lain
8594181597 Update static-fe.css 2020-07-09 09:30:15 +00:00
lain
6854c5ba2f Merge branch 'patch-3' into 'develop'
missed `:` (colon) before mrf_steal_emoji

See merge request pleroma/pleroma!2738
2020-07-09 09:25:10 +00:00
Dym Sohin
6465257e1f missed : (colon) before mrf_steal_emoji 2020-07-09 09:23:21 +00:00
Dym Sohin
8eecc708ef fix wide2x emojis within nicknames 2020-07-09 09:03:24 +00:00
Maksim Pechnikov
31259cabcc fix test 2020-07-09 07:16:52 +03:00
Dym Sohin
6e54972252 added link to changelog, removed repetition 2020-07-09 03:15:51 +00:00
lain
cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880 2020-07-08 13:21:58 +02:00
lain
6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting

Closes #1895

See merge request pleroma/pleroma!2731
2020-07-08 10:55:03 +00:00
Ivan Tashkinov
a6495f4a68 [#1895] credo fix. 2020-07-08 12:54:23 +03:00
Ivan Tashkinov
3f8370a285 [#1895] Applied code review suggestion. 2020-07-08 12:36:44 +03:00
Maksim Pechnikov
e341f81785 fixed delete Like activity in remove user 2020-07-08 09:06:23 +03:00
Haelwenn
a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"

Closes #1918

See merge request pleroma/pleroma!2729
2020-07-08 03:25:30 +00:00
Haelwenn
db13acf242 Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.

Closes #1923

See merge request pleroma/pleroma!2730
2020-07-08 03:05:20 +00:00
lain
8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints

See merge request pleroma/pleroma!2327
2020-07-07 18:26:07 +00:00
Ivan Tashkinov
20461137a3 [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting. 2020-07-07 20:44:16 +03:00
Ivan Tashkinov
3e08e77151 [#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting. 2020-07-07 20:37:11 +03:00
Mark Felder
18438a9bf0 Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags. 2020-07-07 11:21:05 -05:00
lain
4c9295adcc Update frontend 2020-07-07 17:13:23 +02:00
lain
92e6801c17 Changelog: Add info about avatar removal 2020-07-07 16:53:54 +02:00
lain
c8dd973af5 AccountController: Remove unused update_? routes.
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
lain
1adda637d3 Docs: Document resetting of images 2020-07-07 16:53:12 +02:00
lain
59cf78e412 AccountController: Allow removal / reset of user images. 2020-07-07 16:53:03 +02:00
lain
4b53499bdc Merge branch 'develop' into 'develop'
added hyper:// to default protocols

See merge request pleroma/pleroma!2727
2020-07-07 11:41:56 +00:00
lain
9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube

See merge request pleroma/pleroma!2728
2020-07-07 09:14:50 +00:00
Haelwenn
fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters

Closes #1392

See merge request pleroma/pleroma!2186
2020-07-07 08:23:49 +00:00
Haelwenn (lanodan) Monnier
fbb9743a70
Fix getting videos from peertube 2020-07-07 09:38:38 +02:00
DYM
a784c09db8 added hyper:// to default protocols 2020-07-07 09:05:54 +02:00
Haelwenn
d81acb5f62 Merge branch 'description-limits' into 'develop'
Add limits to image descriptions

See merge request pleroma/pleroma!2724
2020-07-07 03:00:52 +00:00
Haelwenn
2a323d3797 Merge branch '1507-static-fe-prioritize-json' into 'develop'
StaticFE: Prioritize json in requests.

Closes #1507

See merge request pleroma/pleroma!2695
2020-07-07 00:04:24 +00:00
lain
65fd28e0c4 Config: Remove Statusnet preloader. 2020-07-06 12:25:25 +02:00
lain
28feba8af4 Preloaders: Remove status_net preloader 2020-07-06 12:24:45 +02:00
lain
f787eb1acf Update frontend 2020-07-06 12:20:20 +02:00
lain
30d0df8e2f Update frontend 2020-07-06 12:17:08 +02:00
lain
1963e143c5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api 2020-07-06 12:15:59 +02:00
lain
158c26d7dd StaticFE Plug: Use phoenix helper to get the requested format. 2020-07-06 12:11:10 +02:00
lain
ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json 2020-07-06 12:07:56 +02:00
rinpatch
69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop'
Streamer: Don't filter out announce notifications.

Closes #1915

See merge request pleroma/pleroma!2719
2020-07-06 09:21:03 +00:00
lain
a2cabb99ca Merge branch 'filter-tesla-config' into 'develop'
Filter tesla config

See merge request pleroma/pleroma!2722
2020-07-06 09:20:10 +00:00
lain
58da575935 Changelog: Document description limits. 2020-07-06 11:18:01 +02:00
lain
729506c56a Docs: document instance differences 2020-07-06 11:16:58 +02:00
lain
cc8b4e48d9 InstanceView: Add chat limit, description limit 2020-07-06 11:12:37 +02:00
lain
2e21ae1b6d Docs: Add description limits to cheat sheet 2020-07-06 11:08:53 +02:00
lain
af7720237b Upload: Restrict description length 2020-07-06 11:08:13 +02:00
Alexander Strizhakov
818f3c2393
test fixes 2020-07-06 09:30:43 +03:00
Alexander Strizhakov
028a241b7d
tests fixes 2020-07-06 09:30:42 +03:00