mastodon

Commit Graph

Author	SHA1	Message	Date
Effy Elden	cc83ee60fb	Export environment variables from .env.vagrant before running rails commands in Vagrant provisioning (#2343 )	8 years ago
ThibG	89dc29affb	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351 ) This provides a hotfix for outbound salmon requests to other Mastodon instances as they currently will try to resovle user@WEB_DOMAIN instead of user@LOCAL_DOMAIN (see #2012 and #20312). Furthermore, this should ease transition from users switching from LOCAL_DOMAIN = WEB_DOMAIN to another LOCAL_DOMAIN when WEB_DOMAIN does not change.	8 years ago
Ashley	85e09518b9	Halved padding for emoji (#2344 )	8 years ago
Stephen Burgess	663f090c45	fix(style): Fix regressions introduced by #2338 (#2345 ) Put Column Slim Back Button classnames in order so it is positioned right and top. Add icon button style back to privacy dropdown and upload buttons so they are positioned correctly and do not wiggle. Remove abstracted style from CSS. Add missed class for the upload form thumbnail. Add the missed styles for upload form thumnail. Alphabetize styles for column-back-button. Fix fontSize typo for media-spoiler-video-play-icon.	8 years ago
Joël Quenneville	1cf9e14a41	Test embedded_view related code in a helper (#2282 ) The two methods `StreamEntriesHelper#stream_link_target` and `StreamEntriesHelper#acct` are based on checking whether we are running in an embedded view. This adds some test helper code to make the testing easier. We extracted some "magic strings" to constants to lower the coupling in the specs.	8 years ago
Joël Quenneville	0c2fe22bc1	Add test coverage to CSS class generation (#2285 ) The code that generates CSS is based on a lot of boolean conditions. The possible combinations of these grows exponentially as we add more conditions. Since most of the code is conditional on a single boolean, we tested the following: 1. All `false` 2. All `true` 3. Each individual flag set to `true` The methods tested are: * `StreamEntriesHelper#style_classes` * `StreamEntriesHelper#microformats_classes` * `StreamEntriesHelper#microformats_h_class`	8 years ago
Koala Yeung	6f0b3b069f	Adding arabic string localization (rebased) (#1895 ) * Create ar.jsx * Preparing file for translation. * Create ar.yml * Preparing file for translation. * Create simple_form.ar.yml * Preparing file for translation. * Create devise.ar.yml * Preparing file for translation. * Create doorkeeper.ar.yml * Preparing file for translation. * Update index.jsx Preparing file for translation. * Update mastodon.jsx * Preparing file to translation. * Correction thanks to @Taekiro https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922 * Update settings_helper.rb Preparing file to translation. * Update application.rb * Preparing file to translation. * Update simple_form.ar.yml * Update doorkeeper.ar.yml * Update devise.ar.yml * Update ar.yml * Fix i18n-tasks unused issue (ar) Remove unused translation strings * Update application.rb * Update ar.jsx * Fix various issues with Arabic translation * Fix duplication caused in merge * Fix syntax error in devise.ar.yml * Fix import error Duplicated incorrect import in mastodon.jsx * Fix duplication error in locales/index.jsx * Update ar.yml * Update ar.jsx * Update ar.yml * Update ar.jsx * Fix ar translation	8 years ago
Ashley	9cd20a7062	Tooltip for boosting depends on toot visibility (#1394 ) (#1754 ) * Made tooltip for boosting depend on visibility * Removed spaces that were added in merge conflict resolution * Try again :P * Added missing bracket * Changed 'toot' to 'status'	8 years ago
Yamagishi Kazutoshi	219fb317ee	Remove unnecessary variable in ColumnLink component (#2341 ) Fix bug in `cca41ea544` .	8 years ago
Evan Minto	66fd8e7821	ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197 ) * Clean up collapsible components * Expose user Outboxes and AS2 representations of statuses * Save work thus far. * Fix bad merge. * Save my work * Clean up pagination. * First test working. * Add tests. * Add Forbidden error template. * Revert yarn.lock changes. * Fix code style deviations and use localized instead of hardcoded English text.	8 years ago
Yamagishi Kazutoshi	83e3538181	Update CA certificates in Dockerfile (#2339 )	8 years ago
Ash Furrow	723f25a999	Admin UI for confirming users (#2245 ) * Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.	8 years ago
Eugen	59b1de0bcf	Add a confirmation modal: (#2279 ) - Deleting a toot - Muting, blocking someone - Clearing notifications Remove source map generation from development environment, as it is a huge performance sink hole with little gains	8 years ago
Akihiko Odaki	df46864b39	Alter Japanese translations for CW and NSFW (#2305 ) The previous translation for NSFW, "不適切" means "impertinent". This change suggests "閲覧注意", which means the content requires precaution, instead. However, "閲覧注意" was also a translation for CW. CW is now translated as "警告", which simply means "warnings".	8 years ago
Stephen Burgess	cca41ea544	Replace inline styles with CSS classes (BEM) (#2338 ) * fix(classnames): Status icon style classnames Take out inline css and put into classnames for the following components: account, avatar, icon button, status action bar, notification. * fix(status): Move styles from inline to classes for statuses Move styles to classnames in components.scss for the following components: display name media gallery status status content video player * fix(classnames): Add classnames to rest of components Take out inline styles and apply them to classnames in the sass for the following components: button column back button slim column back button collapsable column dropdown menu loading indicator status list * fix(classnames): Remove all non-dynamic inline styles Components affected: autosuggested permalink action bar header character counter compose form emoji dropdown privacy dropdown reply indicator upload form account auth followers getting started column settings mutes settings reblogs status checkbox report action bar status card boost modal media modal video modal * fix(permalink): Do not lose classname * fix(tests): Add space back in display name * fix(status__wrapper): Remove duplicate css name Remove incorrect style attribute. Remove style attribute all together. Cursor defaults to "auto" when not specified as 'default'. * fix(nl): do not lose translations	8 years ago
Matt Jankowski	532bec6e56	Clean up flash display in views (#2336 ) * Add flashes partial to DRY up admin/auth layouts * Further consolidate flash messages	8 years ago
Matt Jankowski	ee82d8a876	Move force_ssl check to production config (#2165 ) The force_ssl method from controllers does not add all of the options that the sitewide configuration in a config block does. For example, HSTS enforcement is not added by the controller method, but is added by this style.	8 years ago
mecab	1646ca75f0	Fix character images' sizing to make it robust (#2327 )	8 years ago
jeroenpraat	f876665264	Translation emojis and sorted on alphabet (#2328 )	8 years ago
ばん	5817bae2da	fix can toot whitespace (#2218 )	8 years ago
Stephen Burgess	4cfc155560	Improve aria support - Columns and Navigation Drawer Icons (#2299 ) * feat(aria): Add aria-labels to underlabelled tab nav items The drawer tabs which control primary navigation are only labelled by a title which is not available to many screenreaders. Add an aria-label attribute to each link to improve readability with screenreaders. Organize link attributes so link target is first followed by classname. Issue #1349 * feat(aria): Replace abstract aria role of section with region Abstract aria roles such as section should not be used in content. Use non-abstract 'region' aria role instead. That role expects an aria-labelledby attribute with an id. Pass an ID to the column header. Remove the aria-label attribute on the ColumnHeader because the same value is output in plaintext as its child. Issue #1349 * fix(aria): Remove aria-controls attribute until solution is found Columns do not have wrappers, so these icons can't point to a column wrapper which it controls. Instead these icons function as triggers to show or hide individual columns. #1349 * fix(typo): Remove type of aria-labelledby instead of aria-label	8 years ago
Wesley Ellis	a1174a6d7e	Add og:url tags (#2298 ) * add og:url to stream_item view * add og:url and text to about/show * add og:url to profile, followers and follows pages	8 years ago
Akihiko Odaki	5357329454	Fix TabsBar update (#2300 ) This change allows to update TabsBar according to route changes.	8 years ago
Ashley	7fea36d155	Added strings for emoji category localization (#2302 )	8 years ago
Keiji, Yoshimi	2bf7e81ed5	update emojione-picker for fixed warnings. (#2324 )	8 years ago
Quent-in	ca8ae21b52	missing a var (#2320 ) oc variable is missing on the second liste	8 years ago
masarakki	d0ec4fb828	refactor-cores (#2308 )	8 years ago
unarist	4428cf6f07	Fix Japanese translation of privacy disclaimer (#2315 )	8 years ago
ThibG	fe43991d02	Add author/actor URI to the list of webfinger aliases (#2319 ) This fixes outbound salmon requests to remote GNU Social instances	8 years ago
codl	8565ba68f7	strip leading & trailing spaces from remote follow acct (#997 ) (#2321 )	8 years ago
Matt Jankowski	629d35e6f5	[WIP] Html lang on statuses (#2297 ) * Add html lang attributes around statuses * Remove urls from language detection	8 years ago
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296 ) * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	8 years ago
Ashley	6af21daac9	Allowed the emoji picker 'Search...' string to be localized (#2294 )	8 years ago
Eugen	9d3be5579a	Improve bio compatibility (#2278 ) * Fix #1057 (close #1819) - Move HTML-formatted bio from <poco:note /> to <summary type="html" /> * Ensure <poco:note /> is plaintext for remote accounts, also, by stripping out HTML	8 years ago
Ashley	05ac28f3e4	Added API for single notification dismissal (#2251 ) * Added API backend for notification dismissal * Added render statement * Changed statement	8 years ago
Akihiko Odaki	0f852c6f74	Do not set port for puma if it is bound to unix socket (#2289 ) Setting port after binding a unix socket puma listen to both of an unix socket and TCP/IP, which is not a desired behavior.	8 years ago
Joël Quenneville	974ac467de	Add tests for StreamEntriesHelper#rtl? (#2286 ) We used some random Arabic characters to test that the various RTL conditions got triggered.	8 years ago
Naouak	af7d02da5d	Fix issue with line return in file (#1947 ) Fix #1940	8 years ago
Rachel H	5abd543766	Put space before image (#1735 )	8 years ago
Yamagishi Kazutoshi	1948f9e767	Remove deprecated features at React v15.5 (#1905 ) * Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up `59a77923b3`	8 years ago
Eduardo Elias	27ea2a88c1	Language: Missing keys for pt and pt-BR (#2277 )	8 years ago
Akihiko Odaki	16cd648181	Allow to listen Unix socket (#2085 ) * Allow puma to listen Unix socket * streaming: Show the whole listening address instead of the port Port is not always appropriate (e.g. Unix socket) * streaming: Close server before exiting This change especially allows to remove Unix socket before exiting.	8 years ago
Yamagishi Kazutoshi	53b21ac1cd	Add Japanese translation for display name and bio counter (#2275 ) * Add Japanese translation for display name and bio counter * Remove dep key	8 years ago
Eduardo Elias	e4550811b2	Language: Update missing key for pt and pt-BR (#2276 )	8 years ago
Eduardo Elias	704846a258	Fix: missing : for language (#2274 )	8 years ago
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200 ) * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)	8 years ago
Koala Yeung	1714f08d75	Add Ido (io) translation (#2202 ) * Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.	8 years ago
Matt Jankowski	452dc6b5fe	Use local_time gem for timezone replacement (#2174 ) For the 'time ago' value of stream entry simple statuses and the timestamp value of detailed statuses - output their UTC value and use the browser timezone to convert locally.	8 years ago
Mingye Wang	5c9aa2b732	Fix mangling of ##tag matches (#2194 ) (#2247 ) This commit fixes hashtag_html so it correctly handles matches with multiple hash-signs. Bug located by @over9001, initial fix suggested by @nightpool.	8 years ago
Ash Furrow	78af88e1f4	Hides superluous details on small screens (#2175 ) * Hides superluous details on small screans. * Addressed feedback from #2175.	8 years ago

1 2 3 4 5 ...

2605 Commits (9a085e138e308066ae5e6019d0cb175ae1dd2ddb) All Branches Search

2605 Commits (9a085e138e308066ae5e6019d0cb175ae1dd2ddb)

All Branches