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

7895 Commits (235e9b13ffe379f1a9523eaeeb843e2311782f3f)

Author SHA1 Message Date
Thibaut Girka 235e9b13ff Fix timestamp position in public pages with RTL languages 2018-10-31 11:37:47 +01:00
Thibaut Girka 080a6cb6f3 Fix styling of display names in public pages 2018-10-31 11:37:47 +01:00
ThibG 960ebc9e36 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 33ad16faa7 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-31 10:08:36 +01:00
Thibaut Girka 13567f13af [Glitch] Port some of upstream's getting started footer links 2018-10-31 10:07:41 +01:00
Eugen Rochko 56e256b686 Bump version to 2.6.1 (#9172) 2018-10-31 01:04:45 +01:00
Eugen Rochko 083f015f9f 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 3981da6f90 Revert "Fix FetchAtomService content type handling (#9132)" (#9171) 
This reverts commit c20d55f7dd.
 2018-10-31 00:43:34 +01:00
Eugen Rochko 15fd0fb2cf 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í 407cab9844 [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 1fad3301a1 Remove progress estimate from MigrateAccountConversations (#9168) 2018-10-30 21:09:33 +01:00
ThibG 64fedb341a Merge pull request #802 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 20:10:09 +01:00
Jeong Arm 24aa422858 Specify node version to not use node11 (#9166) 
uWS has no support node11 yet.
 2018-10-30 19:46:20 +01:00
Thibaut Girka 5ad4bcbece [Glitch] Fix empty display name precedence over username in web UI 
Port 4084814d8a to glitch-soc
 2018-10-30 17:54:50 +01:00
Thibaut Girka fd18ed4cea 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 8bef422043 Add a local setting for inline preview cards 2018-10-30 17:51:06 +01:00
Thibaut Girka 4fe81a99c6 Add a “link” status icon for toots with a preview card 2018-10-30 17:51:06 +01:00
Thibaut Girka 7f023b3b98 [Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning 
Port 766a808de4 to glitch-soc
 2018-10-30 17:51:06 +01:00
Thibaut Girka 18870c45f1 [Glitch] Include preview cards in status entity in REST API 
Port cf2ab9c394 to glitch-soc
 2018-10-30 17:51:06 +01:00
Eugen Rochko 4c8ac98fa0 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 4084814d8a Fix empty display name precedence over username in web UI (#9163) 
Fix #9131
 2018-10-30 17:06:12 +01:00
Eugen Rochko e242688a74 Fix td instead of th in sessions table header (#9162) 
Fix #9130
 2018-10-30 17:00:34 +01:00
Eugen Rochko ca87d98d16 Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161) 
This reverts commit 0c756cfd54.
 2018-10-30 16:25:54 +01:00
valerauko c20d55f7dd 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í a43fdd72ba [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 d84886f35e Accept the same payload in multiple inboxes and deliver (#9150) 2018-10-30 15:03:55 +01:00
Eugen Rochko c15b8ee75b 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 cfe92b50bb Fix Pleroma mentions being fetched as preview cards (#9158) 2018-10-30 15:02:24 +01:00
dependabot[bot] 4d5a219013 [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 a22e278344 Merge pull request #801 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 14:20:25 +01:00
Thibaut Girka d004994787 Remove duplicate and outdated specs 2018-10-30 12:46:05 +01:00
Masoud Abkenar bdcdc35df7 [Glitch] RTL: fix toot privacy preferences radio buttonss 
Port 27b5a57f6d to glitch-soc
 2018-10-30 11:24:40 +01:00
Masoud Abkenar cecd8b25c4 [Glitch] RTL: fix preferences page checkbox margins 
Port 4e034437e3 to glitch-soc
 2018-10-30 11:24:19 +01:00
Thibaut Girka 7406141a71 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
dependabot[bot] 8633ac4b68 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 fcd79aba0b 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 bd79977354 Bump i18n-tasks from master to 0.9.28 (#9148) 2018-10-30 01:06:47 +01:00
Masoud Abkenar 27b5a57f6d RTL: fix toot privacy preferences radio buttonss (#9146) 2018-10-30 00:49:29 +01:00
Masoud Abkenar 4e034437e3 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 1cbcb09d67 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 5fbafbb54d move some constants to rails environment 2018-10-29 21:29:31 +01:00
ThibG 42ee366e8e Merge pull request #798 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-29 21:29:15 +01:00
Thibaut Girka 915a202260 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:16:35 +01:00
Eugen Rochko e6c91483fb 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 bc97c2ab8a Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:09:54 +01:00
Eugen Rochko 9795dc5509 Update AUTHORS.md (#9141) 2018-10-29 14:05:53 +01:00
Eugen Rochko eaf49c5d94 Bump sanitize from 4.6.6 to 5.0.0 (#9140) 2018-10-29 14:05:25 +01:00
Thibaut Girka 13ea29754d 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 543bcb5984 Update i18n-tasks to master (#9139) 2018-10-29 13:46:39 +01:00
Julian 41661248b0 Improved grammar in German translation (#9092) 
Just a grammar improvement.
 2018-10-29 13:24:15 +01:00