about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-04ui: check spoiler_text against regex filter (#1635) (#2665)R Tucker
* ui: check spoiler_text against regex filter (#1635) When filtering by regex, also check the spoiler_text if present. * ui: concatenate spoiler and content in reducer Simplifies aa5b03c, clarifies intent of the field
2017-05-04Remove the react-rails gem (#2801)Matt Jankowski
* Remove react-rails gem * Fix broken view spec
2017-05-04Delete records in smaller transaction (#2802)alpaca-tc
2017-05-04When streaming API is disconnected, poll home/notifications (#2776)Eugen Rochko
* When streaming API is disconnected, poll home/notifications Display slightly different empty home timeline message if user is following others Cull notifications to 20 items when over 40 get added in real-time Run manage:translations * Optimize <HomeTimeline /> a little
2017-05-04Remove redis clear from before in spec (#2795)Matt Jankowski
2017-05-04Fix language selector on preferences page (#2794)AA4ch1
2017-05-04Improve style for form in site settings (#2796)Yamagishi Kazutoshi
2017-05-04Persian translation update (#2788)Masoud Abkenar
* Persian translation update * fix newline typo
2017-05-04about page : use slightly more space (#2791)Wonderfall
2017-05-04Replace best_in_place editor on admin settings page (#2789)Matt Jankowski
* Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n
2017-05-04Enable disableHostCheck option of webpack-dev-server (#2790)abcang
2017-05-04Switch docker-compose to version 3. (#2747)Valentin Ouvrard
* Switch docker-compose to version 3. It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file. * switch to compose v3 without depend.
2017-05-04Use ws protocol in streaming API base URL (#2606)Akihiko Odaki
2017-05-04fix DB_URL (#2778)abcang
2017-05-04Decode IDNA in PreviewCard (#2781)Yamagishi Kazutoshi
2017-05-04Fixes #1830 adds link to development guide (#2783)Brian Mock
2017-05-04Show emoji shortname by a tooltip (#2784)unarist
2017-05-04changed to run foreman with vagrant (#2742)abcang
* changed to run foreman with vagrant * change port specification method and database setting * delete changes of environment variable related code * hard coated the port
2017-05-04Make vagrant HTTP port configurable (#2510)Colin Mitchell
2017-05-04Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734)Eugen Rochko
* Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses If a delete arrives before the original status, cache that information for 6h, and if the original status arrives in that window, ignore it * Add test case
2017-05-04Fix #2725 (#2774)Eugen Rochko
2017-05-04Language: update pt-BR (#2775)Eduardo Elias
2017-05-03Localize 'throttled' (#2755)alpaca-tc
2017-05-03Update fr.json (#2757)goofy-bz
ajout espace insécable derrière pouet - pour voir
2017-05-03i18n: updated Polish translation (#2768)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732)Eugen Rochko
connection options instead of setting REDIS_HOST etc individually Close #1986
2017-05-03update gems (#2754)yhirano
2017-05-03Additional specs for URI handling (#2759)ThibG
2017-05-03Correct Account model for rubocop (#2587)Tomohiro Suwa
* Correct Account model for rubocop * Undo these changes
2017-05-03Remove screenshot image (#2736)Matt Jankowski
2017-05-03Fix #2706 - Always respond with 200 to PuSH payloads (#2733)Eugen Rochko
Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)
2017-05-03Vagrantfile: node 6 (#2752)kawax
2017-05-03Language improvements, replace whatlanguage with CLD (#2753)Matt Jankowski
* add failing en specs * add cld2 gem * Replace WhatLanguage with CLD
2017-05-03Update of simple_forum_oc (#2745)Quent-in
* Update of simple_forum_oc * Update simple_form.oc.yml
2017-05-03i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)ヨイツの賢狼ホロ | 3rd style
* Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys
2017-05-03Add styles for small devices to .onboarding-modal (#2748)unarist
2017-05-03Added support parallel_tests (#2740)Keiji Matsuzaki
- Added new gem the `parallel_tests`. - Updated .travis.yml. - Improved scripts and environment variable.
2017-05-03Add Thai Language (#2598)jirayudech
* Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml
2017-05-03remove capistrano/faster_assets from Capfile (#2737)esetomo
2017-05-03Show boosted user's avatar (#2518)kawax
* Show boosted user's avatar * add .status__avatar-boost * margin * apply to notifications too. * account__avatar-boost * Add inline prop to Avatar component * Add AvatarOverlay component * rename mixins.scss * move files for latest master * fixed for webpack
2017-05-03i18n: updated Polish translation (#2729)m4sk1n
* i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Update simple_form.ja.yml (#2746)Masafumi Otsune
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
2017-05-03Fix width of .confirmation-modal on narrow screens (#2743)unarist
2017-05-03Add Japanese translation for allowed languages (#2738)Yamagishi Kazutoshi
* Add Japanese translation for allowed languages * Remove duplicate expression words
2017-05-03Use URI.join for generate asset URL (#2741)Yamagishi Kazutoshi
* Use URI.join for generate asset URL * to String
2017-05-03Use puma config for Procfile.dev (#2735)Matt Jankowski
2017-05-03Replace sprockets/browserify with Webpack (#2617)Eugen Rochko
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-03Allow to set CA file for SMTP (#2713)Akihiko Odaki
2017-05-02Auth sign out (#2511)Matt Jankowski
* Add a spec for signing out * Add spec showing that suspended user gets a 403 forbidden on sign out * Allow suspended account users to sign out
2017-05-02Add rspec to further specify FollowRemoteAccountService (#2414)ThibG
generated by cgit-pink (git 2.37.1) at 2024-12-11 12:06:19 +0000