David Yip
64fee6ca73
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
beatrix
5500346b79
Merge pull request #290 from chriswmartin/web-push-updates
...
Web push updates
7 years ago
beatrix
3671d07f37
Merge pull request #295 from chriswmartin/getting-started-key-fix
...
unique ColumnLink keys in getting_started
7 years ago
beatrix
f6ed878ee9
Merge pull request #293 from glitch-soc/compose-refactor
...
Compose refactor
7 years ago
Jenkins
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix
06a32b2621
Merge pull request #243 from m4sk1n/glitch-pl
...
i18n: 🇵🇱
7 years ago
cwm
17034d36cf
add key to lists div
7 years ago
cwm
56429e7ca9
change how list ColumnLink keys are determined
7 years ago
kibigo!
55ead6a4b2
WIP <Compose> Refactor; Fin~
7 years ago
Yamagishi Kazutoshi
0fa691d2a9
Fix RFC 5646 Regular Expression ( #6190 )
7 years ago
kibigo!
7a9aaf28c4
WIP <Compose> Refactor; 1000 tiny edits
7 years ago
kibigo!
0cb97608c7
WIP <Compose> Refactor; <ActionsModal>; dropdowns
7 years ago
kibigo!
c560373d5e
WIP <Compose> Refactor; SCSS ed.
7 years ago
kibigo!
c20717bd9f
WIP <Compose> Refactor; <OnboardingModal> ed.
7 years ago
kibigo!
49d8d72192
WIP <Compose> Refactor; <Drawer> ed.
7 years ago
kibigo!
f87cce9e28
WIPgit status <Compose> Refactor; <Composer> ed.
7 years ago
Jenkins
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic
fb3a2ddd24
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
7 years ago
Lynx Kotoura
9bef64b3d3
Fix overflowing audit logs ( #6184 )
7 years ago
Marcin Mikołajczak
1ba0732b82
i18n: Update Polish translation
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
muan
22e3acfd56
Improve Traditional Chinese translation ( #6166 )
...
* Improve Traditional Chinese translations
* Sort alphabetically
7 years ago
Akihiko Odaki
b080a07550
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.
7 years ago
Jenkins
a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31
bd82de325e
l10n OC language ( #6169 )
...
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
7 years ago
Marcin Mikołajczak
b83fb8b107
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Yamagishi Kazutoshi
d50d61a90c
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
7 years ago
Jenkins
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki
1c46344318
Set background to the navigation of Getting Started column ( #6163 )
...
The background of the navigation matters because its scrollbar is
transparent.
7 years ago
Noiob
653d9b1721
Fix newlines-to-spaces functionality ( #6158 )
...
yay for regexes, amirite
7 years ago
ThibG
b42cdedfc3
Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )
7 years ago
Akihiko Odaki
5d02615063
Rename key to path in actions and reducers for settings ( #6105 )
7 years ago
Branko Kokanovic
1c4142da5b
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
David Yip
fa4960ea74
More ../ -> ~.
7 years ago
David Yip
ed572490c1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
7 years ago
Akihiko Odaki
7549f264e6
Use const instead of let for constant ( #6106 )
7 years ago
Akihiko Odaki
616b6867a0
Show mastodon on modal ( #6129 )
7 years ago
cwm
d5770ef7ac
bug fix (tootsuite pr #6120 )
7 years ago
Jenkins
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
David Yip
08ecfe990d
Merge pull request #291 from glitch-soc/merge-upstream
...
Merge with upstream @ fc8c2c9b4a
7 years ago
David Yip
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
David Yip
f19b436c83
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
7 years ago
David Yip
5ec1a9b484
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).
7 years ago
cwm
a4ae9c4109
remove unused 'saveSettings' from column_settings_container
7 years ago
cwm
093c27fe46
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
7 years ago
Jeong Arm
fc8c2c9b4a
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
7 years ago
MitarashiDango
a52820a7fd
bug fix (WebPush does not work) ( #6120 )
7 years ago
cwm
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
7 years ago
David Yip
f722fcb5a6
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
7 years ago
Akihiko Odaki
093af89c43
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.
7 years ago