fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 19:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
5540 commits 128 branches 266 tags 975 MiB
Commit graph

1348 commits

Author SHA1 Message Date
kibigo! 6932b464e6 Fixed improper dropdown func binding for #293 + toot button spacing 2018-01-05 21:02:53 -08:00
kibigo! ad10a80a99 Styling and autosuggest fixes for #293 2018-01-05 20:43:16 -08:00
kibigo! 8bf9d9362a Fixes composer mounting issue with #293 2018-01-05 18:30:06 -08:00
David Yip 03aeab857f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-01-05 17:31:56 -06:00
beatrix f441770e50
Merge pull request #290 from chriswmartin/web-push-updates 
Web push updates
 2018-01-05 18:29:57 -05:00
beatrix b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix 
unique ColumnLink keys in getting_started
 2018-01-05 18:29:40 -05:00
beatrix faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor 
Compose refactor
 2018-01-05 18:29:08 -05:00
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
beatrix f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl 
i18n: 🇵🇱
 2018-01-05 12:36:53 -05:00
cwm 9fc08e4861 add key to lists div 2018-01-05 09:00:48 -06:00
cwm 6236577734 change how list ColumnLink keys are determined 2018-01-05 08:12:34 -06:00
kibigo! d7ce339c2e WIP <Compose> Refactor; Fin~ 2018-01-04 21:17:30 -08:00
Yamagishi Kazutoshi 9a61b0ef22 Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00
kibigo! 42f50049ff WIP <Compose> Refactor; 1000 tiny edits 2018-01-04 18:33:13 -08:00
kibigo! b4a3792201 WIP <Compose> Refactor; <ActionsModal>; dropdowns 2018-01-04 18:31:00 -08:00
kibigo! 083170bec7 WIP <Compose> Refactor; SCSS ed. 2018-01-04 18:23:46 -08:00
kibigo! 8713659dff WIP <Compose> Refactor; <OnboardingModal> ed. 2018-01-04 18:21:59 -08:00
kibigo! 3c29f57404 WIP <Compose> Refactor; <Drawer> ed. 2018-01-04 18:21:59 -08:00
kibigo! 924ffe81d4 WIPgit status <Compose> Refactor; <Composer> ed. 2018-01-04 18:21:59 -08:00
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
Branko Kokanovic d872902997 Small translation fixes for Serbian (and sr@Latn too) (#6188) 2018-01-05 00:16:06 +01:00
Lynx Kotoura 49e296e1b0 Fix overflowing audit logs (#6184) 2018-01-04 19:38:46 +01:00
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-04 14:42:58 +01:00
muan 89daeb43a8 Improve Traditional Chinese translation (#6166) 
* Improve Traditional Chinese translations

* Sort alphabetically
 2018-01-04 05:00:50 +01:00
Akihiko Odaki 256c2b1de0 Rearrange items in Getting Started navigation (#6126) 
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)

This fixes the issue by rearranging.
 2018-01-04 10:56:54 +09:00
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 20:17:13 +00:00
Quenty31 d907d4352e l10n OC language (#6169) 
* new strings: hashtag+unlisted, mute, block

* Add confirmation step for email changes

* Add more instance stats APIs
 2018-01-03 21:05:54 +01:00
Marcin Mikołajczak 53d99ebf4f i18n: Update Polish translation (#6168) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi 1001922156
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) 
* yarn manage:translations

* Add Japanese translation for #5997

* Add Japanese translation for #6003

* Add Japanese translation for #6004

* Add Japanese translation for #6071

* Add Japanese translation for #6099

* Add Japanese translation for #6125

* Add Japanese translation for #6132
 2018-01-03 21:00:39 +09:00
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 04:17:11 +00:00
Akihiko Odaki 2471796d75 Set background to the navigation of Getting Started column (#6163) 
The background of the navigation matters because its scrollbar is
transparent.
 2018-01-03 04:39:14 +01:00
Noiob 94230fe565 Fix newlines-to-spaces functionality (#6158) 
yay for regexes, amirite
 2018-01-02 19:35:24 +01:00
ThibG b6af88192f Display a warning when composing unlisted toots with something looking like a hashtag (#6132) 2018-01-02 14:24:52 +01:00
Akihiko Odaki 3ba7cde38d Rename key to path in actions and reducers for settings (#6105) 2018-01-02 13:50:54 +01:00
Branko Kokanovic 21b9da6418 Adding Serbian latin translations (#6146) 
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
 2018-01-02 20:39:12 +09:00
David Yip fa768abf5c
More ../ -> ~. 2018-01-02 00:26:44 -06:00
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
 2018-01-02 00:11:41 -06:00
Akihiko Odaki 764f876953 Use const instead of let for constant (#6106) 2018-01-02 13:28:49 +09:00
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129) 2018-01-02 05:07:56 +01:00
cwm 72b99f6ee4 bug fix (tootsuite pr #6120) 2017-12-31 08:26:50 -06:00
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-31 09:17:15 +00:00
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133) 
* Adding Serbian translation

* i18n-tasks normalize
 2017-12-31 17:28:20 +09:00
David Yip d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream 
Merge with upstream @ f4b80e6511
 2017-12-30 18:24:38 -06:00
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/auth/confirmations_controller.rb
 2017-12-30 17:20:07 -06:00
David Yip e4944d065b
Switch to tootsuite's elephant friend for the drawer 
This version has a transparent background, which works better with the
wave.
 2017-12-30 17:17:37 -06:00
David Yip 513d982f29
Use ~ notation in components for image references 
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
 2017-12-30 17:15:20 -06:00
cwm 4ce44ba470 remove unused 'saveSettings' from column_settings_container 2017-12-30 16:42:26 -06:00
cwm 0dce26b82b web push updates (tootsuite PRs #5879, #5941, #6047) 2017-12-30 11:45:01 -06:00
Jeong Arm f4b80e6511 Translate Korean (#6131) 
Relates to #6125, #6099
 2017-12-30 02:44:19 +01:00
MitarashiDango 511c6f9625 bug fix (WebPush does not work) (#6120) 2017-12-28 16:20:34 +01:00
cwm 832a93e67c Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000) 2017-12-28 08:30:51 -06:00
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss
 2017-12-26 22:24:19 -06:00
Akihiko Odaki 65f30f65a2 Move the mastodon on Getting Started column to drawer column (#6109) 
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.

This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
 2017-12-27 03:31:30 +01:00
beatrix 7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch 
Merge various small vanilla updates into glitch
 2017-12-26 17:03:29 -05:00
cwm 20ad071931 Set direction style to reply indicator (tootsuite pr #6006) 2017-12-26 14:20:41 -06:00
cwm 14243bf80a Reduce motion for boost animation (tootsuite pr #5871) 2017-12-26 14:04:52 -06:00
cwm 337c2e77ee Fix layout for RTL (tootsuite pr #6014, #6018) 2017-12-26 13:49:53 -06:00
cwm 46565ed746 Fix focused background color of favourited direct toot (tootsuite pr #6021) 2017-12-26 13:30:23 -06:00
cwm 815524412b Move dropdown transform origin (tootsuite pr #6091) 2017-12-26 13:28:19 -06:00
cwm 083571915f onMuteNotifications validation (tootsuite pr #6092) 2017-12-26 13:25:43 -06:00
cwm 2bbd22e91c Rename settingKey to settingPath (tootsuite pr #6046 & #6098) 2017-12-26 13:21:20 -06:00
cwm cc6a2ffd0a use 'flavours/glitch/' prefix in new imports 2017-12-26 10:41:44 -06:00
cwm 22818d2a16 Add mute, block, conversation mute actions to detailed status dropdown menu 2017-12-26 10:13:38 -06:00
Jenkins bed13f22e2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-25 20:17:10 +00:00
Chris 1e5d1fa5c8 Add mute, block, conversation mute actions to detailed status dropdown menu (#6099) 
* removed references to hideOnMobile in column_link and getting_started

* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226)

* remove unused withDismiss in detailed status
 2017-12-25 20:56:05 +01:00
MitarashiDango a3b369337f Additional prop name change. (#6098) 2017-12-26 00:14:06 +09:00
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-24 15:17:12 +00:00
Neetshin 7e6214b869 Add validation for onMuteNotifications (#6092) 
* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

* Change code elements in keyboard-shortcuts component to kbd

* Add validation for onMuteNotifications
 2017-12-24 17:18:45 +09:00
Nolan Lawson a8eb0bf44f Reduce motion for boost animation (#5871) 
* Reduce motion for boost animation

Fixes #5833

* Fix ternary expression
 2017-12-24 04:48:31 +01:00
Akihiko Odaki 35fdf561be Refactor web_push_subscription (#6047) 
* Remove onSave method in mapped properties for column_settings

* Make web_push_subscription.register an action
 2017-12-24 04:47:35 +01:00
Chris 081956742c removed references to hideOnMobile in column_link and getting_started (#6082) 
* removed references to hideOnMobile in column_link and getting_started

* move keyboard shortcuts back below blocked users
 2017-12-24 04:47:02 +01:00
cpsdqs 8528fd89d2 Move dropdown transform origin to top edge (#6091) 2017-12-24 00:53:03 +01:00
ncls7615 fb57ec41df
Update and add some translate 2017-12-22 12:22:41 +09:00
ncls7615 4694dcfe16
Add more en and ja 2017-12-22 12:11:28 +09:00
ncls7615 02db8aa3a0
Add en and ja 2017-12-22 12:01:38 +09:00
beatrix 60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements 
Getting started column improvements
 2017-12-21 18:47:07 -05:00
ncls7615 191b625a27
Fix account header avatar 2017-12-22 07:12:49 +09:00
David Yip 7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273. 2017-12-21 13:22:33 -06:00
cwm d736739e8f <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049) 2017-12-21 13:04:40 -06:00
David Yip dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245. 2017-12-21 05:25:16 -06:00
cwm 9042f9a813 add keyboard shortcuts to getting started (fixes #275) 2017-12-20 09:50:29 -06:00
Jenkins 6f11aa8383 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-20 08:17:15 +00:00
Akihiko Odaki 81d29e4126 Rename settingKey in setting_toggle to settingPath (#6046) 2017-12-20 16:19:59 +09:00
Neetshin c11a52d888 Replace <code> to <kbd> in KeyboardShortcuts component (#6049) 
* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

* Change code elements in keyboard-shortcuts component to kbd
 2017-12-20 11:46:25 +09:00
Jeong Arm e52293482e Update Korean translation (#6050) 
* Update Korean translation

* Translate Korean for javascript

* Add missing translations on simple_form
 2017-12-20 11:45:50 +09:00
ncls7615 d3b2677775
Add en and ja 2017-12-19 20:16:48 +09:00
cwm 14aae9c05c missed a semicolon 2017-12-17 22:21:15 -06:00
cwm be50e45a74 use makeMapStateToProps 2017-12-17 22:00:25 -06:00
cwm e4ebbf4f07 use list-ul icon in list header and web/lists 2017-12-17 21:25:18 -06:00
Jenkins e7fa7fce25 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-17 03:17:14 +00:00
Peter f38e6a14f2 Add Slovak translation (#6052) 
* Add Slovak translation

* Slovak translation: i18n-normalize
 2017-12-17 11:26:42 +09:00
ncls7615 9e8fa3caee fix admin/action_logs page 2017-12-16 20:27:26 +09:00
kibigo! e677dda07c Fixes #244 to make search results scrollable 2017-12-15 12:49:23 -08:00
NCLS e9a5bde9a0
Update ja.js 2017-12-15 19:43:10 +09:00
NCLS 61ed5b972c
Update ja.js 2017-12-15 19:38:13 +09:00
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 01:17:12 +00:00
Naoki Kosaka 25b0d7538e Fix oEmbed image_modal src. (#6027) 2017-12-14 23:31:14 +01:00
SerCom_KC 573414f728 Improve Chinese (Simplified) Translations (#6024) 
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109

* i18n: (zh-CN) Change `协管` to `监察员`

* i18n: (zh-CN) Fix all "Are you" questions

* i18n: (zh-CN) Various improvements

* i18n: (zh-CN) Final clean-up

* i18n: (zh-CN) Change translation for 500

* i18n: (zh-CN) Remove spaces between time distances

* i18n: (zh-CN) Improve translations
 2017-12-14 19:33:29 +01:00
Jeroen aa273a2718 Last minute Dutch string updates (#6025) 
* Last minute Dutch strinfupdate

* Last minute Dutch strings update

* Fixing Weblate output errors

* Fixing Weblate output errors

* Fixing more Weblate rubish

Weblate is also changing some " to ' - I think that is not a problem

* Fixing more weblate stuff

* Fixing

* Update nl.yml
 2017-12-14 18:45:32 +01:00
Jenkins e5a9831a56 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 23:17:15 +00:00