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.
8 years ago
8546649425
Use ws protocol in streaming API base URL ( #2606 )
8 years ago
2ceaa88ed0
fix DB_URL ( #2778 )
8 years ago
93ec05f976
Decode IDNA in PreviewCard ( #2781 )
8 years ago
6bbf4b89bb
Fixes #1830 adds link to development guide ( #2783 )
8 years ago
bbac5c7359
Show emoji shortname by a tooltip ( #2784 )
8 years ago
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
8 years ago
f3588dceff
Make vagrant HTTP port configurable ( #2510 )
8 years ago
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
8 years ago
a14ae886b9
Fix #2725 ( #2774 )
8 years ago
8afb756f6f
Language: update pt-BR ( #2775 )
8 years ago
62738bf1a9
Localize 'throttled' ( #2755 )
8 years ago
ba25539563
Update fr.json ( #2757 )
...
ajout espace insécable derrière pouet - pour voir
8 years ago
bb67dd45aa
i18n: updated Polish translation ( #2768 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
8 years ago
0951a2f9f3
Clean up redis configuration. Allow using REDIS_URL to set advanced ( #2732 )
...
connection options instead of setting REDIS_HOST etc individually
Close #1986
8 years ago
6f24c831e9
update gems ( #2754 )
8 years ago
f1d96e40a3
Additional specs for URI handling ( #2759 )
8 years ago
89550de8cf
Correct Account model for rubocop ( #2587 )
...
* Correct Account model for rubocop
* Undo these changes
8 years ago
4195aa80fb
Remove screenshot image ( #2736 )
8 years ago
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 )
8 years ago
6d2cfb8e29
Vagrantfile: node 6 ( #2752 )
8 years ago
9db85085a9
Language improvements, replace whatlanguage with CLD ( #2753 )
...
* add failing en specs
* add cld2 gem
* Replace WhatLanguage with CLD
8 years ago
5cb8f0c0b2
Update of simple_forum_oc ( #2745 )
...
* Update of simple_forum_oc
* Update simple_form.oc.yml
8 years ago
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
8 years ago
2ca810583b
Add styles for small devices to .onboarding-modal ( #2748 )
8 years ago
022353e522
Added support parallel_tests ( #2740 )
...
- Added new gem the `parallel_tests`.
- Updated .travis.yml.
- Improved scripts and environment variable.
8 years ago
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
8 years ago
3704e6acc9
remove capistrano/faster_assets from Capfile ( #2737 )
8 years ago
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
8 years ago
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>
8 years ago
274fe58b3e
Update simple_form.ja.yml ( #2746 )
...
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
8 years ago
d3ece602d8
Fix width of .confirmation-modal on narrow screens ( #2743 )
8 years ago
19346e7992
Add Japanese translation for allowed languages ( #2738 )
...
* Add Japanese translation for allowed languages
* Remove duplicate expression words
8 years ago
7efac6d577
Use URI.join for generate asset URL ( #2741 )
...
* Use URI.join for generate asset URL
* to String
8 years ago
f80de039d7
Use puma config for Procfile.dev ( #2735 )
8 years ago
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
8 years ago
40a06ce911
Allow to set CA file for SMTP ( #2713 )
8 years ago
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
8 years ago
d50fcad917
Add rspec to further specify FollowRemoteAccountService ( #2414 )
8 years ago
c3ceaf837f
i18n: updated Polish translation ( #2727 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
8 years ago
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!
8 years ago
4645d95ffc
Add admin area view partials for each record type ( #2700 )
8 years ago
2d05f32766
Creation of activerecord for OC ( #2721 )
...
* Creation of activerecord for OC
* Update activerecord.oc.yml
8 years ago
56eb1654e3
Norwegian translation for email notifications ( #2673 )
...
* Create confirmation_instructions.no.html.erb
* Create confirmation_instructions.no.text.erb
* Create password_change.no.html.erb
* Create password_change.no.text.erb
* Create reset_password_instructions.no.html.erb
* Create reset_password_instructions.no.text.erb
* Translates html welcome email
* Translates welcome email
* Translates html password changed email
* Translates password changed email
* Translates html reset password email
* Translates reset password email
* Fixes typo in translation
* Fixes typo in translation
8 years ago
815e31b884
Darkens colour on stream entries meta. ( #2616 )
8 years ago
0644a97ee0
i18n: Updated Polish translation ( #2686 )
...
#807
8 years ago
99fcfb68b5
Reset textarea height when press submit key ( #2681 )
...
* Reset textarea height when press submit key
* dry
* DON'T NEED props
8 years ago
f3cb4b2fcc
Language: update pt-BR ( #2687 )
8 years ago
d3f549a864
Fix to completely hide NSFW-tagged images ( #2724 )
8 years ago
70f9858e6f
Fix subscription expiration condition ( #2715 )
...
* Fix subscription expiration condition
* dry and add spec
8 years ago
Valentin Ouvrard
Akihiko Odaki
abcang
Yamagishi Kazutoshi
Brian Mock
unarist
Colin Mitchell
Eugen Rochko
Eduardo Elias
alpaca-tc
goofy-bz
m4sk1n
yhirano
ThibG
Tomohiro Suwa
Matt Jankowski
kawax
Quent-in
ヨイツの賢狼ホロ | 3rd style
Keiji Matsuzaki
jirayudech
esetomo
Masafumi Otsune
Kaylee
Audun Larsen
Ash Furrow
hakoai