me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11077 commits 2 branches 0 tags 429 MiB
Commit graph

7638 commits

Author SHA1 Message Date
Thibaut Girka
e859334b33 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
 2019-12-12 15:40:06 +01:00
Eugen Rochko
37795253fc Revert "Fix an eslint warning (#12426)" (#12596) 
This reverts commit b93456fd64.
 2019-12-10 19:39:02 +01:00
Eugen Rochko
af95252d4c Fix missing error templates for non-HTML requests (#12593) 2019-12-10 07:39:54 +01:00
Sasha Sorokin
2b592001b2 Use codeblock for native redirect URI (#12570) 
This commit changes how doorkeeper.applications.help.native_redirect_uri
string is being formatted to use <code> tag for native_redirect_uri
placeholder. This makes the URI look more distinguishable.
 2019-12-09 04:30:58 +01:00
Eugen Rochko
0769ef8277 Add tootctl media remove-orphans (#12568) 2019-12-08 15:37:12 +01:00
Thibaut Girka
a9cece1403 Fix erroneous inclusion of upstream code 2019-12-07 15:53:04 +01:00
Hinaloe
e3cac8df6d [Glitch] Highlight border when focusing poll-form footer 
Port 26dedf7857 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Takeshi Umeda
5ccd525287 [Glitch] Add basic support for group actors 
Port 58dd9698c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
2674dd5701 [Glitch] Fix poll options not being selectable via keyboard 
Port c53ba20166 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
ThibG
8bc0822716 [Glitch] Add follow_request notification type 
Port 60d26cabf0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Shlee
1fb108c696 [Glitch] upgrade/replace websocket.js to @gamestdio/websocket v2 
Port 80a3e8e0e4 to glitch-soc

Co-authored-by: hina <hina@hinaloe.net>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 12:54:27 +01:00
Thibaut Girka
2cc60e8b09 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
 2019-12-07 12:28:59 +01:00
Eugen Rochko
2eda06b768 Fix generic HTTP 500 error on duplicate records (#12563) 
Fix #12551
Fix #12547
 2019-12-06 22:40:06 +01:00
trwnh
a2f67154a4 Fix account search with no query (#12549) 
* Fix account search with no query

Modeled after #12541. Fix #12548

* fix codeclimate
 2019-12-06 19:44:23 +01:00
Hinaloe
26dedf7857 Highlight border when focusing poll-form footer (#12544) 2019-12-05 00:51:07 +01:00
Jeong Arm
d37ed5bc2a Fix media open hotkey (#12546) 2019-12-05 00:50:51 +01:00
Takeshi Umeda
dffb8a8340 Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545) 2019-12-05 00:50:40 +01:00
Takeshi Umeda
58dd9698c3 Add basic support for group actors (#12071) 
* Show badge on group actor in WebUI

* Do not notify in case of  by following group actor

* If you mention group actor, also mention group actor followers

* Relax characters that can be used in username (same as Application)

* Revert "Relax characters that can be used in username (same as Application)"

This reverts commit 7e10a137b878d0db1b5252c52106faef5e09ca4b.

* Delete display_name method
 2019-12-04 20:36:33 +01:00
Shlee
80a3e8e0e4 upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543) 
* Update stream.js

* Update package.json

* Update yarn.lock

Co-authored-by: hina <hina@hinaloe.net>
 2019-12-04 20:45:49 +09:00
Eugen Rochko
5d810aae4f Fix error when using search API with no query (#12541) 
Fix #12462
 2019-12-04 04:34:08 +01:00
trwnh
f0e3b99553 Return discoverable via REST API (fix #12507) (#12508) 2019-12-03 19:56:34 +01:00
ThibG
c53ba20166 Fix poll options not being selectable via keyboard (#12538) 
* Fix poll options not being selectable via keyboard

Fixes #12384

* Improve styling of poll option checkboxes/radio buttons

* Use more appropriate ARIA roles for poll options

* Allow switching between single and multiple choice from keyboard

* Coding style

* Avoid using .bind()
 2019-12-03 19:53:16 +01:00
Yamagishi Kazutoshi
b01cb4701e Update ESLint and RuboCop in Code Climate (#12534) 2019-12-02 18:25:43 +01:00
ThibG
272bc36227 Fix blocking/unblocking users from status dropdown menu (#12535) 
Fixes #12511
 2019-12-02 18:25:24 +01:00
mayaeh
08693d09ca Fix notifications label (#12517) 
* Fix translations not being displayed

* ran `yarn manage:translations en`
 2019-12-02 13:39:53 +01:00
ThibG
64f7474899 Link to reports targetting instance in admin view (#12513) 2019-12-01 19:03:43 +01:00
Mathieu Brunot
128a7ab7eb ✨ Add an LDAP Mail attribute config (#12053) 
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
 2019-12-01 18:52:21 +01:00
ThibG
60d26cabf0 Add follow_request notification type (#12198) 
* Add follow_request notification type

The notification type already existed in the backend but was never pushed
to the front-end. This also means translation strings were also available
for the backend, from the notification mailer.

Unlike other notification types, these are off by default, to match what
I remember of Gargron's view on the topic: that follow requests should not
clutter notifications and should instead be reviewed at the user's own
leisure in the dedicated column.

Since follow requests have their own column, I've deemed it unnecessary to
add a specific tab for them in the notification quick filter.

* Show follow request link in single-column if there are pending requests, even if account isn't locked

* Push follow requests from notifications to the follow_requests list

* Offer to accept or reject follow request from the notification

* Redesign follow request notification
 2019-12-01 17:25:29 +01:00
ThibG
acb1927158 Only normalize local polls (#12515) 
Before this patch, if remote poll options have leading or trailing spaces,
the information stored locally won't match them, causing federated voting to
fail.
 2019-12-01 17:24:33 +01:00
Eugen Rochko
9de10c16d7 [Glitch] Fix conversations not having an unread indicator in web UI 
Fix d15b346826 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-01 12:21:55 +01:00
ThibG
df04f885a5 [Glitch] Fix lost focus when modals open/close 
Port 6041cfb13d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-01 12:19:06 +01:00
Thibaut Girka
93167b3665 Merge branch 'master' into glitch-soc/merge-upstream 2019-12-01 12:12:42 +01:00
Mathieu Brunot
462788cb12 ✨ Convert LDAP username (#12461) 
* ✨ Convert LDAP username #12021

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* 🐛 Fix conversion var use

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* 🐛 Fix LDAP uid conversion test

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* 👌 Remove comments with ref to PR

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* 👌 Remove unnecessary paranthesis

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>

* 🔧 Move space in conversion string

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
 2019-12-01 07:21:28 +01:00
Sasha Sorokin
33696a4b44 Split relationships page strings (#12502) 
Before this moment relationships managing page was using strings from
other context - from counters, but in order for translators to be able
to translate it relatively to the page, it must use separate strings.

I've split the strings for "Following" and "Followers" and put them to
"relationships" keyset in localization file. This should solve this
issue.

Fixes #10863
 2019-12-01 07:08:40 +01:00
Eugen Rochko
d15b346826 Fix conversations not having an unread indicator in web UI (#12506) 2019-12-01 07:06:20 +01:00
ThibG
319875ab04 Fallback to Create audience when object has no defined audience (#12249) 
Fixes #11137
 2019-11-30 19:58:00 +01:00
ThibG
4b0a6d79dd Add ability to filter reports by target account domain (#12154) 
* Add ability to filter reports by target account domain

* Reword by_target_domain label
 2019-11-30 19:53:58 +01:00
ThibG
6041cfb13d Fix lost focus when modals open/close (#12437) 
* Fix lost focus after modal closes

Regression caused by the use of the wicg-inert polyfill

* Fix regression introduced by wicg-inert

* Catch errors to please CodeClimate
 2019-11-30 18:19:47 +01:00
Sasha Sorokin
2169e61bc9 [Glitch] Fix counter sizing 
Port 67a2dfa8ee to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:52:12 +01:00
ThibG
55d1f5c78c [Glitch] Add hotkey for opening media files 
Port af891f82be to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:52:12 +01:00
ThibG
d9f15fb6ed [Glitch] Fix pending upload count not being decremented on error 
Port 9b3ebf9166 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:37:16 +01:00
ThibG
95164e759b [Glitch] Fix OCR with delete & redraft 
Port c872f1cdb6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-30 17:36:49 +01:00
Thibaut Girka
e48f63787d Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
Sasha Sorokin
67a2dfa8ee Fix counter sizing (#12446) 
Counter size is currently set to strict 33.3% width, but with it
counter may break in other languages than English. For example it is
already broken on Gargron's profile on mastodon.social using Russian
locale.

This commit changes "width" to "min-width", so counters still displayed
correctly, but if they need more width to fit text, they are now allowed
to take as many width as they need.
 2019-11-29 17:03:38 +01:00
Sasha Sorokin
67e19f7977 Improve notifications page (#12497) 
Currently notifications page seems a bit cluttered with no clear
separation between e-mail and filtering settings. This commit tries to
address them by adding clear separation with headers, hints and removing
continuously reused texts for events checkboxes.
 2019-11-29 17:03:06 +01:00
ThibG
af891f82be Add hotkey for opening media files (#12498) 
* [WiP] Add hotkey to open media

* Give focus to play/pause button when opening video modal
 2019-11-29 17:02:35 +01:00
ThibG
9b3ebf9166 Fix pending upload count not being decremented on error (#12499) 
The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.
 2019-11-29 17:02:18 +01:00
Eugen Rochko
fcae5c77de Fix n+1 query for bookmarks on statuses (#12494) 2019-11-28 04:08:00 +01:00
Eugen Rochko
5761622a1e Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00
Thibaut Girka
510f98c7c2 Link move target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
b78c9e0980 Show acct of target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
5bf65f4e97 Add moved account warning 2019-11-27 17:37:01 +01:00
Thibaut Girka
06e0f3bfb6 Do not consider moved accounts as non-functional 
This might be somewhat controversial, but putting a redirection up
makes the account unusable, which works against use cases such as
using the moved account as backup in case the new one temporarily fails
(sure, the redirection can be temporarily removed, but it is a hassle)
 2019-11-27 17:37:01 +01:00
ThibG
1fc03686ea Fix empty poll options not being filtered on remote poll update (#12484) 
If a poll contains empty options (which is apparently possible on Pleroma),
it is created without them. However, the poll update code doesn't filter
empty options, and thus:
1. Clear known votes, as it assumes the set of options has changed
2. Errors out because it tries adding empty options, which fails validation

This commit fixes that by filtering them out the same way they are filtered
out at poll creation time.
 2019-11-26 22:46:31 +01:00
ThibG
c872f1cdb6 Fix OCR with delete & redraft (#12465) 2019-11-25 01:42:51 +01:00
ThibG
c3afeaf0fc [Glitch] Fix blur behind closed registration message 
Port SCSS changes from d1eebde0ff to glitch flavour

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:08:46 +01:00
ThibG
d72c04a88e [Glitch] Change media description label to be context-sensitive 
Port ed940a3a4a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:07:23 +01:00
Thibaut Girka
5aa79af7cb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-23 19:03:01 +01:00
Dimitri Merejkowsky
b93456fd64 Fix an eslint warning (#12426) 2019-11-22 15:57:22 +01:00
ThibG
d1eebde0ff Fix blur behind closed registration message (#12442) 
* Fix closed registration message blur

* Adjust overlay margins to account for blur

Fixes #12425
 2019-11-22 15:56:59 +01:00
Eugen Rochko
0342c42e05 Fix OEmbed discovery not handling different URL variants in query (#12439) 
Fix #12433
 2019-11-21 19:03:07 +01:00
ThibG
c6c0b30608 Simplify SQL query when performing account search amongst followings (#12302) 2019-11-21 17:35:04 +01:00
ThibG
32ef133fa6 Fix FetchLinkCardServices crashing on a tags without a target (#12159) 
* Add test for links without targets

* Fix FetchLinkCardServices crashing on a tags without a target
 2019-11-21 16:04:52 +01:00
ThibG
ed940a3a4a Change media description label to be context-sensitive (#12270) 
“Describe for the visually impaired” makes no sense when the uploaded media
is an audio file.
 2019-11-21 11:39:07 +01:00
ThibG
27b7ec1043 Change domain block behavior to update user records before deleting data (#12247) 
When suspending or silencing a domain, one probably wants the silence or
suspend parts to take effect as soon as possible. Deleting media files can
take a while (possibly days), so perform silencing as soon as possible, and
clean up media afterwards.
 2019-11-21 11:36:15 +01:00
noiob
0fe0be988e Fix whitelist federation for subdomains (#12435) 2019-11-21 11:35:39 +01:00
ThibG
333b93e632 [Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines 
Port 6364adba64 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-20 17:56:35 +01:00
Thibaut Girka
a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 2019-11-20 15:36:09 +01:00
Eugen Rochko
c4601b8eb6 Fix account dropdown not opening due to regression from #12377 (#12430) 2019-11-20 00:56:22 +01:00
Eugen Rochko
9046efbcbd Add relationship-based options to status dropdowns (#12377) 
Move bookmark action in inline statuses from action bar to dropdown
 2019-11-19 21:24:16 +01:00
Eugen Rochko
357a2e5564 Add cache for OEmbed endpoints to avoid extra HTTP requests (#12403) 
* add youtube oembed endpoint

* add check for oembed endpoint

* change unless for a more readable if

* clear blank lines

* endpoint via https

* Fix string literal in condition

* use cache for endpoints

* use cache for endpoints

* clean up and adding check

* clean up and remove redundant return

* add html check

* add false to return

* use double quotes

* use double quotes

* Clean up
 2019-11-17 18:40:33 +01:00
Gomasy
d13e680f74 Support min_id-based pagination for bookmarks (#12381) 
* Support min_id-based pagination for bookmarks

* Fix spec
 2019-11-17 17:09:41 +01:00
Jennifer Glauche
0aae35e310 make it not return http 400 when passing and empty source argument (#12259) 
* make it not return http 400 when passing and empty source argument

* create a spec for the empty source hash bug

* compact checks for nil, empty? parameters

* use nil.blank? instead checking for nil
 2019-11-16 19:02:09 +01:00
Eugen Rochko
bf3c777751 Add kn, mr, ur to available locales (#12379) 2019-11-13 23:36:41 +01:00
Eugen Rochko
8eac21be16 New Crowdin translations (#12146) 
* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations simple_form.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations simple_form.en.yml (Occitan)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations activerecord.en.yml (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations simple_form.en.yml (Arabic)
[ci skip]

* New translations en.json (Finnish)
[ci skip]

* New translations en.json (Danish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.yml (Kannada)
[ci skip]

* New translations simple_form.en.yml (Kannada)
[ci skip]

* New translations activerecord.en.yml (Kannada)
[ci skip]

* New translations devise.en.yml (Kannada)
[ci skip]

* New translations doorkeeper.en.yml (Kannada)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.yml (Marathi)
[ci skip]

* New translations simple_form.en.yml (Marathi)
[ci skip]

* New translations activerecord.en.yml (Marathi)
[ci skip]

* New translations devise.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations simple_form.en.yml (Hindi)
[ci skip]

* New translations activerecord.en.yml (Hindi)
[ci skip]

* New translations devise.en.yml (Hindi)
[ci skip]

* New translations doorkeeper.en.yml (Hindi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.yml (Urdu (Pakistan))
[ci skip]

* New translations simple_form.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Urdu (Pakistan))
[ci skip]

* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]

* New translations doorkeeper.en.yml (Urdu (Pakistan))
[ci skip]

* New translations activerecord.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations doorkeeper.en.yml (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations simple_form.en.yml (Finnish)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Persian)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Malayalam)
[ci skip]

* New translations simple_form.en.yml (Malayalam)
[ci skip]

* New translations activerecord.en.yml (Malayalam)
[ci skip]

* New translations devise.en.yml (Malayalam)
[ci skip]

* New translations doorkeeper.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations devise.en.yml (Slovak)
[ci skip]

* New translations en.json (Slovak)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations simple_form.en.yml (Tamil)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Malayalam)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Italian)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Galician)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Hungarian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Basque)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations devise.en.yml (Estonian)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations doorkeeper.en.yml (Finnish)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations devise.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Estonian)
[ci skip]

* New translations simple_form.en.yml (Malayalam)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations devise.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations simple_form.en.yml (Slovak)
[ci skip]

* New translations devise.en.yml (Slovak)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations devise.en.yml (Tamil)
[ci skip]

* New translations en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Tamil)
[ci skip]

* New translations doorkeeper.en.yml (Slovak)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations devise.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations devise.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations devise.en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.yml (Bengali)
[ci skip]

* New translations en.json (Hindi)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations doorkeeper.en.yml (Russian)
[ci skip]

* New translations en.json (Estonian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* i18n-tasks normalize

* yarn manage:translations
 2019-11-13 23:24:55 +01:00
ThibG
517c1cd062 Add bookmarks (#7107) 
* Add backend support for bookmarks

Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.

* Add spec for bookmark endpoints

* Add front-end support for bookmarks

* Introduce OAuth scopes for bookmarks

* Add bookmarks to archive takeout

* Fix migration

* Coding style fixes

* Fix rebase issue

* Update bookmarked_statuses to latest UI changes

* Update bookmark actions to properly reflect status changes in state

* Add bookmarks item to single-column layout

* Make active bookmarks red
 2019-11-13 23:02:10 +01:00
Yamagishi Kazutoshi
2ede35e843 Change to always returns html document in error pages (#12214) 2019-11-13 22:53:05 +01:00
ThibG
f73c977caa Fix broken admin audit log in whitelist mode (#12303) 2019-11-11 00:05:15 +02:00
ThibG
6364adba64 Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) 
* Fix unread toot indicator not honoring onlyMedia in public and community timelines

* Fixup: `unread` already accounts for new content in pending items
 2019-11-11 00:05:02 +02:00
ThibG
78e251fc77 Fix already-known remote private toots not being searchable by URL (#12336) 
* Fix already-known remote private toots not being searchable by URL

Whenever an URL search fails, and an account is provided, try getting a
private status matching that URL from database.

* Fix searching by `id` field instead of `uri`
 2019-11-11 00:04:48 +02:00
Darius Kazemi
b36c3b704b Fix type mismatch (#12324) 
This was [causing an issue with feed regeneartion in tootctl](https://github.com/hometown-fork/hometown/issues/24), and @davefp fixed the issue.
 2019-11-07 21:51:48 +02:00
Thibaut Girka
1fa2d96434 [Glitch] Minor improvements to poll composing UI 
Port aa21aeb838 to glitch-soc
 2019-11-07 14:43:07 +01:00
ThibG
c98e2faa41 [Glitch] Fix WebUI allowing to upload more items than the limit 
Port 83a88426ca to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-07 14:31:53 +01:00
Thibaut Girka
0fc784f8d0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
 2019-11-07 13:43:56 +01:00
ThibG
e7c4a8681d Fix relationship caches being broken as result of a follow request (#12299) 2019-11-07 09:08:00 +02:00
ThibG
83a88426ca Fix WebUI allowing to upload more items than the limit (#12300) 
Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.
 2019-11-07 09:07:03 +02:00
ThibG
aa21aeb838 Minor improvements to poll composing UI (#12319) 
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
 2019-11-07 09:06:06 +02:00
ThibG
28b68ec875 Fix various issues with account migration (#12301) 
* Fix being able to follow oneself by moving to an account that was following the old one

* Add specs

* Add spec to catch MoveWorker issue with local followers following both accounts

* Fix move worker breaking when a local account follows both source and target accounts

* Fix migration from remote to local account not sending Undo Follow

* Fix show_reblogs not being preserved for moved account's followers
 2019-11-07 09:05:07 +02:00
Thibaut Girka
00af41825f [Glitch] Fix notification message for own poll 
Port d99acc9587 and 3df536ec92 to glitch-soc
 2019-11-06 15:06:53 +01:00
Nolan Lawson
2030c85cfa [Glitch] fix: support KaiOS arrow navigation on public pages 
Port 425da2dbaa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:59:57 +01:00
ThibG
24bbe94224 [Glitch] Fix filtered out items being counted as pending items 
Port 572d9863ab to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:55:12 +01:00
Gabriel Rubens
be32d811d1 [Glitch] Use inert polyfill 
Port 84e3b5a358 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:52:22 +01:00
ThibG
b9cf415165 [Glitch] Add support for submitting media description with ctrl+enter 
Port 0e5be902e9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:50:54 +01:00
Hinaloe
4825d33aef [Glitch] dont crash with null-ref 
Port f28877756e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:50:27 +01:00
Takeshi Umeda
0a29988edf [Glitch] Fix an issue where polls with 'expires_at' not set expired 
Port 6665362f10 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-06 14:49:43 +01:00
Thibaut Girka
e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`
 2019-11-06 14:38:28 +01:00
Gabriel Rubens
84e3b5a358 Use inert polyfill (#12209) 
* Inserting wicg-inert in project

* Import wicg-inert in moda_root component

* Update yarn.lock

* Solving code style problems

* Removing package-lock
 2019-11-04 13:03:44 +01:00
mayaeh
3df536ec92 Integrate own poll's translation into own_poll. (#12231) 
run `yarn manage:translations en`
 2019-11-04 13:03:29 +01:00
Nolan Lawson
425da2dbaa fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
ThibG
e1cc25c4d4 Fix code referencing wrong class (#12263) 
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
 2019-11-04 13:02:27 +01:00