2b51b4094c 
								
							 
						 
						
							
							
								
								Don't remove originals of boosted toots from timeline ( #5479 )  
							
							... 
							
							
							
							* Don't remove originals of boosted toots from timeline
* Remove unused argument to updateTimeline 
							
						 
						
							2017-11-24 14:43:53 +01:00  
				
					
						
							
							
								 
						
							
								5a551b530a 
								
							 
						 
						
							
							
								
								Do not require onClose property in NavigationBar ( #5802 )  
							
							... 
							
							
							
							NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required. 
							
						 
						
							2017-11-24 13:13:17 +01:00  
				
					
						
							
							
								 
						
							
								167fe2ab08 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-24 01:17:20 +00:00  
				
					
						
							
							
								 
						
							
								e84fecb7e9 
								
							 
						 
						
							
							
								
								Add logging of admin actions ( #5757 )  
							
							... 
							
							
							
							* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱  (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize 
							
						 
						
							2017-11-24 02:05:53 +01:00  
				
					
						
							
							
								 
						
							
								2585649b20 
								
							 
						 
						
							
							
								
								Styling fixes  
							
							
							
						 
						
							2017-11-21 19:00:07 -08:00  
				
					
						
							
							
								 
						
							
								12c0011fee 
								
							 
						 
						
							
							
								
								Update statuses on hidden toggle ( Fixes   #227 )  
							
							
							
						 
						
							2017-11-21 18:27:34 -08:00  
				
					
						
							
							
								 
						
							
								8812bab687 
								
							 
						 
						
							
							
								
								Minor fixes  
							
							
							
						 
						
							2017-11-21 18:17:38 -08:00  
				
					
						
							
							
								 
						
							
								2a5af9c10c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-21 17:17:11 +00:00  
				
					
						
							
							
								 
						
							
								3c83b7e06e 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation - front-end added ( #231 )  
							
							... 
							
							
							
							* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-11-21 17:53:13 +01:00  
				
					
						
							
							
								 
						
							
								53b7b81b43 
								
							 
						 
						
							
							
								
								Update and fix Catalan translation ( #5773 )  
							
							... 
							
							
							
							* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-11-21 23:17:28 +09:00  
				
					
						
							
							
								 
						
							
								bdbbd06dad 
								
							 
						 
						
							
							
								
								Finalized theme loading and stuff  
							
							
							
						 
						
							2017-11-20 22:13:37 -08:00  
				
					
						
							
							
								 
						
							
								d083f7741a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master'  
							
							
							
						 
						
							2017-11-19 01:30:29 -06:00  
				
					
						
							
							
								 
						
							
								bcda3f85ce 
								
							 
						 
						
							
							
								
								Merge pull request  #226  from glitch-soc/glitch-theme  
							
							... 
							
							
							
							Glitch/Vanilla themes 
							
						 
						
							2017-11-18 20:32:17 -05:00  
				
					
						
							
							
								 
						
							
								321fa41930 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme  
							
							
							
						 
						
							2017-11-18 15:18:00 -08:00  
				
					
						
							
							
								 
						
							
								a9ed857171 
								
							 
						 
						
							
							
								
								WIP static themeing  
							
							
							
						 
						
							2017-11-18 15:12:52 -08:00  
				
					
						
							
							
								 
						
							
								92cc79be72 
								
							 
						 
						
							
							
								
								Enabled vanilla thmee  
							
							
							
						 
						
							2017-11-18 11:06:04 -08:00  
				
					
						
							
							
								 
						
							
								08a01dd037 
								
							 
						 
						
							
							
								
								Public pack fix  
							
							
							
						 
						
							2017-11-18 11:05:39 -08:00  
				
					
						
							
							
								 
						
							
								672ace5a20 
								
							 
						 
						
							
							
								
								Media styling  
							
							
							
						 
						
							2017-11-18 11:05:23 -08:00  
				
					
						
							
							
								 
						
							
								f51f7b0e06 
								
							 
						 
						
							
							
								
								Font styles are now packagified  
							
							
							
						 
						
							2017-11-18 11:05:00 -08:00  
				
					
						
							
							
								 
						
							
								58cede4808 
								
							 
						 
						
							
							
								
								Profile redirect notes ( #5746 )  
							
							... 
							
							
							
							* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues 
							
						 
						
							2017-11-18 19:39:02 +01:00  
				
					
						
							
							
								 
						
							
								eed50514be 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-18 06:17:14 +00:00  
				
					
						
							
							
								 
						
							
								6be72a3ec6 
								
							 
						 
						
							
							
								
								Updating Chinese (Simplified) translations ( #5725 )  
							
							... 
							
							
							
							* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087  & #5669 
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728  
							
						 
						
							2017-11-18 14:35:11 +09:00  
				
					
						
							
							
								 
						
							
								fc2c8b50dd 
								
							 
						 
						
							
							
								
								Removed glitch tests  
							
							
							
						 
						
							2017-11-17 19:29:17 -08:00  
				
					
						
							
							
								 
						
							
								e19fc6a9f8 
								
							 
						 
						
							
							
								
								Restore vanilla components  
							
							
							
						 
						
							2017-11-17 19:29:16 -08:00  
				
					
						
							
							
								 
						
							
								45c44989c8 
								
							 
						 
						
							
							
								
								Forking glitch theme  
							
							
							
						 
						
							2017-11-17 19:29:16 -08:00  
				
					
						
							
							
								 
						
							
								5a9982b425 
								
							 
						 
						
							
							
								
								Merge pull request  #223  from glitch-soc/glitchsoc/feature/configurable-status-size  
							
							... 
							
							
							
							Make character limit configurable (from tootsuite/mastodon#5697 ) 
							
						 
						
							2017-11-17 19:02:40 -05:00  
				
					
						
							
							
								 
						
							
								dc16d73bf5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size  
							
							
							
						 
						
							2017-11-17 14:28:16 -06:00  
				
					
						
							
							
								 
						
							
								94c5a11cda 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-17 20:17:12 +00:00  
				
					
						
							
							
								 
						
							
								45f18b8f49 
								
							 
						 
						
							
							
								
								Merge pull request  #218  from glitch-soc/themed-prefetching  
							
							... 
							
							
							
							Themed preloading 
							
						 
						
							2017-11-17 14:01:23 -06:00  
				
					
						
							
							
								 
						
							
								4a2fc2d444 
								
							 
						 
						
							
							
								
								Increase contrast of Admin badges ( #5740 )  
							
							... 
							
							
							
							To comply WCAG 2.0 guidelines on contrast ratio. 
							
						 
						
							2017-11-17 19:59:53 +01:00  
				
					
						
							
							
								 
						
							
								2a386ad88d 
								
							 
						 
						
							
							
								
								Add trailing comma in mapStateToProps  
							
							... 
							
							
							
							Consistency, eslint, etc. 
							
						 
						
							2017-11-17 00:24:22 -06:00  
				
					
						
							
							
								 
						
							
								fbf76feb37 
								
							 
						 
						
							
							
								
								Merge pull request  #219  from glitch-soc/no-spin  
							
							... 
							
							
							
							Remove 'spin' theme 
							
						 
						
							2017-11-17 00:14:24 -06:00  
				
					
						
							
							
								 
						
							
								392945f9a3 
								
							 
						 
						
							
							
								
								Throw layout, isWide, navbarUnder back into mapStateToProps.  
							
							... 
							
							
							
							This gets wide view, auto layout, and navbar-under-mobile working again. 
							
						 
						
							2017-11-17 00:11:01 -06:00  
				
					
						
							
							
								 
						
							
								4dd19054d6 
								
							 
						 
						
							
							
								
								Removes spin theme  
							
							
							
						 
						
							2017-11-16 21:54:12 -08:00  
				
					
						
							
							
								 
						
							
								585758a373 
								
							 
						 
						
							
							
								
								Themed prefetching  
							
							
							
						 
						
							2017-11-16 21:37:08 -08:00  
				
					
						
							
							
								 
						
							
								b28b405b97 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-11-16 22:52:37 -06:00  
				
					
						
							
							
								 
						
							
								2151fd3150 
								
							 
						 
						
							
							
								
								Display moderator badge (green), admin badge changed to red ( #5728 )  
							
							
							
						 
						
							2017-11-17 01:22:38 +01:00  
				
					
						
							
							
								 
						
							
								35fbdc36f9 
								
							 
						 
						
							
							
								
								Merge tootsuite/master at  3023725936 
							
							
							
						 
						
							2017-11-16 01:21:16 -06:00  
				
					
						
							
							
								 
						
							
								04508868b0 
								
							 
						 
						
							
							
								
								Merge pull request  #212  from aschmitz/feat/mute-reblogs  
							
							... 
							
							
							
							Allow hiding reblogs on a per-follow basis 
							
						 
						
							2017-11-15 12:01:17 -05:00  
				
					
						
							
							
								 
						
							
								c73a1fb537 
								
							 
						 
						
							
							
								
								reusable-streaming ( #5709 )  
							
							
							
						 
						
							2017-11-15 16:04:15 +01:00  
				
					
						
							
							
								 
						
							
								031a5a8f92 
								
							 
						 
						
							
							
								
								Optional notification muting ( #5087 )  
							
							... 
							
							
							
							* Add a hide_notifications column to mutes
* Add muting_notifications? and a notifications argument to mute!
* block notifications in notify_service from hard muted accounts
* Add specs for how mute! interacts with muting_notifications?
* specs testing that hide_notifications in mutes actually hides notifications
* Add support for muting notifications in MuteService
* API support for muting notifications (and specs)
* Less gross passing of notifications flag
* Break out a separate mute modal with a hide-notifications checkbox.
* Convert profile header mute to use mute modal
* Satisfy eslint.
* specs for MuteService notifications params
* add trailing newlines to files for Pork :)
* Put the label for the hide notifications checkbox in a label element.
* Add a /api/v1/mutes/details route that just returns the array of mutes.
* Define a serializer for /api/v1/mutes/details
* Add more specs for the /api/v1/mutes/details endpoint
* Expose whether a mute hides notifications in the api/v1/relationships endpoint
* Show whether muted users' notifications are muted in account lists
* Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
* make the hide/unhide notifications buttons work
* satisfy eslint
* In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
* fix a missing import
* add an explanatory comment to AccountInteractions
* Refactor handling of default params for muting to make code cleaner
* minor code style fixes oops
* Fixed a typo that was breaking the account mute API endpoint
* Apply white-space: nowrap to account relationships icons
* Fix code style issues
* Remove superfluous blank line
* Rename /api/v1/mutes/details -> /api/v2/mutes
* Don't serialize "account" in MuteSerializer
Doing so is somewhat unnecessary since it's always the current user's account.
* Fix wrong variable name in api/v2/mutes
* Use Toggle in place of checkbox in the mute modal.
* Make the Toggle in the mute modal look better
* Code style changes in specs and removed an extra space
* Code review suggestions from akihikodaki
Also fixed a syntax error in tests for AccountInteractions.
* Make AddHideNotificationsToMute Concurrent
It's not clear how much this will benefit instances in practice, as the
number of mutes tends to be pretty small, but this should prevent any
blocking migrations nonetheless.
* Fix up migration things
* Remove /api/v2/mutes 
							
						 
						
							2017-11-15 03:56:41 +01:00  
				
					
						
							
							
								 
						
							
								c3ec1e87b8 
								
							 
						 
						
							
							
								
								Updating Chinese (Simplified) translations ( #5643 )  
							
							... 
							
							
							
							* i18n: (zh-CN) Bug fix for note-counter.
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add support.array key for better wording
* Revert "i18n: (zh-CN) Add support.array key for better wording"
This reverts commit 27bf9a946e886213e827cd985d4f62419db57534.
Looks like this commit can't get pass the checks, revert it for now.
* i18n: (zh-CN) Change `客户端` to `应用`
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translations (#5635 )
* i18n: (zh-CN) Change `两步验证` to `双重认证`
* i18n: (zh-CN) Improve translations 
							
						 
						
							2017-11-14 20:44:42 +01:00  
				
					
						
							
							
								 
						
							
								8087aa83d4 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #5699 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-11-14 20:36:11 +01:00  
				
					
						
							
							
								 
						
							
								ca5440b93d 
								
							 
						 
						
							
							
								
								Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.  
							
							
							
						 
						
							2017-11-14 17:56:38 +01:00  
				
					
						
							
							
								 
						
							
								dae8916544 
								
							 
						 
						
							
							
								
								Code style fixes.  
							
							
							
						 
						
							2017-11-14 16:54:04 +01:00  
				
					
						
							
							
								 
						
							
								d11b1a1aa7 
								
							 
						 
						
							
							
								
								Handle character limit in initial state in frontend.  
							
							
							
						 
						
							2017-11-14 16:24:10 +01:00  
				
					
						
							
							
								 
						
							
								c238444188 
								
							 
						 
						
							
							
								
								Updates and fixes to win95 theme  
							
							
							
						 
						
							2017-11-14 01:22:48 -08:00  
				
					
						
							
							
								 
						
							
								0e6c4cb796 
								
							 
						 
						
							
							
								
								l10n: PT-BR translation updated ( #5681 )  
							
							... 
							
							
							
							* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated 
							
						 
						
							2017-11-14 11:07:38 +09:00  
				
					
						
							
							
								 
						
							
								07f7192bc3 
								
							 
						 
						
							
							
								
								Fix   #5632  - Reset column loading status after fetch fail ( #5659 )  
							
							
							
						 
						
							2017-11-12 12:51:07 +09:00  
				
					
						
							
							
								 
						
							
								48c705bbad 
								
							 
						 
						
							
							
								
								Don't update follower counts on reblog toggle  
							
							
							
						 
						
							2017-11-11 21:42:22 -06:00  
				
					
						
							
							
								 
						
							
								f9e7336296 
								
							 
						 
						
							
							
								
								Fix focused background color of direct toots ( #5642 )  
							
							
							
						 
						
							2017-11-09 19:40:34 +01:00  
				
					
						
							
							
								 
						
							
								4944515020 
								
							 
						 
						
							
							
								
								"Show reblogs" per-follower UI/database changes  
							
							... 
							
							
							
							TODO:
* Tests (particularly for FollowRequests).
* Anything to respect the setting when putting reblogs in timelines. 
							
						 
						
							2017-11-09 08:41:10 -06:00  
				
					
						
							
							
								 
						
							
								49a285ce15 
								
							 
						 
						
							
							
								
								Show confirmation dialog on leaving WebUI while composing ( #5616 )  
							
							... 
							
							
							
							* Show confirmation dialog on leaving WebUI while composing
Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost.
So this prevents it by showing confirmation dialog from `onbeforeunload` event.
* Fix message and comments 
							
						 
						
							2017-11-09 14:34:41 +01:00  
				
					
						
							
							
								 
						
							
								3f16caaa50 
								
							 
						 
						
							
							
								
								Eliminate space around emoji ( #5474 )  
							
							... 
							
							
							
							* Eliminate space around emoji
* More improve emoji style
* Make more compatible with Twemoji
* Make scss-lint happy
* Make not modify normal emoji's behavior
* Decrease status__action-bar's margin-top to 5px
* Make the test be passed
* Revert "Make the test be passed"
This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece.
* Revert "Make not modify normal emoji's behavior"
This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a. 
							
						 
						
							2017-11-07 19:09:53 +01:00  
				
					
						
							
							
								 
						
							
								5d5c0f4f43 
								
							 
						 
						
							
							
								
								Twidere mention workaround ( #5552 )  
							
							... 
							
							
							
							* Work around Twidere and Tootdon bug
Tootdon and Twidere construct @user@domain handles from mentions in toots based
solely on the mention text and account URI's domain without performing any
webfinger call or retrieving account info from the Mastodon server.
As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and
Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually
resolve to the correct account (since the recommended configuration is to have
WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing
mentions, but won't do so when displaying them (as it does not go through the
whole account resolution at that time).
This change rewrites mentions to the resolved account, so that displaying the
mentions will work.
* Use lookbehind instead of non-capturing group in MENTION_RE
Indeed, substitutions with the previous regexp would erroneously eat any
preceding whitespace, which would lead to concatenated mentions in the
previous commit.
Note that users will “lose” up to one character space per mention for their
toots, as that regexp is also used to remove the domain-part of mentioned
users for character counting purposes, and it also erroneously removed the
preceding character if it was a space. 
							
						 
						
							2017-11-07 19:08:14 +01:00  
				
					
						
							
							
								 
						
							
								1032f3994f 
								
							 
						 
						
							
							
								
								Add ability to disable login and mark accounts as memorial ( #5615 )  
							
							... 
							
							
							
							Fix  #5597  
						
							2017-11-07 19:06:44 +01:00  
				
					
						
							
							
								 
						
							
								e618edf85a 
								
							 
						 
						
							
							
								
								fix: slang to adequate word ( #5453 )  
							
							
							
						 
						
							2017-11-07 14:49:50 +01:00  
				
					
						
							
							
								 
						
							
								782224c991 
								
							 
						 
						
							
							
								
								Avoid emojifying on invisible text ( #5558 )  
							
							
							
						 
						
							2017-11-07 14:48:13 +01:00  
				
					
						
							
							
								 
						
							
								864c4d869f 
								
							 
						 
						
							
							
								
								Make fullscreen video in detailed status plays in fullscreen (Partly  Fix   #5160 ) ( #5611 )  
							
							... 
							
							
							
							* Make fullscreen video in detailed status plays in fullscreen (Fix  #5160 )
* Directly assign the initial state 
							
						 
						
							2017-11-07 14:24:55 +01:00  
				
					
						
							
							
								 
						
							
								bc8532359b 
								
							 
						 
						
							
							
								
								Mastodon GO! -> v0.1.1  
							
							
							
						 
						
							2017-11-06 20:00:03 -08:00  
				
					
						
							
							
								 
						
							
								e0298d66f8 
								
							 
						 
						
							
							
								
								Autocollapse boosts option  
							
							
							
						 
						
							2017-11-05 15:05:12 -08:00  
				
					
						
							
							
								 
						
							
								8abe9e9058 
								
							 
						 
						
							
							
								
								don't display any descendants of .invisible ( #5567 )  
							
							... 
							
							
							
							* don't display any descendants of .invisible
* reduce the scope of selector
* remove some rules for image
* lint 
							
						 
						
							2017-11-05 13:05:50 +01:00  
				
					
						
							
							
								 
						
							
								73bf0ea7d1 
								
							 
						 
						
							
							
								
								Merge pull request  #204  from glitch-soc/with-mastodon-go  
							
							... 
							
							
							
							Introducing: Mastodon GO! 
							
						 
						
							2017-11-04 09:14:08 -04:00  
				
					
						
							
							
								 
						
							
								276432790a 
								
							 
						 
						
							
							
								
								Introducing: Mastodon GO!  
							
							
							
						 
						
							2017-11-04 05:48:42 -07:00  
				
					
						
							
							
								 
						
							
								da3adc0a73 
								
							 
						 
						
							
							
								
								l10n Occitan ( #5586 )  
							
							... 
							
							
							
							* Update OC: time format
Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan 
Harmonisation words in menu and confirmation windows
* Update for unlisted custum emoji + #5577 
* correction subjonctiu
It's either siasque or siague
* Corrections
Any : qual que, in two words, else it means "some".
And "siasque" with S even if I don't pronounce it at all.
* Update oc.json 
							
						 
						
							2017-11-03 17:42:30 +09:00  
				
					
						
							
							
								 
						
							
								5521e94e24 
								
							 
						 
						
							
							
								
								refactor(features/ui): Avoid useless renders in WrappedSwitch ( #5580 )  
							
							
							
						 
						
							2017-11-01 12:17:53 +01:00  
				
					
						
							
							
								 
						
							
								763a2f8511 
								
							 
						 
						
							
							
								
								Replace react-router-scroll to react-router-scroll-4 ( #5568 )  
							
							
							
						 
						
							2017-11-01 06:58:38 +09:00  
				
					
						
							
							
								 
						
							
								60f962eedc 
								
							 
						 
						
							
							
								
								Refactor initial state: auto_play_gif ( #5576 )  
							
							
							
						 
						
							2017-11-01 06:58:07 +09:00  
				
					
						
							
							
								 
						
							
								b254e6ca5f 
								
							 
						 
						
							
							
								
								Refactor initial state: "me" ( #5563 )  
							
							... 
							
							
							
							* Refactor initial state: "me"
* remove "me" from reducers/meta.js 
							
						 
						
							2017-10-31 11:27:48 +09:00  
				
					
						
							
							
								 
						
							
								29609fbb6a 
								
							 
						 
						
							
							
								
								Updating Chinese (Simplified) translations ( #5508 )  
							
							... 
							
							
							
							* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines 
* i18n: (zh-CN) fix punctuation
* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 
* i18n: (zh-CN) Update missing translations
* i18n: (zh-CN) Fixing errors
* i18n: (zh-CN) Fix indent error
* i18n: (zh-CN) Fix language tag
* i18n: (zh-CN) Remove quotes
* i18n: (zh-CN) Update translation (#5485 )
* i18n: (zh-CN) Remove whitespaces, x -> ×
* i18n: (zh-CN) Rewording on time distance
* i18n: (zh-CN) Overall improvements
* i18n: (zh-CN) i18n-tasks normalization
* i18n: (zh-CN) Add missing translation 
							
						 
						
							2017-10-30 12:34:58 +09:00  
				
					
						
							
							
								 
						
							
								2cea4592a3 
								
							 
						 
						
							
							
								
								Avoid modifying emoji data inline ( #5548 )  
							
							
							
						 
						
							2017-10-30 00:23:38 +09:00  
				
					
						
							
							
								 
						
							
								512feab222 
								
							 
						 
						
							
							
								
								Add margin to account for Edge disappearing scrollbar ( #5522 )  
							
							... 
							
							
							
							* Add margin to account for Edge disappearing scrollbar
* Fix 16px margin for DMs and horizontal line 
							
						 
						
							2017-10-30 00:11:32 +09:00  
				
					
						
							
							
								 
						
							
								5e111ce16d 
								
							 
						 
						
							
							
								
								Reactor unfollow_modal, boost_modal, delete_modal ( #5505 )  
							
							
							
						 
						
							2017-10-30 00:10:15 +09:00  
				
					
						
							
							
								 
						
							
								3e9236b343 
								
							 
						 
						
							
							
								
								Separate Follow/Unfollow and back buttons ( #5496 )  
							
							
							
						 
						
							2017-10-27 19:14:11 +02:00  
				
					
						
							
							
								 
						
							
								e843f62f47 
								
							 
						 
						
							
							
								
								Avoid unnecessary Motion components in icon_button.js ( #5544 )  
							
							
							
						 
						
							2017-10-27 19:08:07 +02:00  
				
					
						
							
							
								 
						
							
								ec487166db 
								
							 
						 
						
							
							
								
								Directly use <Motion/> if not reducing motion ( #5546 )  
							
							
							
						 
						
							2017-10-27 19:06:54 +02:00  
				
					
						
							
							
								 
						
							
								3de22a82bf 
								
							 
						 
						
							
							
								
								Refactor initial state: reduce_motion and auto_play_gif ( #5501 )  
							
							
							
						 
						
							2017-10-28 00:04:44 +09:00  
				
					
						
							
							
								 
						
							
								870d71b78b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into gs-master  
							
							
							
						 
						
							2017-10-27 09:45:25 -05:00  
				
					
						
							
							
								 
						
							
								781105293c 
								
							 
						 
						
							
							
								
								Feature: Unlisted custom emojis ( #5485 )  
							
							
							
						 
						
							2017-10-27 16:11:30 +02:00  
				
					
						
							
							
								 
						
							
								2827f852c0 
								
							 
						 
						
							
							
								
								Theme: Windows 95  
							
							
							
						 
						
							2017-10-26 23:22:48 -07:00  
				
					
						
							
							
								 
						
							
								dd28b94cf0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-26 09:18:27 -05:00  
				
					
						
							
							
								 
						
							
								d556be2968 
								
							 
						 
						
							
							
								
								Fix column design broken with very long title ( #5493 )  
							
							... 
							
							
							
							* Fix  #5314 
* fix not beautiful code
* fix broken design with mobile view
* remove no longer needed code 
							
						 
						
							2017-10-26 22:52:48 +09:00  
				
					
						
							
							
								 
						
							
								02f7f3619a 
								
							 
						 
						
							
							
								
								Remove translateZ(0) on modal overlay ( #5478 )  
							
							
							
						 
						
							2017-10-26 22:46:50 +09:00  
				
					
						
							
							
								 
						
							
								42f2045c21 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline  
							
							
							
						 
						
							2017-10-25 16:01:20 -05:00  
				
					
						
							
							
								 
						
							
								5f0268ab84 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-10-25 16:17:14 +00:00  
				
					
						
							
							
								 
						
							
								20fee786b1 
								
							 
						 
						
							
							
								
								Update Russian translation ( #5517 )  
							
							... 
							
							
							
							* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
* Update Russian translation (sessions)
* Update Russian translation
* Update Russian translation
* Fix merge conflicts (revert)
* Update Russian translation
* Update Russian translation (fix)
* Update Russian translation (fix quotes)
* Update Russian translation (fix quotes)
* Update Russian translation (fix)
* Update Russian translation
* Add quotes
* bundle exec i18n-tasks normalize 
							
						 
						
							2017-10-26 00:21:58 +09:00  
				
					
						
							
							
								 
						
							
								1ba3725473 
								
							 
						 
						
							
							
								
								Complete Esperanto translation ( #5520 )  
							
							
							
						 
						
							2017-10-25 22:38:37 +09:00  
				
					
						
							
							
								 
						
							
								516eeeb43d 
								
							 
						 
						
							
							
								
								option to add title to <Button>, use for toot buttons ( #197 )  
							
							
							
						 
						
							2017-10-24 19:08:07 +02:00  
				
					
						
							
							
								 
						
							
								4f01e6e8d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-22 22:57:41 -05:00  
				
					
						
							
							
								 
						
							
								a76b024228 
								
							 
						 
						
							
							
								
								Changes to match other timelines in 2.0  
							
							
							
						 
						
							2017-10-22 18:45:35 -07:00  
				
					
						
							
							
								 
						
							
								3db80f75a6 
								
							 
						 
						
							
							
								
								Added a timeline for Direct statuses  
							
							... 
							
							
							
							* Lists all Direct statuses you've sent and received
* Displayed in Getting Started
* Streaming server support for direct TL 
							
						 
						
							2017-10-22 18:35:14 -07:00  
				
					
						
							
							
								 
						
							
								fdb0848e08 
								
							 
						 
						
							
							
								
								i18n: Update Polish Translation ( #5494 )  
							
							
							
						 
						
							2017-10-22 08:34:39 +09:00  
				
					
						
							
							
								 
						
							
								d589dd7cd0 
								
							 
						 
						
							
							
								
								Compose buttons bar redesign + generalize dropdown ( #194 )  
							
							... 
							
							
							
							* Generalize compose dropdown for re-use
* wip stuffs
* new tootbox look and removed old doodle button files
* use the house icon for ... 
							
						 
						
							2017-10-21 20:24:53 +02:00  
				
					
						
							
							
								 
						
							
								21bafc6555 
								
							 
						 
						
							
							
								
								Updates to bio metadata script  
							
							
							
						 
						
							2017-10-19 16:11:53 -07:00  
				
					
						
							
							
								 
						
							
								8392ddbf87 
								
							 
						 
						
							
							
								
								Remove unnecessary translateZ(0) when doing scale() ( #5473 )  
							
							
							
						 
						
							2017-10-19 18:27:55 +02:00  
				
					
						
							
							
								 
						
							
								9423553e5c 
								
							 
						 
						
							
							
								
								Make the compose area optionally scrollable.  
							
							... 
							
							
							
							On desktop, the compose text box grows to accommodate the content.  On
mobile, the text box does not grow to accommodate text context, but does
grow to accommodate images.  It is possible in both cases to overflow
the available area, which makes accessing other UI elements (e.g.
visibility setttings) difficult.
This commit makes the compose area optionally scrollable, which allows
those UI elements to remain available even if they go off-screen. 
							
						 
						
							2017-10-19 10:59:50 -05:00  
				
					
						
							
							
								 
						
							
								90770f6d59 
								
							 
						 
						
							
							
								
								Merge pull request  #185  from glitch-soc/fix-null-status  
							
							... 
							
							
							
							workaround for null status 
							
						 
						
							2017-10-18 17:01:31 -05:00  
				
					
						
							
							
								 
						
							
								eb907a5bab 
								
							 
						 
						
							
							
								
								formatting fix for eslint  
							
							
							
						 
						
							2017-10-18 23:44:06 +02:00  
				
					
						
							
							
								 
						
							
								39c9cdf7fe 
								
							 
						 
						
							
							
								
								Remove unused filesAttached property.  
							
							
							
						 
						
							2017-10-18 13:20:45 -05:00  
				
					
						
							
							
								 
						
							
								86cf4468af 
								
							 
						 
						
							
							
								
								Update stylesheet imports in glitch components.  
							
							... 
							
							
							
							Commit 6e54719474 
							
						 
						
							2017-10-18 11:52:34 -05:00  
				
					
						
							
							
								 
						
							
								42e8c8eb0e 
								
							 
						 
						
							
							
								
								Merge tag 'v2.0.0' into gs-master  
							
							
							
						 
						
							2017-10-18 11:52:04 -05:00  
				
					
						
							
							
								 
						
							
								09d81defcd 
								
							 
						 
						
							
							
								
								Suppress type error(not a function) on calling fastSeek ( #5452 )  
							
							
							
						 
						
							2017-10-18 17:13:51 +02:00  
				
					
						
							
							
								 
						
							
								26b2a6a71e 
								
							 
						 
						
							
							
								
								Fix pt-BR translation strings related to advanced search. ( #5449 )  
							
							
							
						 
						
							2017-10-18 13:53:17 +02:00  
				
					
						
							
							
								 
						
							
								edf9a5e4fc 
								
							 
						 
						
							
							
								
								Revert  #5438  for FR ( #5450 )  
							
							... 
							
							
							
							As said here https://github.com/tootsuite/mastodon/pull/5438  the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades. 
							
						 
						
							2017-10-18 13:51:30 +02:00  
				
					
						
							
							
								 
						
							
								c710069c12 
								
							 
						 
						
							
							
								
								Some typos and supplementation in sentence structures ( #5441 )  
							
							... 
							
							
							
							* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
* Swedish - Typos and supplementation in sentence structure
* Update simple_form.sv.yml
* Update sv.yml
* Update sv.yml
Rearranged the alphabetical order. 
							
						 
						
							2017-10-18 13:50:52 +02:00  
				
					
						
							
							
								 
						
							
								e7099d8d9e 
								
							 
						 
						
							
							
								
								fr.json typo (realtive time) ( #5447 )  
							
							... 
							
							
							
							Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie  
							
						 
						
							2017-10-18 16:47:14 +09:00  
				
					
						
							
							
								 
						
							
								6e54719474 
								
							 
						 
						
							
							
								
								Make theme directory and Rename application.scss ( #5336 )  
							
							... 
							
							
							
							* Rename application.scss
* Move to 'default' directory
* Follow review
Move directory, and Rename "mastodon".
* Revert rename
* undo removal of newline 
							
						 
						
							2017-10-18 05:20:07 +09:00  
				
					
						
							
							
								 
						
							
								f3003417c5 
								
							 
						 
						
							
							
								
								When unreblog arrives over streaming API, just delete in UI ( #5439 )  
							
							
							
						 
						
							2017-10-17 22:17:02 +02:00  
				
					
						
							
							
								 
						
							
								33ea042dec 
								
							 
						 
						
							
							
								
								i18n better wording (OC/CA/FR) + string added in FR ( #5438 )  
							
							... 
							
							
							
							* Update oc.json
* Update fr.json
* Update ca.json
* Update fr.json
* Update simple_form.fr.yml
* Update ca.json
* Update fr.json
* Update oc.json
* Update oc.json
* Update fr.json 
							
						 
						
							2017-10-17 21:49:39 +02:00  
				
					
						
							
							
								 
						
							
								8b22a63ab0 
								
							 
						 
						
							
							
								
								Fix scrolling of dropdown when offscreen ( #5434 )  
							
							
							
						 
						
							2017-10-17 20:38:16 +02:00  
				
					
						
							
							
								 
						
							
								05686cc99d 
								
							 
						 
						
							
							
								
								Fix unwanted content warning gap in CSS ( #5436 )  
							
							... 
							
							
							
							Fix  #5356  
						
							2017-10-17 20:07:44 +02:00  
				
					
						
							
							
								 
						
							
								a02de9e012 
								
							 
						 
						
							
							
								
								i18n update ( #5427 ) in OC/CA/FR/ES ( #5431 )  
							
							... 
							
							
							
							* Update oc.json
* Update ca.json
* Update fr.json
* Update es.json 
							
						 
						
							2017-10-17 13:03:28 +02:00  
				
					
						
							
							
								 
						
							
								2d395324e1 
								
							 
						 
						
							
							
								
								Fix React warning about tabIndex on status with CW ( #5432 )  
							
							
							
						 
						
							2017-10-17 13:03:12 +02:00  
				
					
						
							
							
								 
						
							
								e6c9756fa9 
								
							 
						 
						
							
							
								
								Update German translation ( #5425 )  
							
							
							
						 
						
							2017-10-17 12:02:47 +02:00  
				
					
						
							
							
								 
						
							
								5050719fac 
								
							 
						 
						
							
							
								
								Add Japanese translations ( #5427 )  
							
							... 
							
							
							
							* yarn manage:translations
* Add Japanese translation for #5410 
* Add Japanese translation for #5393  
							
						 
						
							2017-10-17 11:47:05 +02:00  
				
					
						
							
							
								 
						
							
								a2b600428c 
								
							 
						 
						
							
							
								
								Swedish translation ( #5406 )  
							
							... 
							
							
							
							* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete 
							
						 
						
							2017-10-17 13:41:36 +09:00  
				
					
						
							
							
								 
						
							
								df1a9c5ab5 
								
							 
						 
						
							
							
								
								Small update Dutch (nl) strings ( #5424 )  
							
							... 
							
							
							
							* Update Dutch strings
* Update Dutch 
							
						 
						
							2017-10-17 01:00:23 +02:00  
				
					
						
							
							
								 
						
							
								4421f6598f 
								
							 
						 
						
							
							
								
								Fix dual toot button wrong behavior after compose re-design  
							
							
							
						 
						
							2017-10-16 23:32:13 +02:00  
				
					
						
							
							
								 
						
							
								64a5e9a1de 
								
							 
						 
						
							
							
								
								workaround for null status  
							
							
							
						 
						
							2017-10-16 23:09:39 +02:00  
				
					
						
							
							
								 
						
							
								7364b26e4b 
								
							 
						 
						
							
							
								
								Merge pull request  #184  from tootsuite/master  
							
							... 
							
							
							
							Fix reduced motion breaking public galleries (#5423 ) 
							
						 
						
							2017-10-16 17:05:42 -04:00  
				
					
						
							
							
								 
						
							
								313ba202ef 
								
							 
						 
						
							
							
								
								Merge pull request  #182  from glitch-soc/wide-tootbox-panel  
							
							... 
							
							
							
							Full-width tootbox panel to make room for buttons 
							
						 
						
							2017-10-16 15:49:22 -05:00  
				
					
						
							
							
								 
						
							
								37ff061d9b 
								
							 
						 
						
							
							
								
								satisfy eslint and jest  
							
							
							
						 
						
							2017-10-16 22:24:44 +02:00  
				
					
						
							
							
								 
						
							
								3d7de06db4 
								
							 
						 
						
							
							
								
								rem a comment  
							
							
							
						 
						
							2017-10-16 22:12:38 +02:00  
				
					
						
							
							
								 
						
							
								26f08f0791 
								
							 
						 
						
							
							
								
								double-decker tootbox  
							
							
							
						 
						
							2017-10-16 22:10:14 +02:00  
				
					
						
							
							
								 
						
							
								4b397adb5b 
								
							 
						 
						
							
							
								
								fix some lint errors  
							
							
							
						 
						
							2017-10-16 21:13:34 +02:00  
				
					
						
							
							
								 
						
							
								8980aa804f 
								
							 
						 
						
							
							
								
								Fix reduced motion breaking public galleries ( #5423 )  
							
							
							
						 
						
							2017-10-16 21:08:01 +02:00  
				
					
						
							
							
								 
						
							
								dbb1fce94d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into gs-master  
							
							
							
						 
						
							2017-10-16 09:23:59 -05:00  
				
					
						
							
							
								 
						
							
								aec70b44fc 
								
							 
						 
						
							
							
								
								Filter out duplicate IDs in timelines reducer ( #5417 )  
							
							... 
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 15:59:30 +02:00  
				
					
						
							
							
								 
						
							
								03975dbde4 
								
							 
						 
						
							
							
								
								Add up-to-date korean translation on client  ( #5402 )  
							
							... 
							
							
							
							* chore: add Korean translation for client
* fix: change unlisted and embed Korean words 
							
						 
						
							2017-10-16 14:39:28 +02:00  
				
					
						
							
							
								 
						
							
								f72936b4e6 
								
							 
						 
						
							
							
								
								Fix   #5082  - disable retweet link for followers only toot ( #5397 )  
							
							... 
							
							
							
							* Fix  #5082  - disable retweet link for followers only toot
* Hide reblog count when it is a direct message 
							
						 
						
							2017-10-16 14:10:12 +02:00  
				
					
						
							
							
								 
						
							
								3c530d95f6 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #5416 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-10-16 14:09:51 +02:00  
				
					
						
							
							
								 
						
							
								1e7b3bf625 
								
							 
						 
						
							
							
								
								i18n ultim hour «More» dropdown title + reduce motion ( #5415 )  
							
							... 
							
							
							
							* Correction fem. form
* More dropdown title
* More dropdown title
* More dropdown title
* Add option to reduce motion (#5393 ) 
							
						 
						
							2017-10-16 14:09:26 +02:00  
				
					
						
							
							
								 
						
							
								bf0ee1a25c 
								
							 
						 
						
							
							
								
								Enable ESLint rules import/* ( #5414 )  
							
							... 
							
							
							
							* Enable ESLint rules import/*
* fix 
							
						 
						
							2017-10-16 11:12:09 +02:00  
				
					
						
							
							
								 
						
							
								fa0be3f834 
								
							 
						 
						
							
							
								
								Add option to reduce motion ( #5393 )  
							
							... 
							
							
							
							* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml 
							
						 
						
							2017-10-16 09:36:15 +02:00  
				
					
						
							
							
								 
						
							
								981e20b03a 
								
							 
						 
						
							
							
								
								Fix offline-plugin warning in dev mode ( #5411 )  
							
							
							
						 
						
							2017-10-16 09:33:50 +02:00  
				
					
						
							
							
								 
						
							
								d5b767c374 
								
							 
						 
						
							
							
								
								Replace JavaScript Testing Framework from Mocha to Jest ( #5412 )  
							
							
							
						 
						
							2017-10-16 09:33:08 +02:00  
				
					
						
							
							
								 
						
							
								93b54b8d4b 
								
							 
						 
						
							
							
								
								i18n "More" dropdown title ( #5410 )  
							
							
							
						 
						
							2017-10-16 09:31:47 +02:00  
				
					
						
							
							
								 
						
							
								e7ab9bf8b4 
								
							 
						 
						
							
							
								
								Refactor and simplify icon_button.js ( #5413 )  
							
							
							
						 
						
							2017-10-16 09:30:09 +02:00  
				
					
						
							
							
								 
						
							
								6cd5b3bbe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-10-16 01:29:02 -05:00  
				
					
						
							
							
								 
						
							
								f72ad67a39 
								
							 
						 
						
							
							
								
								Merge pull request  #180  from STJrInuyasha/glitch-soc/avatar-unification  
							
							... 
							
							
							
							Avatar unification, mk.II 
							
						 
						
							2017-10-16 00:49:05 -05:00  
				
					
						
							
							
								 
						
							
								56094cb4bd 
								
							 
						 
						
							
							
								
								1.6 changed files for unified avatar styling -- updated to restore unity  
							
							
							
						 
						
							2017-10-15 21:14:21 -07:00  
				
					
						
							
							
								 
						
							
								22df18e902 
								
							 
						 
						
							
							
								
								Merge pull request  #173  from glitch-soc/zerowidthmoji  
							
							... 
							
							
							
							use zerowidth spaces with emojis 
							
						 
						
							2017-10-15 20:04:19 -05:00  
				
					
						
							
							
								 
						
							
								894da3dcca 
								
							 
						 
						
							
							
								
								Clear timer when unmounting RelativeTimestamp components ( #5408 )  
							
							... 
							
							
							
							Possibly the cause of #5379 , #5377  
							
						 
						
							2017-10-16 03:03:36 +02:00  
				
					
						
							
							
								 
						
							
								8eb7d30a6c 
								
							 
						 
						
							
							
								
								l10n Occitan: finishing touches ( #5404 )  
							
							... 
							
							
							
							* Update oc.json
* Update oc.yml 
							
						 
						
							2017-10-15 23:07:32 +02:00  
				
					
						
							
							
								 
						
							
								7fe1428cc4 
								
							 
						 
						
							
							
								
								Update French translation ( #5401 )  
							
							
							
						 
						
							2017-10-15 21:21:05 +09:00  
				
					
						
							
							
								 
						
							
								b3b4b5a2eb 
								
							 
						 
						
							
							
								
								Adjust public hashtag pages ( #5357 )  
							
							
							
						 
						
							2017-10-14 14:48:12 +02:00  
				
					
						
							
							
								 
						
							
								ae716a12e1 
								
							 
						 
						
							
							
								
								replace newlines in desktop notif with spaces instead of removing them ( #5361 )  
							
							
							
						 
						
							2017-10-14 14:41:12 +02:00  
				
					
						
							
							
								 
						
							
								f63a40e7c2 
								
							 
						 
						
							
							
								
								Updated Catalan strings ( #5323 )  
							
							... 
							
							
							
							* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
* Syncing to master
* Added new Catalan strings
* removed config.secret_key line
* Corrected <sotrong> tag to <strong>
Line 515
* Removed extra line
* Reverted
* yarn.lock reverted
* Updated Catalan strings
* Updated Catalan strings 
							
						 
						
							2017-10-14 14:40:35 +02:00  
				
					
						
							
							
								 
						
							
								c6f76db2e1 
								
							 
						 
						
							
							
								
								Update French translation ( #5384 )  
							
							... 
							
							
							
							Update French translation 
							
						 
						
							2017-10-14 14:30:19 +02:00  
				
					
						
							
							
								 
						
							
								2c704ca9c6 
								
							 
						 
						
							
							
								
								l10n: update Persian translation for 2.0 ( #5391 )  
							
							
							
						 
						
							2017-10-14 14:28:19 +02:00