me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39662 commits 2 branches 0 tags 429 MiB
Commit graph

39662 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
1fad3301a1 Remove progress estimate from MigrateAccountConversations (#9168) 2018-10-30 21:09:33 +01:00
Eugen Rochko
f2290e311b
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
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
24aa422858 Specify node version to not use node11 (#9166) 
uWS has no support node11 yet.
 2018-10-30 19:46:20 +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
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
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
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
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
8bef422043 Add a local setting for inline preview cards 2018-10-30 17:51:06 +01:00
Thibaut Girka
7e18e95716 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
bdc2338833 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
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
18870c45f1 [Glitch] Include preview cards in status entity in REST API 
Port cf2ab9c394 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
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
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
4084814d8a Fix empty display name precedence over username in web UI (#9163) 
Fix #9131
 2018-10-30 17:06:12 +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
e242688a74 Fix td instead of th in sessions table header (#9162) 
Fix #9130
 2018-10-30 17:00:34 +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
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
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
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
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í
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
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
d84886f35e Accept the same payload in multiple inboxes and deliver (#9150) 2018-10-30 15:03:55 +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
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
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
cfe92b50bb Fix Pleroma mentions being fetched as preview cards (#9158) 2018-10-30 15:02:24 +01:00
ThibG
a03d506626 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
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
a22e278344 Merge pull request #801 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-30 14:20:25 +01: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
d004994787 Remove duplicate and outdated specs 2018-10-30 12:46:05 +01:00
Thibaut Girka
48be335f4f 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
3aa2418217 [Glitch] RTL: fix toot privacy preferences radio buttonss 
Port e961a763a2 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
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
7406141a71 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00
Thibaut Girka
94ad76a5b9 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