93b54b8d4b
i18n "More" dropdown title ( #5410 )
2017-10-16 09:31:47 +02:00
e7ab9bf8b4
Refactor and simplify icon_button.js ( #5413 )
2017-10-16 09:30:09 +02:00
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
22df18e902
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
2017-10-15 20:04:19 -05:00
894da3dcca
Clear timer when unmounting RelativeTimestamp components ( #5408 )
...
Possibly the cause of #5379 , #5377
2017-10-16 03:03:36 +02:00
8eb7d30a6c
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
2017-10-15 23:07:32 +02:00
7fe1428cc4
Update French translation ( #5401 )
2017-10-15 21:21:05 +09:00
ae716a12e1
replace newlines in desktop notif with spaces instead of removing them ( #5361 )
2017-10-14 14:41:12 +02:00
f63a40e7c2
Updated Catalan strings ( #5323 )
...
* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
"getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
* Syncing to master
* Added new Catalan strings
* removed config.secret_key line
* Corrected <sotrong> tag to <strong>
Line 515
* Removed extra line
* Reverted
* yarn.lock reverted
* Updated Catalan strings
* Updated Catalan strings
2017-10-14 14:40:35 +02:00
c6f76db2e1
Update French translation ( #5384 )
...
Update French translation
2017-10-14 14:30:19 +02:00
2c704ca9c6
l10n: update Persian translation for 2.0 ( #5391 )
2017-10-14 14:28:19 +02:00
cdc22d23b9
Doodle improvements 2 ( #176 )
...
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
2017-10-14 12:24:35 +02:00
eb96aa86a4
Update German translation ( #5389 )
2017-10-14 19:00:23 +09:00
531dadad86
Doodle palette, options, fill tool ( #172 )
2017-10-14 00:58:38 +02:00
723890b6fa
use zerowidth spaces for emojis
2017-10-14 00:48:53 +02:00
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase
2017-10-13 18:13:00 +02:00
33e806217f
Initial doodle support
2017-10-13 18:07:01 +02:00
c35132a738
Dutch strings: small change ( #5375 )
...
* Dutch strings: small change
* And this too.
2017-10-13 18:03:56 +02:00
48f7a58799
Do not try to guess why home timeline is empty in web UI ( #5370 )
...
* Do not try to guess why home timeline is empty in web UI
* Fix style issue
2017-10-13 16:44:16 +02:00
388d093beb
When unfollowing, remove from home in web UI immediately ( #5369 )
...
Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true!
2017-10-13 16:44:02 +02:00
d37305c628
Reduce discrepancies between server and client-side character count ( #5360 )
2017-10-12 23:26:34 +02:00
ad917cda10
l10n: PT-BR translation updated ( #5362 )
...
* PT-BR translation updated
* Testing
* Indentation error fixed
* More indentation errors fixed
2017-10-13 06:16:43 +09:00
df626fdd43
Fix the notification bug with newlines
2017-10-12 21:28:17 +02:00
6a2b1ba91e
Another tabs-vs-spaces fix, but with ~feeling~
2017-10-12 09:36:26 -05:00
3cfcc7a50e
Fix some consistance errors in gender neutral formulations. Add some missing ones. ( #5350 )
2017-10-12 16:31:14 +02:00
fe1c20cfb9
Fix tabs-vs-spaces issue pointed out by eslint.
2017-10-12 09:23:06 -05:00
cb7ba23cd8
Update oc.json ( #5343 )
2017-10-12 15:40:45 +02:00
13e05fece2
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
3ebe03b729
Fixes and updates for the French translation ( #5340 )
...
* Ajout du support des thèmes multiples
Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.
Add translations for the new strings allowing support for multiple themes.
* Mise à jour de la traduction
Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.
Update modified strings and add new translations for the ones who are missing them.
* Remplace « ' » par « ’ »
Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.
Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.
2017-10-12 00:58:01 +02:00
b0b5ff1b0f
workaround for scrollIntoView bug ???
2017-10-11 21:49:22 +02:00
0bf9261e65
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
6bc07d3de3
Updating Dutch strings for 2.0 ( #5334 )
2017-10-11 21:21:22 +02:00
0352c40e99
Use gender neutral language as in the rest of the french translation ( #5331 )
2017-10-11 21:20:56 +02:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
1823cf435a
In thread view, only scroll first update, scroll to replied-to post ( #5322 )
2017-10-11 19:21:44 +02:00
476e79b8e3
Fully disable hotkeys when input element is focused ( #5324 )
...
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11 16:31:07 +02:00
19d3317a69
Update french translation : mastodon/locales/fr.json ( #5318 )
...
* Update fr.json
* Update fr.json
* Update fr.json
2017-10-11 22:07:09 +09:00
38600b2792
Update ar.json ( #5316 )
...
Pushing new arabic translated strings for Mastodon web client.
2017-10-11 21:19:04 +09:00
b0407ece42
Fix an error when ancestors get loaded before the status itself ( #5312 )
...
When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.
Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.
2017-10-11 11:25:15 +02:00
b3d7ad958f
Fix #5306 : Stop hotkeys in input fields even when shift is pressed ( #5309 )
...
AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea
2017-10-11 01:01:17 +02:00
9815be2a44
Fix #5293 - Pre-fill frequently used emojis to avoid bugs ( #5305 )
2017-10-10 20:47:14 +02:00
4bb3e4eeba
Fix #5295 - Order custom emoji lexicographically ( #5297 )
2017-10-10 15:18:12 +02:00
784c7510d7
Fix an error when video playback buffer is empty ( #5300 )
2017-10-10 15:17:53 +02:00
488584bfc1
Track frequently used emojis in web UI ( #5275 )
...
* Track frequently used emojis in web UI
* Persist emoji usage, but debounce commits to the settings API
* Fix #5144 - Add tooltips to picker
* Display only 2 lines of frequently used emojis
2017-10-08 21:47:15 +02:00
94f15338c3
i18n update Occitan ( #5263 )
...
* Update oc.json
* Update oc.yml
* Update oc.yml
* Update oc.json
2017-10-08 14:18:27 +09:00
db33a53ee8
Video preload should be a string ( #5267 )
2017-10-08 03:06:43 +02:00
7de6d269d2
Use ES module build of react-router-dom ( #5264 )
2017-10-08 02:55:58 +02:00
684001d729
Dynamically calculate card height for embeds instead of padding ( #5265 )
...
The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height
2017-10-08 02:34:49 +02:00
292f3cd7e0
Show buffering in video player ( #5261 )
2017-10-08 02:33:08 +02:00
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
d2dee6ea43
Fix custom emoji in emoji picker, persist skin tone ( #5258 )
2017-10-07 19:02:30 +02:00
b7e65a004f
Japanese translation (relative time) ( #5251 )
2017-10-08 01:32:03 +09:00
057db0ecd0
Update emoji-mart to v2.1.1 ( #5256 )
2017-10-07 12:17:02 +02:00
11436358b4
Fix regression from #5206 - deduplicate descendants ( #5253 )
2017-10-07 12:16:39 +02:00
45682f876d
Make auto-play GIFs preference affect custom emojis in web UI ( #5254 )
2017-10-07 02:38:52 +02:00
d5f490b1a2
Fix error on reloading status detail column ( #5248 )
2017-10-06 20:37:56 +02:00
6f2d88dd28
Fix error at emoji_compressed in Firefox ESR ( #5241 )
2017-10-06 16:40:41 +02:00
72d939b69f
Fix thinking_face emoji autocomplete ( #5238 )
2017-10-06 12:03:13 +02:00
37e141bccb
comment out unused stuff with Video
2017-10-06 09:23:28 +02:00
97b3d0cd56
Import only Spring/Motion from react-motion ( #5236 )
2017-10-06 03:46:15 +02:00
fd7f0732fe
Compress and combine emoji data ( #5229 )
2017-10-06 03:42:34 +02:00
2aca22b8ea
import only Overlay from react-overlays ( #5235 )
2017-10-06 03:24:33 +02:00
7db0f8dcb2
Implement hotkeys for web UI ( #5164 )
...
* Fix #2102 - Implement hotkeys
Hotkeys on status list:
- r to reply
- m to mention author
- f to favourite
- b to boost
- enter to open status
- p to open author's profile
- up or k to move up in the list
- down or j to move down in the list
- 1-9 to focus a status in one of the columns
- n to focus the compose textarea
- alt+n to start a brand new toot
- backspace to navigate back
* Add navigational hotkeys
The key g followed by:
- s: start
- h: home
- n: notifications
- l: local timeline
- t: federated timeline
- f: favourites
- u: own profile
- p: pinned toots
- b: blocked users
- m: muted users
* Add hotkey for focusing search, make escape un-focus compose/search
* Fix focusing notifications column, fix hotkeys in compose textarea
2017-10-06 01:07:59 +02:00
b9c76e2edb
When processing custom emoji, ensure a non-animated version exists ( #5230 )
...
Use the non-animated version in web UI, but return both in API
2017-10-05 23:41:47 +02:00
ecfa1c3f3b
fix error (When part of conversation has already been deleted.) ( #5216 )
2017-10-04 16:28:39 +02:00
632178d754
Use own, shorter relative timestamps ( #5171 )
...
* Use own, shorter relative timestamps
* Add acct to title tooltip of display name in statuses
* Improve i18n of the relative times
2017-10-04 01:23:52 +02:00
ec13cfa4f9
When a streaming API status arrives, sort it into conversations ( #5206 )
2017-10-04 01:01:44 +02:00
e6543d5fc4
i18n: Update Polish translation ( #5202 )
2017-10-03 21:15:41 +02:00
82d9ade7a6
Compress emoji_data_light.js ( #5201 )
2017-10-03 20:43:57 +02:00
875d943c18
Add pagination in media modal ( #4343 )
...
* Add pagination in media modal
* Change array name
* Add an element class
* Avoid nested class
* Pull out the active class
* Use map instead of forEach
* Remove parentheses
2017-10-03 17:11:22 +02:00
eb6ec3d068
Add missing Japanese translations ( #5193 )
...
* yarn manage:translations
* Add Japanese translations for #5170
* Add Japanese translations for #5123
* Add Japanese translations for #5046
* Add Japanese translations for #5099
* Add Japanese translations for #5161
* "項目" -> "絵文字"
2017-10-03 13:10:26 +02:00
f303a954e6
Remove aria-label of status content ( #5195 )
...
aria-label contained body of status with content warning, which should be
hidden by default. Remove the label for the case and other cases due to
consistency.
2017-10-03 13:10:06 +02:00
395a57d03d
Update German translation ( #5189 )
2017-10-03 09:53:18 +09:00
0f699a4280
When muting, clear web UI like for blocks ( #5172 )
...
* When muting, clear web UI like for blocks
* Fix style issue
2017-10-03 02:01:54 +02:00
5e5f36c216
Fix #5079 , fix #5186 - Emoji picker fixes ( #5187 )
2017-10-03 01:56:50 +02:00
a767ef85fa
i18n: Update translation files and Polish translation ( #5180 )
...
* Update translation files
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-02 23:38:40 +02:00
4453c9a9f5
Search popout ( #5170 )
2017-10-02 18:24:05 +02:00
b9c612b561
Code-split emoji-mart picker and data ( #5175 )
2017-10-02 07:22:24 +02:00
c567c87453
Toggle contain:strict on fullscreen ( #5159 )
...
* Toggle contain:strict on fullscreen
* Fix scss lint issue
* fix scss whitespace lint issue
2017-10-02 03:01:01 +02:00
cdad7977fc
Improve privacy dropdown, remove react-simple-dropdown dependency ( #5140 )
...
* Improve privacy dropdown, remove react-simple-dropdown dependency
* Animate privacy warning
* Fix react-router-scroll
2017-10-01 12:20:00 +02:00
b110cc542f
Add image descriptions to title attribute to view on mouse hover/long-press. ( #5137 )
...
* Add image descriptions to `title` attribute to view on mouse hover/long-press.
* Too many title properties may spoil the broth.
2017-10-01 00:35:49 +02:00
b1217242fc
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
7481ae1bcb
trivial refactoring for emojify() ( #5075 )
...
* unite loop process
* add hint for original emojifier
2017-09-30 15:57:32 +02:00
ca0e8be20c
Improve IntersectionObserverArticle perf ( #5152 )
2017-09-30 14:28:49 +02:00
d6fe0954e3
Make emoji autosuggestions immediate, usernames appear sooner ( #5149 )
...
* Do not debounce emoji search
* Make autosuggestions appear sooner
2017-09-30 05:11:44 +02:00
ebb8c89207
Upgrade to React 16 ( #5119 )
...
* Upgrade to React 16.0.0
* Disable some uncritical tests while chai-enzyme remains incompatible
2017-09-30 04:29:56 +02:00
0060f98847
Remove react-sizeme ( #5143 )
...
* Remove react-sizeme
* Fix aspect ratio in "sensitive" mode
2017-09-29 22:46:43 +02:00
1a72813b53
Updated German translation ( #5151 )
...
Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.
More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.
Some small improvements.
2017-09-29 21:11:28 +02:00
887cd94e96
Increase attachment descriptions to 420 characters ( #5139 )
...
Blaze it
2017-09-29 02:30:00 +02:00
d0b4709b2a
Update German translation ( #5133 )
...
Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)
2017-09-28 20:45:09 +02:00
6e0659c838
Improve performance of modal and swipe animations ( #5135 )
...
* Improve performance of modal and swipe animations
* Fix eslint issues
2017-09-28 20:43:18 +02:00
a3202f61af
Updated German translation ( #5132 )
2017-09-28 17:38:39 +02:00
4ec1771165
Add ability to specify alternative text for media attachments ( #5123 )
...
* Fix #117 - Add ability to specify alternative text for media attachments
- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input
* Add tests
* Change undo button blend mode to difference
2017-09-28 15:31:31 +02:00
e9f9e3cc89
unbreak onboarding modal
2017-09-28 11:13:37 +02:00
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
2017-09-28 08:56:32 +02:00
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
2017-09-28 08:55:53 +02:00
e648ef0bfb
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
2017-09-28 00:26:33 +02:00
259181c41a
Fix size of single media in media-gallery ( #5098 )
2017-09-25 20:26:50 +02:00
Nolan Lawson