alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,963 Commits
9 Branches
0 Tags
183 MiB
Commit Graph

7963 Commits (b3ff35a75cf04e4aba2712a9d0897257cf79af82)

Author SHA1 Message Date
Thibaut Girka b3ff35a75c Move URLs to backend in their own file 2018-11-19 15:56:38 +01:00
Thibaut Girka a77ee0bb6d Fix composer not displaying on iPad 2018-11-16 15:04:32 +01:00
Thibaut Girka 86527024aa In detailed status view, take displayMedia setting into account when changing media 
Fixes #819
 2018-11-15 16:38:50 +01:00
Thibaut Girka a100f05687 Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
Thibaut Girka f84897c7d7 Add field to serialized local-only statuses 2018-11-13 18:55:57 +01:00
Thibaut Girka 759750801e Exclude local-only toots from atom feeds 2018-11-13 18:55:57 +01:00
ThibG e4feef6b5c
Merge pull request #817 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-13 18:48:07 +01:00
Thibaut Girka 6ce7e74b46 [Glitch] Fix race condition when interacting with deleted toots 
Port c875f19673 to glitch-soc
 2018-11-13 16:30:07 +01:00
Thibaut Girka bfe2b9cc50 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-13 16:28:07 +01:00
Thibaut Girka 2fe0cb1623 [Glitch] Prepend account header even when status list is empty 
Partially port 90b64c0069
 2018-11-13 15:54:04 +01:00
Thibaut Girka c78c80f807 [Glitch] Fix loading indicator inconsistency 
Port 3cecf3e5b9 to glitch-soc
 2018-11-13 15:54:04 +01:00
Thibaut Girka 5ebbaffaa3 [Glitch] Use local instead of global loading indicator for timelines, account timelines 
Port dd00cd19d2 to glitch-soc
 2018-11-13 15:54:04 +01:00
ThibG c875f19673 Fix race condition causing shallow status with only a "favourited" attribute (#9272) 
Fixes #9231
 2018-11-13 14:58:14 +01:00
Eugen Rochko bb69d154c4
Fix null error introduced in #9270 (#9275) 2018-11-12 22:07:31 +01:00
ThibG bbd8fdd185 Perform deep comparison for card data when receiving new props (#9270) 
Fixes #9226
 2018-11-12 18:17:50 +01:00
ThibG c5a4dc9118
Merge pull request #813 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-12 16:00:16 +01:00
Thibaut Girka 1283e112b9 Tighten CSP a bit 2018-11-12 15:43:02 +01:00
dependabot[bot] c81bdafb07 Bump parallel_tests from 2.26.2 to 2.27.0 (#9263) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:48 +01:00
dependabot[bot] 971863c426 Bump thor from 0.20.0 to 0.20.3 (#9266) 
Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3.
- [Release notes](https://github.com/wycats/thor/releases)
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:21 +01:00
dependabot[bot] 111ad86680 Bump oj from 3.7.0 to 3.7.1 (#9265) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:12 +01:00
dependabot[bot] fe57d73e4c Bump bullet from 5.8.1 to 5.9.0 (#9264) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:49:51 +01:00
Les Orchard cc1f13dfd0 Only consider mouse move in scrolling on item insertion (#9262) 
Fixes #9259
 2018-11-11 23:20:20 +01:00
mayaeh 208d278cbc i18n: Add ja translations (#9261) 
* Run yarn manage:translations

* Add Japanese translations.
 2018-11-11 18:57:16 +01:00
ThibG 7f5a4be580 Fix emoji update date processing (#9255) 2018-11-10 23:59:51 +01:00
ThibG 9b89c62d43 Check that twitter:player is valid before using it (#9254) 
Fixes #9251
 2018-11-10 20:42:04 +01:00
Thibaut Girka 0506c6f62f Merge branch 'master' into glitch-soc/merge-upstream 2018-11-10 17:57:19 +01:00
Eugen Rochko 3cecf3e5b9
Fix loading indicator inconsistency (#9252) 
* Use global loading indicator when loading more items

* Use local loading indicator for notifications

And remove global loading indicator for initial custom emojis load
 2018-11-10 15:04:13 +01:00
ThibG 09562b0fcc
Merge pull request #806 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-09 22:29:52 +01:00
Thibaut Girka 868cace797 [Glitch] Remove unused computation of reblog references from updateTimeline 2018-11-09 21:57:56 +01:00
Thibaut Girka 0e80661e42 [Glitch] Don't remove originals of boosted toots from timeline 
Port 2b51b4094c to glitch-soc
 2018-11-09 21:57:56 +01:00
Les Orchard 2f86fc5e0a Identify manual scrolling to cancel scroll to top reset on mouse idle (#9245) 2018-11-09 18:06:43 +01:00
Thibaut Girka 44f5f7bab4 Fix drawer waves being displayed in the list editor 2018-11-09 18:00:29 +01:00
ThibG 08b3de4d5e Remove unused computation of reblog references from updateTimeline (#9244) 2018-11-09 17:43:25 +01:00
Thibaut Girka c6fc3e0c65 [Glitch] Fix form validation flash message color and input borders 
Port ccbdf689e8 to glitch-soc
 2018-11-09 15:10:09 +01:00
Thibaut Girka 9201398507 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-09 14:56:31 +01:00
Thibaut Girka bf92e7aaa6 [Glitch] Implement adding a user to a list from their profile 
Port bb5558de62 to glitch-soc
 2018-11-09 14:50:08 +01:00
Eugen Rochko ed7c5f94f7
Improve ActiveRecord connection in on_worker_boot (#9238) 
This is how it looks in the example in the Puma README
 2018-11-09 09:08:01 +01:00
dependabot[bot] 0319361fa3 Bump tty-prompt from 0.17.1 to 0.17.2 (#9243) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.1 to 0.17.2.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.1...v0.17.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 09:07:45 +01:00
dependabot[bot] 31af76a72c Bump sidekiq from 5.2.2 to 5.2.3 (#9241) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:56:46 +01:00
dependabot[bot] 2cdbe18c22 Bump pry-rails from 0.3.6 to 0.3.7 (#9242) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:55:41 +01:00
dependabot[bot] 12401000d8 Bump hiredis from 0.6.1 to 0.6.3 (#9240) 
Bumps [hiredis](https://github.com/redis/hiredis-rb) from 0.6.1 to 0.6.3.
- [Release notes](https://github.com/redis/hiredis-rb/releases)
- [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-09 06:55:19 +01:00
Eugen Rochko 16a16f62c7
Fix nil error regression from #9229 in tootctl media remove (#9239) 
Fix #9237
 2018-11-08 21:55:59 +01:00
Eugen Rochko 4615512285
Reduce connect timeout limit and limit signature failures by source IP (#9236) 
* Reduce connect timeout from 10s to 1s

* Limit failing signature verifications per source IP
 2018-11-08 21:35:58 +01:00
Eugen Rochko dd00cd19d2
Use local instead of global loading indicator for timelines, account timelines (#9224) 
So that opening a profile feels faster. Also, pinned toots are not
shown before other toots have loaded. Also, if no toots are loaded,
added empty message
 2018-11-08 21:35:06 +01:00
dependabot[bot] f055907857 Bump bullet from 5.7.6 to 5.8.1 (#9156) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:15:33 +01:00
dependabot[bot] 6e44e27e09 Bump parallel_tests from 2.26.0 to 2.26.2 (#9154) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.0 to 2.26.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:15:08 +01:00
dependabot[bot] 9d0e61167f Bump aws-sdk-s3 from 1.23.0 to 1.23.1 (#9174) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:14:25 +01:00
dependabot[bot] e50a7cbc69 Bump capybara from 3.10.0 to 3.10.1 (#9216) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.10.0...3.10.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:13:44 +01:00
dependabot[bot] a28441144e Bump pkg-config from 1.3.1 to 1.3.2 (#9215) 
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-08 21:13:27 +01:00
Eugen Rochko 5cbf6cf3ec
Add "Show thread" link to self-replies (#9228) 
Fix #4716
 2018-11-08 21:08:57 +01:00