treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,630 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

8630 Commits (be9352266c9ec7595c6354a8d98c990a2dc91bf8)

Author SHA1 Message Date
rinsuki 88f35f339d Fix authorized applications list page design (#9969) 2019-02-04 22:25:42 +01:00
rinsuki c78d64d9c3 Use video filesize limit with gifv (#9924) 2019-02-04 04:46:05 +01:00
mike castleman f86413fce2 change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
Eugen Rochko 364f2ff9aa
Add featured hashtags to profiles (#9755) 
* Add hashtag filter to profiles

GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag

* Display featured hashtags on public profile

* Use separate model for featured tags

* Update featured hashtag counters on-write

* Limit featured tags to 10
 2019-02-04 04:25:59 +01:00
Eugen Rochko d14c276e58
Add option to overwrite imported data (#9962) 
* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks
 2019-02-03 03:59:51 +01:00
dependabot[bot] c5071f2d78 Bump capybara from 3.12.0 to 3.13.2 (#9935) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2.
- [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.12.0...3.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-03 03:40:40 +01:00
dependabot[bot] 7e33d6d192 Bump httplog from 1.2.0 to 1.2.1 (#9942) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-03 03:40:22 +01:00
Thibaut Girka c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
tmm576 750c67660d Allow multiple files upload through web UI, including drag & drop (#9856) 
* Allow drag and drop uploads of multiple files to compose

* Calculate aggregate upload progress for single action

* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
 2019-02-02 20:22:05 +01:00
Jeong Arm 582f86ab32 Re-enable ignored translations that is needed (#7842) 
Some of strings should be translated.
 2019-02-02 19:37:16 +01:00
ThibG ed30110618 Make displaying application used to toot opt-in (#9897) 
* Make storing and displaying application used to toot opt-in

* Revert to storing application info, and display it to the author via API
 2019-02-02 19:18:15 +01:00
ysksn bcfff65195 Create Redisable#redis (#9633) 
* Create Redisable

* Use #redis instead of Redis.current
 2019-02-02 19:11:38 +01:00
Jakub Mendyk 6a5e3da6b0 Allow most kinds of characters in URL query (fixes #8408) (#8447) 
* Allow unicode characters in URL query strings

Fixes #8408

* Alternative approach to unicode support in urls

Adds PoC/idea to approch this problem.
 2019-02-02 19:01:18 +01:00
Acid Chicken (硫酸鶏) 5092d17f29 Add WebP support (#9879) 
* Add WebP support

* Remove the changes to the tooltip

refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
 2019-02-02 12:25:04 +01:00
gol-cha b253d3e0c2 Upgrade new Web Share Target API (#9963) 
* Update manifest.json for new Web Share Target API.

* fix code formatting
 2019-02-02 01:26:49 +01:00
ThibG 1cd7b15532
Merge pull request #904 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-01 18:24:36 +01:00
Eugen Rochko 663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka 2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
 2019-02-01 16:12:20 +01:00
Thibaut Girka f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka 762e4fdf55 Fix hashtag processing when sending toots 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
 2019-02-01 12:37:28 +01:00
Marek Ľach 3de63b3c35 More corrections for the Slovak translation (#9959) 2019-02-01 09:18:40 +09:00
Eugen Rochko ad8c71c985
Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 00:15:38 +01:00
Eugen Rochko 1f95190202
Refactor icons in web UI to use Icon component (#9951) 
* Refactor uses of icons to an Icon component in web UI

* Refactor options passed to the Icon component

* Make tests work with absolute component paths
 2019-02-01 00:14:05 +01:00
Marek Ľach 3383ed7573 Update the Slovak translation (#9958) 2019-02-01 08:13:47 +09:00
Marek Ľach 0167659f5f Distinguish error messaging for mystyped URLs and deleted accounts (#9957) 2019-02-01 00:07:08 +01:00
Clar Charr 6513f6c953 Replace unlock-alt icon with unlock (#9952) 2019-01-31 13:45:15 +01:00
dependabot[bot] 6c513c75ef Bump rails-i18n from 5.1.2 to 5.1.3 (#9943) 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-30 04:22:59 +09:00
marcin mikołajczak 4079b831e6 i18n: Update Polish translation 🇵🇱 (#9945) 
* Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* normalize

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* inconsistentInterpolations--

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2019-01-30 04:21:15 +09:00
Sam Schlinkert 7e81bca500 Bumps copyright year in README.md to 2019 (#9939) 
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
 2019-01-28 22:57:42 +01:00
ThibG 48d00ac0d9
Merge pull request #901 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-28 21:40:38 +01:00
Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md: kept our version
 2019-01-28 21:14:47 +01:00
Eugen Rochko 28866d329b
Bump version to 2.7.1 (#9932) 2019-01-28 04:24:12 +01:00
Eugen Rochko 5d312ef9c7
Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930) 2019-01-28 04:18:35 +01:00
Eugen Rochko d4300c3b98
Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Stanislas 01bc2f84a9 Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
ThibG e488faaa4a
Merge pull request #900 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-27 22:24:29 +01:00
Thibaut Girka f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
Thibaut Girka 72bab194ad Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG a53dcaa298 Fix initial value of volume slider in video player and handle volume changes (#9929) 
* Fix initial value of volume slider in video player and handle volume changes

* Clean up dead/incorrect code
 2019-01-27 21:18:15 +01:00
ThibG ec5bd8b8bb Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
ThibG f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-27 14:23:24 +01:00
Thibaut Girka 7251bc3853 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 13:57:25 +01:00
Thibaut Girka f938800ef4 Revert to storing application info, and display it to the author via API 2019-01-27 13:56:41 +01:00
Thibaut Girka 05415fa5d3 Make storing and displaying application used to toot opt-in 2019-01-27 13:56:41 +01:00
ThibG e2a5be6e9a Prevent posting toots with media attachments from someone else (#9921) 2019-01-26 23:59:39 +01:00
ThibG 64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-26 18:47:48 +01:00
Thibaut Girka 80d954ec10 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-26 18:32:49 +01:00
ThibG 270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-01-25 22:42:21 +01:00