monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,417 Commits 1 Branch 0 Tags 290 MiB
Commit Graph

1277 Commits

Author SHA1 Message Date
kibigo! d7ce339c2e WIP <Compose> Refactor; Fin~ 2018-01-04 21:17:30 -08: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 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
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
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