David Yip
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
David Yip
bc9fd8e05a
Normalize config/locales/en.yml.
2017-11-27 22:32:31 -06:00
kibigo!
4497b83982
Adds spoiler hotkey support to detailed statuses
2017-11-27 14:05:03 -08:00
Eugen Rochko
55d9abcceb
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
kibigo!
fac7e31101
Implement status hotkeys + spoiler expanding
2017-11-27 13:30:01 -08:00
Joshua Wood
0b045ba7ab
Add Keyboard Shortcuts Legend ( #5823 )
...
* Add Keyboard Shortcuts Legend
Adds a "Keyboard Shortcuts" legend (displayed in the rightmost column)
which is toggled via a new "?" hotkey. When subsequently pressed from
the Keyboard Shortcuts legend, "?" will navigate back to the previous
location.
* Add hidden table headings.
Makes the headings available for accessibility but hides them visually.
2017-11-27 21:31:58 +01:00
Jenkins
36452d6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 20:17:12 +00:00
mayaeh
37f152b347
i18n: Update ja translation for consumable invites. ( #5829 )
...
* Add Japanese translation for consumable invites.
* Add Japanese translation.
* Update Japanese translation.
2017-11-27 20:23:14 +01:00
Sorin Davidoi
25cc0370f5
chore(yarn): Upgrade react-swipeable-views (smoother swiping) ( #5830 )
2017-11-27 20:22:47 +01:00
unarist
0d0ad983b7
Merge indexes for reblog on statuses table ( #5831 )
...
We added an index for `[account_id, reblog_of_id]`, but we already have a similar index for `reblog_of_id`. Those index will be bigger according to statuses count. For example, `reblog_of_id` index uses 800MB for 10GB statuses table.
So this patch swaps indexed columns like `[reblog_of_id, account_id]`, then it will covers both usage with single index.
Since those index creation may take a while, I've also disabled previous index creation.
2017-11-27 20:22:27 +01:00
David Yip
c9dd67a733
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
Yamagishi Kazutoshi
d5e4cb2ca1
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
Eugen Rochko
bc8c951083
Add consumable invites ( #5814 )
...
* Add consumable invites
* Add UI for generating invite codes
* Add tests
* Display max uses and expiration in invites table, delete invite
* Remove unused column and redundant validator
- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
checks invite code validity
* Add admin setting to disable invites
* Add admin UI for invites, configurable role for invite creation
- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to
* Do not remove invites from database, expire them instantly
2017-11-27 16:07:59 +01:00
Jenkins
f504ac4ff6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
Alda Marteau-Hardi
191993c811
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
Akihiko Odaki
ce0d30feb7
Do not filter the status collection after muting and blocking ( #5815 )
...
Filtering the status collection wipes out even the profiles of muted and
blocked accounts. However, the behavior is inconsistent with the server-
side behavior.
2017-11-26 01:45:17 +01:00
SerCom_KC
7cdf02f2d4
i18n: (zh-CN) Add translations for #5746 & #5750 ( #5816 )
2017-11-26 02:38:40 +09:00
Akihiko Odaki
16a49799cf
Allow to open a modal for embedded photo ( #5777 )
2017-11-25 15:41:45 +01:00
Akihiko Odaki
7df80c9e83
Rename ariaLabel property of Dropdown to title ( #5813 )
...
DropdownMenu has ariaLabel property, but it is actually applied to title
property of IconButton. Keep it consistent.
2017-11-25 15:41:08 +01:00
spla
eddbf2e485
Updated Catalan strings ( #5801 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
2017-11-25 23:22:59 +09:00
Jenkins
7fcbe5faee
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi
6a6e49d032
Change navigation link for moderators ( #5812 )
2017-11-25 05:53:54 +01:00
Yamagishi Kazutoshi
8fde0aed51
Add Japanese translations ( #5810 )
...
* yarn manage:translations
* Add Japanese translation for #5087
* Add Japanese translation for #5616
* Add Japanese translation for #5746
* Add Japanese translation for #5750
2017-11-25 03:39:57 +01:00
William Pitcock
a4bb95d8b3
status: preserve visibility attribute when reblogging (infoleak fix) ( #5789 )
...
this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.
2017-11-25 01:36:08 +01:00
Eugen Rochko
bf8eab12ba
Display list column ( #5750 )
2017-11-25 00:35:37 +01:00
abcang
3db3ca1258
Fix unnecessary order ( #5807 )
2017-11-24 18:41:07 +01:00
sdukhovni
019c39bf1d
Don't remove originals of boosted toots from timeline ( #5479 )
...
* Don't remove originals of boosted toots from timeline
* Remove unused argument to updateTimeline
2017-11-24 14:43:53 +01:00
ysksn
4dd95c79a5
Add tests for Streamable ( #5771 )
2017-11-24 14:42:57 +01:00
abcang
17bde15f53
Add index of account and reblog to statuses ( #5785 )
2017-11-24 14:42:09 +01:00
ysksn
5dd8a36c09
Add tests for AccountRelationshipsPresenter ( #5805 )
2017-11-24 14:41:04 +01:00
mayaeh
9a930c0623
i18n: Update ja translations ( #5804 )
...
* Add Japanese translations.
* Update Japanese translations.
* Fix japanese translation.
2017-11-24 13:14:31 +01:00
Akihiko Odaki
0319b92979
Do not require onClose property in NavigationBar ( #5802 )
...
NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.
2017-11-24 13:13:17 +01:00
Jenkins
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
Eugen Rochko
efc97d404c
Add logging of admin actions ( #5757 )
...
* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱 (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize
2017-11-24 02:05:53 +01:00
Jenkins
0d8023f768
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 21:17:14 +00:00
Devon Blandin
cbeb60ffc8
Disable Code Climate maintainability checks ( #5798 )
...
- Migrate `.codeclimate.yml` to version 2 structure
- Disable Code Climate [maintainability checks][]
https://docs.codeclimate.com/docs/advanced-configuration
[maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment
This commit upgrades the Code Climate configuration file and disables
the new maintainability checks.
Once this PR is merged, we can experiment with the new checks via pull
requests (the PR will report new issues) or via the [Code Climate
CLI][cli], which [now also supports the new maintainability
checks][cli-support].
[cli]: https://github.com/codeclimate/codeclimate
[cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c
2017-11-23 21:38:17 +01:00
Jenkins
96302f7fd4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-23 02:17:12 +00:00
SerCom_KC
97bb620b48
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
2017-11-23 02:49:21 +01:00
kibigo!
3860750d5d
Styling fixes
2017-11-21 19:00:07 -08:00
kibigo!
ea77b60648
Update statuses on hidden toggle ( Fixes #227 )
2017-11-21 18:27:34 -08:00
kibigo!
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
Jenkins
a2e4d79b1c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 17:17:11 +00:00
Marcin Mikołajczak
c75bc101ba
i18n: Update Polish translation - front-end added ( #231 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 17:53:13 +01:00
mayaeh
9841d20c97
Add Japanese translations. ( #5769 )
2017-11-21 17:11:33 +01:00
beatrix
dbafce8535
update code of conduct email address
2017-11-21 11:01:28 -05:00
Marcin Mikołajczak
00be86c25d
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 16:36:22 +01:00
Joan Montané
daec402a58
Update and fix Catalan translation ( #5773 )
...
* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-21 23:17:28 +09:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
Jenkins
1c33bd3d3a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-21 05:17:12 +00:00
ysksn
4086db0929
Add tests for Remotable ( #5768 )
2017-11-21 13:59:36 +09:00