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
Eugen Rochko
08ec7435ce
Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
Eugen Rochko
f1a582dc15 Revert locales touched by automated translations (#10399) 
* Revert ruined translations

Regression from #10362

* yarn manage:translations
 2019-03-28 00:30:47 +01:00
Eugen Rochko
683013756e
Revert locales touched by automated translations (#10399) 
* Revert ruined translations

Regression from #10362

* yarn manage:translations
 2019-03-28 00:30:47 +01:00
Eugen Rochko
6e163d5b2a Fix alternative relay support regression (#10398) 
Fix #10324
 2019-03-27 19:58:24 +01:00
Eugen Rochko
e86663b1da
Fix alternative relay support regression (#10398) 
Fix #10324
 2019-03-27 19:58:24 +01:00
dependabot[bot]
77718e0b98 Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:45:31 +01:00
dependabot[bot]
319bce3d9d Bump tzinfo-data from 1.2018.9 to 1.2019.1 (#10396) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2018.9 to 1.2019.1.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2018.9...v1.2019.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:45:31 +01:00
dependabot[bot]
b27559d1c4 Bump bootsnap from 1.4.1 to 1.4.2 (#10395) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:44:49 +01:00
dependabot[bot]
852ca12753 Bump bootsnap from 1.4.1 to 1.4.2 (#10395) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 17:44:49 +01:00
slice
da47c30eac Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +01:00
slice
73f5711fb8 Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +01:00
Aditoo17
02d5017d85 Fix interpolations in some localizations (#10397) 2019-03-27 17:07:35 +01:00
Aditoo17
869e58e7ed Fix interpolations in some localizations (#10397) 2019-03-27 17:07:35 +01:00
Eugen Rochko
367ab6764f Remove unused ActivityPub @context values depending on response (#10378) 
Fix #8078
 2019-03-27 15:55:23 +01:00
Eugen Rochko
11fe293e1b
Remove unused ActivityPub @context values depending on response (#10378) 
Fix #8078
 2019-03-27 15:55:23 +01:00
ThibG
aa9fbfe842 Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart 
Revert emojimart update
 2019-03-27 14:37:44 +01:00
ThibG
0418bdd71f
Merge pull request #969 from ThibG/glitch-soc/fixes/revert-emojimart 
Revert emojimart update
 2019-03-27 14:37:44 +01:00
Thibaut Girka
451a79bda3 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit e781d842a5.
 2019-03-27 14:04:58 +01:00
Thibaut Girka
3a2f646cb1 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit db06b25376.
 2019-03-27 14:04:58 +01:00
Thibaut Girka
d72bc923e9 Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit b0e478fcc5.
 2019-03-27 14:04:52 +01:00
Thibaut Girka
355d384d8d Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit 49bea8c46b.
 2019-03-27 14:04:52 +01:00
Thibaut Girka
910fd88da2 Revert "Fix compilation after emoji-picker change" 
This reverts commit 05b79f07fa.
 2019-03-27 14:04:46 +01:00
Thibaut Girka
497a958297 Revert "Fix compilation after emoji-picker change" 
This reverts commit 8ea344fed4.
 2019-03-27 14:04:46 +01:00
ThibG
398b39ca12 Merge pull request #968 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-27 14:02:32 +01:00
ThibG
7535c607f4
Merge pull request #968 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-27 14:02:32 +01:00
Thibaut Girka
add1f52864 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00
Thibaut Girka
48230b57d2 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00
ThibG
2e5ec8b7c8 Move the account dropdown menubar to the right, make sure it doesn't move (#10390) 
* Move the account dropdown menubar to the right, make sure it doesn't move

* Fix margin
 2019-03-26 23:05:21 +01:00
ThibG
a91acf79b5 Move the account dropdown menubar to the right, make sure it doesn't move (#10390) 
* Move the account dropdown menubar to the right, make sure it doesn't move

* Fix margin
 2019-03-26 23:05:21 +01:00
ThibG
1a0de0f62d Merge pull request #966 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-26 19:51:28 +01:00
ThibG
bdf4f56f9a
Merge pull request #966 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-26 19:51:28 +01:00
ThibG
5ca976c776 [Glitch] Add a “Block & Report” button to the block confirmation dialog 
Port 36a6089a22 to glitch-soc
 2019-03-26 17:44:00 +01:00
ThibG
9e80b34a95 [Glitch] Add a “Block & Report” button to the block confirmation dialog 
Port 6df4a82969 to glitch-soc
 2019-03-26 17:44:00 +01:00
Thibaut Girka
cab7e62235 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
Thibaut Girka
fae53e1a39 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
ThibG
36a6089a22 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
ThibG
6df4a82969 Add a “Block & Report” button to the block confirmation dialog (#10360) 2019-03-26 17:34:02 +01:00
ThibG
cffb8cb38d Fix HTML validation (#10354) 
* Fix HTML validation

* Report first HTML error instead on validation error
 2019-03-26 17:33:26 +01:00
ThibG
0c46bd11aa Fix HTML validation (#10354) 
* Fix HTML validation

* Report first HTML error instead on validation error
 2019-03-26 17:33:26 +01:00
Aditoo17
70a78d968f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
Aditoo17
6f6abc369f Make clicking on avatar open public profile in new tab (#10387) 2019-03-26 17:33:07 +01:00
Hinaloe
824dc7c6b9 [Glitch] Do not set CSRF Token when no csrf header 
Port cc670c3234 to glitch-soc
 2019-03-26 16:12:46 +01:00
Hinaloe
872eab5784 [Glitch] Do not set CSRF Token when no csrf header 
Port 68f2211f00 to glitch-soc
 2019-03-26 16:12:46 +01:00
Eugen Rochko
36daf28215 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from 88a85f2574 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko
89a0fa3053 [Glitch] Change icons of features on admin dashboard to remove bias 
Port SCSS changes from e117964325 to glitch-soc
 2019-03-26 16:11:30 +01:00
Eugen Rochko
f6767a00d4 [Glitch] Add lang attribute to statuses in web UI 
Port JS changes from 0e730974cd to glitch-soc
 2019-03-26 16:09:59 +01:00
Eugen Rochko
614bd3f8d4 [Glitch] Add lang attribute to statuses in web UI 
Port JS changes from e6cfa7ab89 to glitch-soc
 2019-03-26 16:09:59 +01:00
ThibG
a1cc930335 [Glitch] Do not empty timeline of blocked users on block 
Port 248de99443 to glitch-soc
 2019-03-26 16:07:47 +01:00
ThibG
d680c61993 [Glitch] Do not empty timeline of blocked users on block 
Port 94aceb85ad to glitch-soc
 2019-03-26 16:07:47 +01:00
Thibaut Girka
1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00