hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,096 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

8096 Commits (1e656c36322f4f941b8d432243454c16273d25b6)

Author SHA1 Message Date
dependabot[bot] 87ca51878d Bump redis from 4.0.2 to 4.0.3 (#9187) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-03 09:34:43 +09:00
Thibaut Girka 34209c0340 Fix timestamp position in public pages with RTL languages 2018-10-31 11:37:47 +01:00
Thibaut Girka b3c1380980 Fix styling of display names in public pages 2018-10-31 11:37:47 +01:00
ThibG a78ec63afa
Merge pull request #803 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes (v2.6.1)
 2018-10-31 11:15:37 +01:00
Thibaut Girka 75b48dc177 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-31 10:08:36 +01:00
Thibaut Girka 2b2facbbdf [Glitch] Port some of upstream's getting started footer links 2018-10-31 10:07:41 +01:00
Eugen Rochko ba06a5f485
Bump version to 2.6.1 (#9172) 2018-10-31 01:04:45 +01:00
Eugen Rochko b9d0d209cd
Fix reducer error when conversation has no last status in web UI (#9173) 
Fix #9170
 2018-10-31 00:55:20 +01:00
Eugen Rochko ce2ee68b64
Revert "Fix FetchAtomService content type handling (#9132)" (#9171) 
This reverts commit c36a4a1617.
 2018-10-31 00:43:34 +01:00
Eugen Rochko 50ce347ef9
Bump version to 2.6.0 (#9149) 
* Bump version to 2.6.0

* Update CHANGELOG.md
 2018-10-30 22:06:59 +01:00
Quentí 804586172e [i18n] Update for Occitan (#9169) 
* Update oc.json

* Update oc.yml

* Update simple_form.oc.yml

* Update simple_form.oc.yml

* Update oc.json
 2018-10-30 22:06:31 +01:00
Eugen Rochko f2290e311b
Remove progress estimate from MigrateAccountConversations (#9168) 2018-10-30 21:09:33 +01:00
ThibG 08c0f8b67c
Merge pull request #802 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 20:10:09 +01:00
Jeong Arm 7800e1af7e Specify node version to not use node11 (#9166) 
uWS has no support node11 yet.
 2018-10-30 19:46:20 +01:00
Thibaut Girka 0d6b8f36aa [Glitch] Fix empty display name precedence over username in web UI 
Port f59b840549 to glitch-soc
 2018-10-30 17:54:50 +01:00
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
 2018-10-30 17:52:08 +01:00
Thibaut Girka 7e18e95716 Add a local setting for inline preview cards 2018-10-30 17:51:06 +01:00
Thibaut Girka bdc2338833 Add a “link” status icon for toots with a preview card 2018-10-30 17:51:06 +01:00
Thibaut Girka b21615e957 [Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning 
Port 9c38c5daa3 to glitch-soc
 2018-10-30 17:51:06 +01:00
Thibaut Girka ac9780b844 [Glitch] Include preview cards in status entity in REST API 
Port 795f0107d2 to glitch-soc
 2018-10-30 17:51:06 +01:00
Eugen Rochko 66019b0ec4
Bump version to 2.6.0rc4 (#9164) 
* Bump version to 2.6.0rc4

* Update CHANGELOG.md
 2018-10-30 17:37:49 +01:00
Eugen Rochko f59b840549
Fix empty display name precedence over username in web UI (#9163) 
Fix #9131
 2018-10-30 17:06:12 +01:00
Eugen Rochko cc45a8f9f7
Fix td instead of th in sessions table header (#9162) 
Fix #9130
 2018-10-30 17:00:34 +01:00
Eugen Rochko 5c8e7f0e1d
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161) 
This reverts commit 10680f93e7.
 2018-10-30 16:25:54 +01:00
valerauko c36a4a1617 Fix FetchAtomService content type handling (#9132) 
* Add profile to json+ld in Accept

It's required by the ActivityPub spec

* Use headers['Content-type'] instead of mime_type

mime_type strips the profile from the content type, but it's still available raw in the headers hash

* Add test for ld+json with profile
 2018-10-30 15:07:57 +01:00
Quentí a3d40ba53b [i18n] Update for Occitan (#9157) 
* Update oc.json

* Update devise.oc.yml

* Update oc.yml

* Update oc.json
 2018-10-30 15:05:01 +01:00
Eugen Rochko be202f9377
Accept the same payload in multiple inboxes and deliver (#9150) 2018-10-30 15:03:55 +01:00
Eugen Rochko 47b8d195e6
Always let through notifications from staff (#9152) 
* Always let through notifications from staff

Follow-up to #8993

* Let messages from staff through, but no other notifications
 2018-10-30 15:02:55 +01:00
ThibG a03d506626 Fix Pleroma mentions being fetched as preview cards (#9158) 2018-10-30 15:02:24 +01:00
dependabot[bot] c1eec9869e [Security] Bump loofah from 2.2.2 to 2.2.3 (#9160) 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-30 22:59:11 +09:00
ThibG 7f24242ef6
Merge pull request #801 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 14:20:25 +01:00
Thibaut Girka 48be335f4f Remove duplicate and outdated specs 2018-10-30 12:46:05 +01:00
Masoud Abkenar 3aa2418217 [Glitch] RTL: fix toot privacy preferences radio buttonss 
Port e961a763a2 to glitch-soc
 2018-10-30 11:24:40 +01:00
Masoud Abkenar e32a4f55fe [Glitch] RTL: fix preferences page checkbox margins 
Port 5ee0b51ac8 to glitch-soc
 2018-10-30 11:24:19 +01:00
Thibaut Girka 94ad76a5b9 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
dependabot[bot] 6771e8c88c Bump oj from 3.6.12 to 3.7.0 (#9155) 
Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0.
- [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.6.12...v3.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-30 06:39:52 +01:00
trwnh 2cc099c70f Make detailed-status__wrapper actually wrap detailed status (#8547) 
* Remove class from scrollable div

.detailed-status__wrapper does not actually wrap the detailed status here

* Re-add class to focusable div

.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
 2018-10-30 06:33:02 +01:00
Eugen Rochko d4415cc316
Bump i18n-tasks from master to 0.9.28 (#9148) 2018-10-30 01:06:47 +01:00
Masoud Abkenar e961a763a2 RTL: fix toot privacy preferences radio buttonss (#9146) 2018-10-30 00:49:29 +01:00
Masoud Abkenar 5ee0b51ac8 RTL: fix preferences page checkbox margins (#9145) 
* RTL: fix preferences page checkbox margins

* Update rtl.scss
 2018-10-30 00:47:43 +01:00
ThibG 33a71e8f7c Do not hide boost notifications from followed people with hidden boosts (#9147) 
* Do not hide boost notifications from followed people with hidden boosts

Not displaying boosts from a followed user in the Home timeline and not
having notifications when they reblog your own content are two very
separate concerns, tying them together seem counter-intuitive and unwanted.

* Update specs accordingly
 2018-10-30 00:47:31 +01:00
ash lea 7ec3f6022d move some constants to rails environment 2018-10-29 21:29:31 +01:00
ThibG 88659eda24
Merge pull request #798 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-29 21:29:15 +01:00
Thibaut Girka ee5132a00e Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:16:35 +01:00
Eugen Rochko e84da282f6
Bump version to 2.6.0rc3 (#9142) 
* Bump version to 2.6.0rc3

* Update CHANGELOG.md
 2018-10-29 14:15:54 +01:00
Thibaut Girka f16d66c5c8 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:09:54 +01:00
Eugen Rochko 3fd808ab26
Update AUTHORS.md (#9141) 2018-10-29 14:05:53 +01:00
Eugen Rochko b40ea6d1d4
Bump sanitize from 4.6.6 to 5.0.0 (#9140) 2018-10-29 14:05:25 +01:00
Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
 2018-10-29 14:00:41 +01:00
Eugen Rochko 32f950a7a8
Update i18n-tasks to master (#9139) 2018-10-29 13:46:39 +01:00