tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
7,906 Commits 20 Branches 113 Tags 222 MiB
36dab188fd
Commit Graph

7906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
9b5348240e
Add consistent interpolations check to CircleCI (#9072) 
* Add consistent interpolations check to CircleCI

* Fix locale strings using wrong variables
 2018-10-25 01:17:01 +02:00
Yamagishi Kazutoshi
e8ffecbd36 Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
Eugen Rochko
df3a7e724d
Fix missing plural keys (#9084) 
* Update i18n-tasks to feature-missing-plural-keys

* Fix pluralizations with missing keys in Arabic

Fix #8554

* Add i18n-tasks missing-plural-keys to CircleCI
 2018-10-25 00:09:45 +02:00
Eugen Rochko
d723f2a0a8
Fix RTL layout of status display names (#9075) 
Fix #2350
 2018-10-24 18:18:08 +02:00
Eugen Rochko
288e435fe5
Show upload options on click as well as hover (#9074) 
Fix #8918
 2018-10-24 18:17:15 +02:00
dependabot[bot]
9f3283086f Bump capybara from 3.9.0 to 3.10.0 (#9077) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-24 23:22:18 +09:00
ThibG
0e8de56a22
Merge pull request #792 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-24 11:28:25 +02:00
dependabot[bot]
c64234c31f Bump rspec-rails from 3.8.0 to 3.8.1 (#9078) 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-24 07:51:04 +02:00
dependabot[bot]
c61af83de0 Bump i18n-tasks from 0.9.26 to 0.9.27 (#9079) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.26 to 0.9.27.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.26...v0.9.27)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-24 07:50:34 +02:00
Eugen Rochko
01c169e796
Fix JS error when posting from page without router context (#9073) 
Fix #9057
 2018-10-24 01:31:31 +02:00
dependabot[bot]
e3a1955276 Bump i18n-tasks from 0.9.25 to 0.9.26 (#9071) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.25 to 0.9.26.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.25...v0.9.26)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-23 23:11:37 +02:00
Thibaut Girka
ed8d06212f Keep back own DMs in Home timeline 
Follow-up to e45a6edd65, fixes inconsistencies
in glitch-soc behavior.
 2018-10-23 20:03:35 +02:00
Thibaut Girka
8f3096b846 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
dependabot[bot]
65867b6e61 Bump parallel_tests from 2.23.0 to 2.24.0 (#9064) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-23 08:17:26 +02:00
ashleyhull-versent
51677ff070 Update Dockerfile (#9026) 2018-10-23 05:21:28 +02:00
Eugen Rochko
39abec4d25
Fix public timelines not instantly updating on compose (#9050) 
Fix #9034
 2018-10-23 00:43:18 +02:00
Eugen Rochko
ad510db3a1
Show suggested follows on search screen in mobile layout (#9010) 
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them

Each suggestion can be dismissed
 2018-10-23 00:08:39 +02:00
Eugen Rochko
969a10a5d1
Persist volumes by default in docker-compose (#9055) 
Too many databases were lost to this
 2018-10-23 00:08:25 +02:00
Eugen Rochko
81017eaea7
Revert "RTL: remove blank character inside bdi (#9038)" (#9056) 
This reverts commit c7e9f9ff1e.
 2018-10-22 23:23:00 +02:00
Thibaut Girka
0c7f710be1 [Glitch] Surround mid-text display names with bdi tags 
Port 7861c5f108 to glitch-soc
 2018-10-22 18:57:20 +02:00
Thibaut Girka
323ae1403a [Glitch] fix: initial state of PrivacyDropdown is should not be null 
Port bebe8ec887 to glitch-soc
 2018-10-22 18:41:34 +02:00
Thibaut Girka
1bb23d0407 [Glitch] RTL: fix cardbar margins and alignment 
Port c73864c137 to glitch-soc
 2018-10-22 18:39:37 +02:00
Thibaut Girka
c9b19e05e2 [Glitch] RTL: fix admin account avatar margin in about page 
Port 3a157210c8 to glitch-soc
 2018-10-22 18:38:52 +02:00
Thibaut Girka
c14be538a6 [Glitch] RTL: fix column settings toggle label 
Port bf58461d36 to glitch-soc
 2018-10-22 18:38:11 +02:00
Thibaut Girka
a1f512f18b [Glitch] Fix domain label position and color 
Port 25f9ead041 to glitch-soc
 2018-10-22 18:37:17 +02:00
Thibaut Girka
9950db2e1c [Glitch] RTL: fix preferences layout 
Port 029943d59b to glitch-soc
 2018-10-22 18:34:48 +02:00
Thibaut Girka
076f0a0eb6 [Glitch] Fix admin account avatar margin 
Port 065b39e7a4 to glitch-soc
 2018-10-22 18:33:35 +02:00
Thibaut Girka
aa277ab5fb [Glitch] RTL: fix user stats in about page 
Port 301cbcc980 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
ef9c11e050 [Glitch] RTL: fix domain append at signup form 
Port 65b3804a6c to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
e18724363d [Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" 
Port d35801aaa2 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
1139b758c5 [Glitch] RTL: fix admin account margins in about page 
Port f8c1b32541 to glitch-soc
 2018-10-22 18:31:50 +02:00
Thibaut Girka
bf9c4b6d98 [Glitch] undo part of PR 8202 to fix RTL 
Port efd09e2ebb to glitch-soc
 2018-10-22 18:22:01 +02:00
Thibaut Girka
9f1c9b6135 [Glitch] Improve style of notice/alert messages 
Port b972478812 to glitch-soc
 2018-10-22 18:20:43 +02:00
Thibaut Girka
e45a6edd65 Keep new DMs in home feeds and in the old DM timeline 
Revert server-side part of 87fdd139b8
 2018-10-22 18:15:51 +02:00
Thibaut Girka
dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
 2018-10-22 17:51:38 +02:00
Eugen Rochko
4f0bdbaaaf
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049) 
Fix #8889
 2018-10-22 16:58:36 +02:00
Eugen Rochko
f5b8bd4392
Fix cull tripping on nil in last_webfingered_at (#9051) 
Fix #8741
 2018-10-22 16:58:08 +02:00
Masoud Abkenar
c7e9f9ff1e RTL: remove blank character inside bdi (#9038) 
* RTL: remove blank character inside bdi

* Update app/javascript/mastodon/components/display_name.js

Co-Authored-By: mabkenar <ampbox@gmail.com>
 2018-10-22 01:04:32 +02:00
Jeong Arm
2e18ad74dc Fix tootctl cull on dead servers (#9041) 
* Delete first 9 accounts on dead servers

* Clean up code by moving dead server culling to the end
 2018-10-21 22:52:27 +02:00
ThibG
84cf78da8a Fix og:url on toots' public view (#9047) 
Fixes #9045
 2018-10-21 22:52:10 +02:00
Masoud Abkenar
c73864c137 RTL: fix cardbar margins and alignment (#9044) 2018-10-21 18:37:57 +02:00
Masoud Abkenar
3a157210c8 RTL: fix admin account avatar margin in about page (#9039) 
* RTL: fix admin account avatar margin in about page

* fix code style
 2018-10-21 16:45:08 +02:00
Jeong Arm
68f0e4d54e Handle if username is not found on tootctl feeds build (#9040) 2018-10-21 16:42:22 +02:00
Gomasy
8d70d3de38 Fix crash when using UNIX socket (#9036) 2018-10-21 16:41:33 +02:00
Thibaut Girka
4739e0f090 Put a video camera emoji or a picture frame emoji instead of “.” 
This uses the same logic as the status icons in the glitch flavor.
 2018-10-21 16:09:18 +02:00
Thibaut Girka
8729f5e466 Do not move CWs to toot body when toot body is empty 
Fixes #395

Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
 2018-10-21 16:09:18 +02:00
Thibaut Girka
04bedd237b Attempt at fixing inline video player 2018-10-21 16:09:07 +02:00
Thibaut Girka
dfa5b0576f Update mediaGallery component's width when opening CWs 2018-10-21 16:09:07 +02:00
Masoud Abkenar
bf58461d36 RTL: fix column settings toggle label (#9037) 2018-10-21 20:31:40 +09:00
kedama
25f9ead041 Fix domain label position and color (#9033) 
* Fix position of the domain label

* Fix position of the domain label for RTL

- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
 2018-10-21 14:35:25 +09:00