Baptiste Lemoine
b872c1c7c0
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>
# Conflicts:
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/features/status/components/action_bar.js
2020-02-12 10:03:28 +01:00
206dfd7dad
Clarify keyword arguments with ** ( #12769 )
...
This change is to suppress the warning below on on ruby-2.7.0:
- warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
2020-01-11 05:57:05 +09:00
f86ee4b59f
Fix IDN mentions not being processed, IDN domains not being rendered ( #12715 )
...
This changes the REST API to return unicode domains in the `acct`
attribute instead of punycode, and to render unicode instead of
punycode on public HTML pages as well.
Fix #7812 , fix #12246
2019-12-30 19:20:43 +01:00
04582e3c3e
Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper ( #12545 )
2019-12-05 00:50:40 +01:00
a6269b2f83
Split AccountsHelper from StatusesHelper ( #12078 )
2019-10-24 22:50:09 +02:00
4ada50985a
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
2017-04-11 01:11:41 +02:00
3ce6ac0ce2
Adding some localizations
2016-11-15 23:02:57 +01:00
fdc17bea58
Fix rubocop issues, introduce usage of frozen literal to improve performance
2016-11-15 16:56:29 +01:00
b3c7c8700d
Fix most pages on small screens
2016-10-03 16:17:28 +02:00
71ae4dd3d2
Adding public following and followers pages, fix #3
2016-03-19 14:02:30 +01:00
0e8f59c16f
Refactoring Grape API methods into normal controllers & other things
2016-02-29 19:42:08 +01:00
Baptiste Lemoine
Daigo 3 Dango