treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
2,865 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

2865 Commits (12ef99556e97b5781ae63df39e0d153493a4bddd)

Author SHA1 Message Date
Matt Jankowski ca59622a87 Remove redis clear from before in spec (#2795) 2017-05-04 20:53:39 +02:00
AA4ch1 91642ec801 Fix language selector on preferences page (#2794) 2017-05-04 14:39:25 -04:00
Yamagishi Kazutoshi 4f1cdccbb0 Improve style for form in site settings (#2796) 2017-05-04 14:37:57 -04:00
Masoud Abkenar 1bced91edb Persian translation update (#2788) 
* Persian translation update

* fix newline typo
 2017-05-04 18:32:05 +02:00
Wonderfall 88b7b096e1 about page : use slightly more space (#2791) 2017-05-04 18:16:00 +02:00
Matt Jankowski 232b822d86 Replace best_in_place editor on admin settings page (#2789) 
* 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-04 18:12:44 +02:00
abcang 6e3b33e5f1 Enable disableHostCheck option of webpack-dev-server (#2790) 2017-05-04 17:49:05 +02:00
Valentin Ouvrard 1f0c830c97 Switch docker-compose to version 3. (#2747) 
* 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-04 15:56:05 +02:00
Akihiko Odaki 8546649425 Use ws protocol in streaming API base URL (#2606) 2017-05-04 15:55:13 +02:00
abcang 2ceaa88ed0 fix DB_URL (#2778) 2017-05-04 15:53:44 +02:00
Yamagishi Kazutoshi 93ec05f976 Decode IDNA in PreviewCard (#2781) 2017-05-04 15:52:08 +02:00
Brian Mock 6bbf4b89bb Fixes #1830 adds link to development guide (#2783) 2017-05-04 15:50:36 +02:00
unarist bbac5c7359 Show emoji shortname by a tooltip (#2784) 2017-05-04 15:50:09 +02:00
abcang 95ad0ba245 changed to run foreman with vagrant (#2742) 
* 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-04 04:39:50 +02:00
Colin Mitchell f3588dceff Make vagrant HTTP port configurable (#2510) 2017-05-04 04:36:36 +02:00
Eugen Rochko 78df86a7c8 Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734) 
* 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-04 04:34:57 +02:00
Eugen Rochko a14ae886b9 Fix #2725 (#2774) 2017-05-04 01:42:03 +02:00
Eduardo Elias 8afb756f6f Language: update pt-BR (#2775) 2017-05-04 01:28:10 +02:00
alpaca-tc 62738bf1a9 Localize 'throttled' (#2755) 2017-05-03 23:36:19 +02:00
goofy-bz ba25539563 Update fr.json (#2757) 
ajout espace insécable derrière pouet - pour voir
 2017-05-03 23:36:01 +02:00
m4sk1n bb67dd45aa i18n: updated Polish translation (#2768) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
 2017-05-03 23:19:11 +02:00
Eugen Rochko 0951a2f9f3 Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732) 
connection options instead of setting REDIS_HOST etc individually

Close #1986
 2017-05-03 23:18:13 +02:00
yhirano 6f24c831e9 update gems (#2754) 2017-05-03 21:28:29 +02:00
ThibG f1d96e40a3 Additional specs for URI handling (#2759) 2017-05-03 20:40:14 +02:00
Tomohiro Suwa 89550de8cf Correct Account model for rubocop (#2587) 
* Correct Account model for rubocop

* Undo these changes
 2017-05-03 19:13:04 +02:00
Matt Jankowski 4195aa80fb Remove screenshot image (#2736) 2017-05-03 17:03:10 +02:00
Eugen Rochko 91a8a5eab8 Fix #2706 - Always respond with 200 to PuSH payloads (#2733) 
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-03 17:02:18 +02:00
kawax 6d2cfb8e29 Vagrantfile: node 6 (#2752) 2017-05-03 16:59:51 +02:00
Matt Jankowski 9db85085a9 Language improvements, replace whatlanguage with CLD (#2753) 
* add failing en specs

* add cld2 gem

* Replace WhatLanguage with CLD
 2017-05-03 16:59:31 +02:00
Quent-in 5cb8f0c0b2 Update of simple_forum_oc (#2745) 
* Update of simple_forum_oc

* Update simple_form.oc.yml
 2017-05-03 14:23:17 +02:00
ヨイツの賢狼ホロ | 3rd style e57cd022a1 i18n: Update zh-CN [ Chinese (China) ] translations. (#2699) 
* 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-03 14:03:16 +02:00
unarist 2ca810583b Add styles for small devices to .onboarding-modal (#2748) 2017-05-03 14:02:15 +02:00
Keiji Matsuzaki 022353e522 Added support parallel_tests (#2740) 
- Added new gem the `parallel_tests`.
- Updated .travis.yml.
  - Improved scripts and environment variable.
 2017-05-03 12:20:38 +02:00
jirayudech 4bf8410aad Add Thai Language (#2598) 
* 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-03 12:18:00 +02:00
esetomo 3704e6acc9 remove capistrano/faster_assets from Capfile (#2737) 2017-05-03 12:14:52 +02:00
kawax dd06d92caf Show boosted user's avatar (#2518) 
* 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-03 11:43:37 +02:00
m4sk1n 6eaaa3bec5 i18n: updated Polish translation (#2729) 
* 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-03 11:40:09 +02:00
Masafumi Otsune 274fe58b3e Update simple_form.ja.yml (#2746) 
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
 2017-05-03 11:39:30 +02:00
unarist d3ece602d8 Fix width of .confirmation-modal on narrow screens (#2743) 2017-05-03 11:39:14 +02:00
Yamagishi Kazutoshi 19346e7992 Add Japanese translation for allowed languages (#2738) 
* Add Japanese translation for allowed languages

* Remove duplicate expression words
 2017-05-03 11:37:44 +02:00
Yamagishi Kazutoshi 7efac6d577 Use URI.join for generate asset URL (#2741) 
* Use URI.join for generate asset URL

* to String
 2017-05-03 11:31:21 +02:00
Matt Jankowski f80de039d7 Use puma config for Procfile.dev (#2735) 2017-05-03 02:28:47 +02:00
Eugen Rochko ef2af79a48 Replace sprockets/browserify with Webpack (#2617) 
* 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-03 02:04:16 +02:00
Akihiko Odaki 40a06ce911 Allow to set CA file for SMTP (#2713) 2017-05-03 01:03:12 +02:00
Matt Jankowski 129e06f0b3 Auth sign out (#2511) 
* 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-02 23:37:58 +02:00
ThibG d50fcad917 Add rspec to further specify FollowRemoteAccountService (#2414) 2017-05-02 23:37:26 +02:00
m4sk1n c3ceaf837f i18n: updated Polish translation (#2727) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
 2017-05-02 23:04:41 +02:00
Kaylee fae1ed48e3 Add option to disable two factor auth in admin accounts panel. (#2584) 
* Add option to disable two factor auth in admin accounts panel.
Closes #2578

* Add @mjankowski's suggestions.
* Moves destroy actions behind User#disable_two_factor!
* Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
 2017-05-02 21:07:12 +02:00
Matt Jankowski 4645d95ffc Add admin area view partials for each record type (#2700) 2017-05-02 20:56:28 +02:00
Quent-in 2d05f32766 Creation of activerecord for OC (#2721) 
* Creation of activerecord for OC

* Update activerecord.oc.yml
 2017-05-02 20:55:14 +02:00