Commit Graph

5453 Commits (0e418264fb3ef06c64958074a50e7f786d8aa5e2)

Author SHA1 Message Date
Eugen Rochko afa3852159 Update moved-to property when it's removed too (#6160)
* Fix #6140 - Update moved-to property when it's removed too

* Remove trailing whitespace
2018-01-03 00:38:20 +01:00
Eugen Rochko 48bc0b8375 Don't leave behind husk of remotely-deleted profile (#6159)
There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.
2018-01-03 00:38:02 +01:00
Noiob 653d9b1721 Fix newlines-to-spaces functionality (#6158)
yay for regexes, amirite
2018-01-02 19:35:24 +01:00
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
* Add confirmation step for email changes

This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.

Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.

Fixes #3871

* Add review fixes
2018-01-02 16:55:00 +01:00
ThibG b42cdedfc3 Display a warning when composing unlisted toots with something looking like a hashtag (#6132) 2018-01-02 14:24:52 +01:00
Eugen Rochko cb45282e47 Fix stats expiring too quickly because of variable mistake (#6155) 2018-01-02 14:02:53 +01:00
Akihiko Odaki 5d02615063 Rename key to path in actions and reducers for settings (#6105) 2018-01-02 13:50:54 +01:00
Otakan 1cd5812c6b delete X-UA-Compatible (#6068)
* delete X-UA-Compatible

* undo

* restore
2018-01-02 13:38:12 +01:00
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02 20:39:12 +09:00
David Yip fa4960ea74 More ../ -> ~. 2018-01-02 00:26:44 -06:00
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
Akihiko Odaki 7549f264e6 Use const instead of let for constant (#6106) 2018-01-02 13:28:49 +09:00
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129) 2018-01-02 05:07:56 +01:00
cwm d5770ef7ac bug fix (tootsuite pr #6120) 2017-12-31 08:26:50 -06:00
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-31 09:17:15 +00:00
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
* Adding Serbian translation

* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
David Yip 08ecfe990d Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ fc8c2c9b4a
2017-12-30 18:24:38 -06:00
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
David Yip f19b436c83 Switch to tootsuite's elephant friend for the drawer
This version has a transparent background, which works better with the
wave.
2017-12-30 17:17:37 -06:00
David Yip 5ec1a9b484 Use ~ notation in components for image references
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
2017-12-30 17:15:20 -06:00
cwm a4ae9c4109 remove unused 'saveSettings' from column_settings_container 2017-12-30 16:42:26 -06:00
cwm 093c27fe46 web push updates (tootsuite PRs #5879, #5941, #6047) 2017-12-30 11:45:01 -06:00
Jeong Arm fc8c2c9b4a Translate Korean (#6131)
Relates to #6125, #6099
2017-12-30 02:44:19 +01:00
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
* Add GET /api/v1/instance/peers API to reveal known domains

* Add GET /api/v1/instance/activity API

* Make new APIs disableable, exclude private statuses from activity stats

* Fix code style issue

* Fix week timestamps
2017-12-29 19:52:04 +01:00
David Yip 95180cb27c Merge pull request #288 from chriswmartin/fix-gif-avatars
Fix GIF avatars not autoplaying when gif autoplay is enabled
2017-12-28 13:23:41 -06:00
MitarashiDango a52820a7fd bug fix (WebPush does not work) (#6120) 2017-12-28 16:20:34 +01:00
cwm 485dbbb9b7 Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000) 2017-12-28 08:30:51 -06:00
ThibG 3df85a843c Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)
* Make host_meta/webfinger replies cacheable (fixes #6100)

Drop common code for handling users and sessions as webfinger queries
are very basic, public APIs.

Also explicitly mark results as cacheable with “expires_in”.

* Add “Vary: Accept” header for caching since content-negociation is used
2017-12-27 18:21:12 +01:00
David Yip f722fcb5a6 Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
Akihiko Odaki 093af89c43 Move the mastodon on Getting Started column to drawer column (#6109)
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.

This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
2017-12-27 03:31:30 +01:00
Akihiko Odaki d8a0c19166 Fix XML oEmbed support discovery (#6104) 2017-12-27 03:29:49 +01:00
beatrix dde1db7efb Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
Merge various small vanilla updates into glitch
2017-12-26 17:03:29 -05:00
beatrix f54cd50e4c Merge pull request #285 from chriswmartin/detailed-status-actions
Add mute, block, conversation mute actions to detailed status dropdown
2017-12-26 17:03:00 -05:00
cwm 4d2ca09ae8 Set direction style to reply indicator (tootsuite pr #6006) 2017-12-26 14:20:41 -06:00
cwm c670d2cadd Reduce motion for boost animation (tootsuite pr #5871) 2017-12-26 14:04:52 -06:00
cwm ccc14ad59b Fix layout for RTL (tootsuite pr #6014, #6018) 2017-12-26 13:49:53 -06:00
cwm 44d1b30dfb Fix focused background color of favourited direct toot (tootsuite pr #6021) 2017-12-26 13:30:23 -06:00
cwm f9863df926 Move dropdown transform origin (tootsuite pr #6091) 2017-12-26 13:28:19 -06:00
cwm 4a0dd0efea onMuteNotifications validation (tootsuite pr #6092) 2017-12-26 13:25:43 -06:00
cwm ab81f8414d Rename settingKey to settingPath (tootsuite pr #6046 & #6098) 2017-12-26 13:21:20 -06:00
Jenkins 0a2cc2361c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-26 18:17:16 +00:00
beatrix e2ccf65789 add ruby-progressbar to gemfile (fixes #6110) (#6111) 2017-12-26 18:43:52 +01:00
takayamaki 2a2ac6c744 more faster index on notifications table (#6108) 2017-12-26 17:56:31 +01:00
cwm 15796d0b5f use 'flavours/glitch/' prefix in new imports 2017-12-26 10:41:44 -06:00
cwm 61aa7a385b Add mute, block, conversation mute actions to detailed status dropdown menu 2017-12-26 10:13:38 -06:00
Jenkins 2bd6532e63 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-25 20:17:10 +00:00
Chris 1f0ae8d173 Add mute, block, conversation mute actions to detailed status dropdown menu (#6099)
* removed references to hideOnMobile in column_link and getting_started

* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226)

* remove unused withDismiss in detailed status
2017-12-25 20:56:05 +01:00
MitarashiDango b4047027d4 Additional prop name change. (#6098) 2017-12-26 00:14:06 +09:00
Yamagishi Kazutoshi 4d91c45ce1 Add supported Node.js version to package.json (#6096) 2017-12-25 15:02:07 +01:00