7c44ad6355
Merge pull request #181 from glitch-soc/upstream-merge-again
...
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
7 years ago
37ff061d9b
satisfy eslint and jest
7 years ago
3d7de06db4
rem a comment
7 years ago
26f08f0791
double-decker tootbox
7 years ago
8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
4b397adb5b
fix some lint errors
7 years ago
8980aa804f
Fix reduced motion breaking public galleries ( #5423 )
7 years ago
34118169ac
Keep references to all reblogs of a status on home feed ( #5419 )
...
* Keep references to all reblogs of a status on home feed
When inserting reblog: Add to set of reblogs of this status on
the feed, if original status was present in the feed, add it to
that set as well.
When removing a reblog: Remove it from that set. Take random
remaining item from the set. If one exists, re-insert it into feed,
otherwise do not re-insert anything.
Fix #4210
* When original is removed, toss out reblog references
7 years ago
4fd7aebd5e
Fix typo in a db:rollback script ( #5422 )
...
Reported at
https://don.inux39.me/@inux39/1406082
https://don.inux39.me/@inux39/1406134
7 years ago
65154869df
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
bc89995f65
Bump version to 2.0.0rc3
7 years ago
7e9d93472c
Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
dbb1fce94d
Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
7cc71748ce
Ensure that feed renegeration restores non-zero items ( #5409 )
...
Fix #5398
Ordering the home timeline query by account_id meant that the first
100 items belonged to a single account. There was also no reason to
reverse-iterate over the statuses. Assuming the user accesses the
feed halfway-through, it's better to have recent statuses already
available at the top. Therefore working from newer->older is ideal.
If the algorithm ends up filtering all items out during last-mile
filtering, repeat again a page further. The algorithm terminates
when either at least one item has been added, or if the database
query returns nothing (end of data reached)
7 years ago
aec70b44fc
Filter out duplicate IDs in timelines reducer ( #5417 )
...
Possibly the cause of #5379 , #5377
7 years ago
6f490b4bfe
Fix un-reblogged status being at wrong position in the home timeline ( #5418 )
...
We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed.
However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses.
So this reverts that change...reblogged status inserted at corresponding position to its id.
7 years ago
03975dbde4
Add up-to-date korean translation on client ( #5402 )
...
* chore: add Korean translation for client
* fix: change unlisted and embed Korean words
7 years ago
f72936b4e6
Fix #5082 - disable retweet link for followers only toot ( #5397 )
...
* Fix #5082 - disable retweet link for followers only toot
* Hide reblog count when it is a direct message
7 years ago
3c530d95f6
i18n: Update Polish translation ( #5416 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
1e7b3bf625
i18n ultim hour «More» dropdown title + reduce motion ( #5415 )
...
* Correction fem. form
* More dropdown title
* More dropdown title
* More dropdown title
* Add option to reduce motion (#5393 )
7 years ago
bf0ee1a25c
Enable ESLint rules import/* ( #5414 )
...
* Enable ESLint rules import/*
* fix
7 years ago
fa0be3f834
Add option to reduce motion ( #5393 )
...
* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml
7 years ago
981e20b03a
Fix offline-plugin warning in dev mode ( #5411 )
7 years ago
d5b767c374
Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )
7 years ago
93b54b8d4b
i18n "More" dropdown title ( #5410 )
7 years ago
e7ab9bf8b4
Refactor and simplify icon_button.js ( #5413 )
7 years ago
6cd5b3bbe5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
f72ad67a39
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
...
Avatar unification, mk.II
7 years ago
56094cb4bd
1.6 changed files for unified avatar styling -- updated to restore unity
7 years ago
22df18e902
Merge pull request #173 from glitch-soc/zerowidthmoji
...
use zerowidth spaces with emojis
7 years ago
894da3dcca
Clear timer when unmounting RelativeTimestamp components ( #5408 )
...
Possibly the cause of #5379 , #5377
7 years ago
3e2f793948
Add up-to-date korean translation on serverside ( #5400 )
...
* chore: add korean translation on ko.yml
* feat: add simple form korean translation up-to-date
7 years ago
8eb7d30a6c
l10n Occitan: finishing touches ( #5404 )
...
* Update oc.json
* Update oc.yml
7 years ago
7fe1428cc4
Update French translation ( #5401 )
7 years ago
b3b4b5a2eb
Adjust public hashtag pages ( #5357 )
7 years ago
8125fdc19f
Use atomUri in Undo activity of Announce ( #5376 )
...
This allows deletion of reblogs which delivered before with OStatus URI.
7 years ago
ae716a12e1
replace newlines in desktop notif with spaces instead of removing them ( #5361 )
7 years ago
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
7 years ago
1bdd694a0a
Fix #5351 - Redirection with page params after copy emoji ( #5387 )
...
* Fix #5351 - Redirection with page params after copy emoji
* Add page params to copy emoji link
7 years ago
2eab41cd1a
Close connection when succeeded posting ( #5390 )
...
* Close connection when succeeded posting
* Update webmock
7 years ago
c6f76db2e1
Update French translation ( #5384 )
...
Update French translation
7 years ago
2c704ca9c6
l10n: update Persian translation for 2.0 ( #5391 )
7 years ago
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>
7 years ago
eb96aa86a4
Update German translation ( #5389 )
7 years ago
c1a2707ecf
Correct some misspellings ( #5381 )
...
* Correct some misspellings
Remove some english language and put the proper french words in place.
* Forgot some shit
Buurps'
7 years ago
531dadad86
Doodle palette, options, fill tool ( #172 )
7 years ago
723890b6fa
use zerowidth spaces for emojis
7 years ago
daa04c39b6
Merge pull request #168 from glitch-soc/doodles
...
Initial doodle support
7 years ago
2af964ef20
Fixed a bug where the canvas would get transparent bg upon erase
7 years ago
33e806217f
Initial doodle support
7 years ago
David Yip
Ondřej Hruška
Nolan Lawson
Eugen Rochko
Daigo 3 Dango
unarist
voidSatisfaction
KY
Marcin Mikołajczak
JeanGauthier
Yamagishi Kazutoshi
Matthew Walsh
Yannick A
Lynx Kotoura
spla
abcang
Masoud Abkenar
Jakob Kramer
Mathias B