Jenkins
db3be77890
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
unarist
605a92b460
Fix moved account handling in IndexedDB feature ( #6915 )
* Fix stack overflow on importFetchedAccounts
When the account has moved property, it should process destination
account instead of source account itself.
* Set account id instead of account object for moved property
This restores "foo has moved to" indication on account view, and
fixes `reblog` index on `accounts` object store.
6 years ago
Yann Klis
3b2c7a33a9
Missing OTP_SECRET in scalingo.json ( #6917 )
6 years ago
Jenkins
837b3804bf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Marcin Mikołajczak
85a395fab6
i18n: Update Polish translation ( #6903 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
Akihiko Odaki
cbf97c03bb
Allow clients to fetch notifications made while they were offline ( #6886 )
6 years ago
Akihiko Odaki
9a1a55ce52
Allow clients to fetch statuses made while they were offline ( #6876 )
6 years ago
Akihiko Odaki
59657e24b9
Rename variables to have semantic meanings in notifications reducer ( #6890 )
6 years ago
Akihiko Odaki
fe398a098e
Store objects to IndexedDB ( #6826 )
6 years ago
Yamagishi Kazutoshi
28384c1771
Revert "Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )" ( #6808 )
This reverts commit 40871caa4b
.
6 years ago
Akihiko Odaki
ff7941e652
Show media modal on public pages ( #6801 )
6 years ago
Marcin Mikołajczak
1c15329cce
Change “Toots with replies” to “Toots and replies” ( #6875 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
Akihiko Odaki
b2a4ffd3a9
Change columns in notifications nonnullable ( #6764 )
6 years ago
Akihiko Odaki
fa310695fa
Note if the user is already following the target when authorizing follow ( #6325 )
6 years ago
Jeroen
580835ab69
Invites: Add '1 week' as expire option ( #6872 )
* Invites: Add '1 week' as expire option
IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security.
* Invites: Add '1 week' as expire option
IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security.
* Update en.yml
6 years ago
Akihiko Odaki
54b273bf99
Close http connection in perform method of Request class ( #6889 )
HTTP connections must be explicitly closed in many cases, and letting
perform method close connections makes its callers less redundant and
prevent them from forgetting to close connections.
6 years ago
Akihiko Odaki
4e71b104e6
Internationalize unexpected error message ( #6887 )
6 years ago
Yamagishi Kazutoshi
65c10c0bc8
Weblate translations (2018-03-23) ( #6874 )
* Translated using Weblate (Galician)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (587 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Arabic)
Currently translated at 76.4% (449 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 92.3% (542 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 92.3% (542 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Polish)
Currently translated at 98.9% (581 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (French)
Currently translated at 99.6% (585 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (586 of 587 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* bundle exec i18n-tasks normalize && yarn manage:translations
6 years ago
David Yip
995b59526b
Re-insert stack size fix in Dockerfile
6 years ago
David Yip
1772034ef2
Merge pull request #398 from ashkitten/compressed-notifs
make expanded notifications show like default
6 years ago
Jenkins
03b2f701e7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Quentí
ecdc5957a3
[i18n] Occitan update ( #6869 )
* Update oc.yml
* Update simple_form.oc.yml
* Update oc.json
* Update oc.yml
* bundle exec i18n-tasks normalize
6 years ago
Ash Levy
58eeb92755
expanded notifications show like default
6 years ago
Eugen Rochko
6cc432bbc4
Bump version to 2.3.2
6 years ago
Eugen Rochko
dafae9818d
Bump version to 2.3.2rc5
6 years ago
Eugen Rochko
9fe1619db9
Do not re-query mentions from serializers ( #6858 )
Fix performance regression from #6836
6 years ago
Eugen Rochko
da70aca28e
Restore username validation to disallow dots, for now ( #6863 )
Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.
6 years ago
ThibG
6f531d140b
Fix MENTION_RE to not match nil usernames ( #6862 )
6 years ago
Eugen Rochko
f66a786029
Hide floating action button on thread views ( #6859 )
6 years ago
David Yip
9c3e4bdead
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
6 years ago
Jenkins
6290cd7969
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Patrick Figel
d97903a358
Update sanitize and loofah ( #6855 )
Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS
vulnerabilities present in these gems when built against
libxml2 >= 2.9.2.
6 years ago
Eugen Rochko
93897134ca
Permit dots in usernames with conditions ( #6844 )
* Permit dots in usernames with conditions
- Dot cannot be the start or end of username
- a.lice and al.ice are considered the same during sign-up
* Fix regex mixin flags
6 years ago
Akihiko Odaki
a6b59cd1a3
Remove debug option from Babel preset env ( #6852 )
6 years ago
Eugen Rochko
f64af6473f
Bump version to 2.3.2rc4
6 years ago
Jenkins
e8aeec4fea
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko
ac49c7932d
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env ( #6845 )
Fix #6816 , fix #6790
6 years ago
David Yip
2649cce3a0
Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions
[Glitch] Cancel outdated pending compose suggestions
6 years ago
Akihiko Odaki
61dcb686a8
Fix i18n fallback configuration conflicts with environment configurations ( #6843 )
6 years ago
Eugen Rochko
9381a7d9d5
Use username/domain to match existing accounts in ActivityPub ( #6842 )
See also: #6837 , #6667
6 years ago
Thibaut Girka
12b0ea0667
[Glitch] Cancel outdated pending compose suggestions
Port 08f49bdb0d
to the glitch flavour
6 years ago
ThibG
a5c6c748e0
Cancel outdated pending compose suggestions ( #6838 )
6 years ago
Rey Tucker
36b5703796
request: in the event of failure, try other IPs ( #6761 ) ( #6813 )
* request: in the event of failure, try other IPs (#6761 )
In the case where a name has multiple A/AAAA records, we should
try subsequent records instead of immediately failing when we have a
failure on the first IP address.
This significantly improves delivery success when there are network
connectivity problems affecting only IPv4 or IPv6.
* fix method call style
* request_spec: adjust test case to use Addrinfo
* request: Request/open: move private addr check to within begin/rescue
* request_spec: add case to test failover, fix exception check
* Double Addrinfo.foreach so that it correctly yields instances
6 years ago
David Yip
0fa0836e63
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
6 years ago
David Yip
c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
fix compressed notifications again (#393 )
6 years ago
Jenkins
df70571bfe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
ThibG
ff6b8a6443
Serialize mentions in the order they are added ( #6836 )
Up until now, the order seemed to be in the *opposite* order,
which caused the WebUI to populate mentions in reversed order
when replying to toots local to one's instance.
6 years ago
ThibG
6b76a6212d
Display content warning in mail notification emails ( #6832 )
6 years ago
Alexander
33ee347c99
rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) ( #6833 )
6 years ago
Alexander
0306e3e9be
bugfixes and gem update ( #6831 )
* update to new version of devise_pam_authenticatable2
* fix behaviour if suffix is nil, fix environment loading, fix user email creation
* code cleanup/fix linter warning
6 years ago