Commit graph

3743 commits

Author SHA1 Message Date
Eugen Rochko
c2843c5f62 [Glitch] Add batch actions and categories to admin UI for custom emojis
Port SCSS changes from 1110ea1a91 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:35:20 +02:00
ThibG
ffe8decb73 [Glitch] Add account bio to account admin view
Port SCSS changes from ec2a439a22 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:34:55 +02:00
Eugen Rochko
6809e37f8e [Glitch] Add batch approve/reject for pending hashtags in admin UI
Port SCSS changes from 261e52268c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-13 18:34:26 +02:00
Thibaut Girka
74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
ThibG
cf2b708e6b Fix display of long poll options (#11717) 2019-09-13 16:04:09 +02:00
Eugen Rochko
45f44ef4d3
Fix unused CSS (#11824)
Fix #11689
2019-09-13 16:00:47 +02:00
Eugen Rochko
b6381bdc7d
Change max length of media descriptions from 420 to 1500 characters (#11819)
Fix #11658
2019-09-13 16:00:34 +02:00
Eugen Rochko
50755a47b4
Fix scroll position resetting when opening media modals in web UI (#11815) 2019-09-12 20:14:59 +02:00
Eugen Rochko
9361981388
Add missing locale file for ga and add rake task to check for it (#11813)
* Add missing locale file for ga and add rake task to check for it

* Update lib/tasks/repo.rake

Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix check-i18n build
2019-09-12 04:58:33 +02:00
Thibaut Girka
c7f71b974f Fix flavour screenshot styling in vanilla flavour 2019-09-10 22:38:07 +02:00
Thibaut Girka
0e1291c888 Fix wrong icons from last refactoring
Fix regressions from f154d9d6e9
2019-09-10 14:56:08 +02:00
Eugen Rochko
0005635f96
New Crowdin translations (#11626)
* New translations en.yml (Chinese Simplified)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* i18n-tasks normalize

* yarn manage:translations
2019-09-10 12:43:06 +02:00
Eugen Rochko
1110ea1a91
Add batch actions and categories to admin UI for custom emojis (#11793) 2019-09-09 22:44:17 +02:00
Thibaut Girka
2aa0cdf7e6 Use the Icon component instead of directly using i tag 2019-09-09 19:00:20 +02:00
Thibaut Girka
f154d9d6e9 Use upstream's Icon component
Rework the codebase to avoid unnecessary differences with upstream
2019-09-09 19:00:20 +02:00
Thibaut Girka
f2b307af25 Move “export” before decorators
As this is what upstream does.

See also https://github.com/tc39/proposal-decorators/issues/69
2019-09-09 18:36:43 +02:00
ThibG
ec2a439a22 Add account bio to account admin view (#11473)
* Add account bio to account admin view

* Change styling to make bio fields / content more readable
2019-09-09 14:15:52 +02:00
Eugen Rochko
261e52268c
Add batch approve/reject for pending hashtags in admin UI (#11791) 2019-09-09 12:50:09 +02:00
Rey Tucker
0014a32c19 glitch: fix webpack build failure in columns_area.js (#1212)
Fixes #1212 by copying what works in the mainline flavor.
2019-09-09 09:56:37 +02:00
Eugen Rochko
e445a8af64
Add timeline read markers API (#11762)
Fix #4093
2019-09-06 13:55:51 +02:00
Eugen Rochko
4434e2eb7f [Glitch] Fix line breaks in hashtag autosuggestions in web UI
Port 7db2c2e2ba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:14:42 +02:00
Mostafa Ahangarha
bd0bde1da2 [Glitch] Exclude URLs from text analysis
Port e974d4923f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:13:03 +02:00
Eugen Rochko
a869572aab [Glitch] Fix wrong sum of usage in hashtag component in web UI
Port a6a63358c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:12:18 +02:00
Eugen Rochko
4907517db4 [Glitch] Fix wrong pluralization in hashtag component in web UI
Port 1a00bd9244 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:11:52 +02:00
Eugen Rochko
ca86858558 [Glitch] Change hashtag component in web UI to show numbers for 2 last days
Port d19d86fe2b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:02:54 +02:00
Eugen Rochko
b86292af33 [Glitch] Fix uncached media in web UI not being clickable
Port 34adc8784a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 14:02:04 +02:00
mayaeh
dea2b234c9 [Glitch] Integrate translation strings for the Profile Directory.
Port 1f22b8197c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:55:14 +02:00
ThibG
7db6cb93f3 [Glitch] Fix Mastodon logo style on hover on public pages' footer
Port 0ea53122f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:53:23 +02:00
ThibG
96b9d3333d [Glitch] Fix height of dashboard counters
Port 6493f4ffae to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:52:53 +02:00
ThibG
2f952f6d04 [Glitch] Fix custom emoji animation on hover in WebUI directory bios
Port 34eac5a1ec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:52:07 +02:00
Eugen Rochko
23c513846a [Glitch] Add "not available" label on unknown media attachments
Port d344289431 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-05 13:06:41 +02:00
Thibaut Girka
5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
Eugen Rochko
7db2c2e2ba
Fix line breaks in hashtag autosuggestions in web UI (#11764) 2019-09-05 06:14:06 +02:00
Mostafa Ahangarha
e974d4923f Exclude URLs from text analysis (#11759)
By the added regex, URLs, including the one without http or even www
like mysite.com will be removed from the toot's body so only the real
text of the toot will be analyzed for RTL detection
2019-09-04 22:30:49 +02:00
Thibaut Girka
0128509605 Fix loading more items in account following/followers 2019-09-04 17:58:31 +02:00
Eugen Rochko
a6a63358c3
Fix wrong sum of usage in hashtag component in web UI (#11755)
1 + 1 = 11
2019-09-04 10:10:18 +02:00
Eugen Rochko
1a00bd9244
Fix wrong pluralization in hashtag component in web UI (#11754) 2019-09-04 04:14:13 +02:00
Eugen Rochko
43f56f1291
Change account deletion page to have better explanations (#11753)
Fix deletion of unconfirmed account not freeing up the username

Add prefill of logged-in user's email in the reconfirmation form
2019-09-04 04:13:54 +02:00
ThibG
c1e238a77b Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)
* Fix admin interface showing superfluous reject media/reports on suspended domains

* Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
2019-09-03 22:53:27 +02:00
Eugen Rochko
d19d86fe2b
Change hashtag component in web UI to show numbers for 2 last days (#11742)
To deal with the midnight problem
2019-09-03 06:35:44 +02:00
Eugen Rochko
34adc8784a
Fix uncached media in web UI not being clickable (#11745) 2019-09-03 04:56:40 +02:00
mayaeh
1f22b8197c Integrate translation strings for the Profile Directory. (#11722)
Run `yarn manage:translations en`
2019-09-02 18:12:27 +02:00
ThibG
0ea53122f2 Fix Mastodon logo style on hover on public pages' footer (#11735)
Fixes #11690
2019-09-02 18:12:12 +02:00
ThibG
6493f4ffae Fix height of dashboard counters (#11736) 2019-09-02 18:11:34 +02:00
Eugen Rochko
ce182efd68 [Glitch] Add header to trends section and change refresh rate to 15 minutes
Port 4ef8d8b77c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
ThibG
12c188f533 [Glitch] Restore hashtag suggestions from local tag history
Port 5ab1e0e738 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
ThibG
e1810eed8e [Glitch] Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631)
Port d857d0d14d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Thibaut Girka
b30a7f5120 Fix trending hashtags spacing in single-column mode 2019-09-02 10:57:44 +02:00
Eugen Rochko
34eff39936 [Glitch] Add trends to public pages sidebar
Port c6b4b923e6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00
Eugen Rochko
717f3998c0 [Glitch] Fix hashtag autosuggestions line breaks for long suggestions
Port cd660d374a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02 10:57:44 +02:00