Commit Graph

692 Commits

Author SHA1 Message Date
Damien Erambert 38d73613e0 Fix typo on `yarn manage:translation` occurrences (#328)
* fix typo in manage translation yarn command

* fix typo
2017-07-02 13:47:20 +02:00
Eugen Rochko f181795ee8 Merge pull request #327 from Luclu7/patch-2
New server
2017-07-01 14:25:10 +02:00
Luclu7 07dd12e873 New server 2017-07-01 05:43:40 +02:00
Eugen Rochko 2ad80d35b0 Merge pull request #326 from Econa77/master
Add friends.nico iOS Application
2017-06-30 13:47:20 +02:00
Econa77 48d42cf5ee Add friends.nico iOS Application 2017-06-30 16:46:39 +09:00
Eugen Rochko a9e4188369 Merge pull request #324 from ik11235/add_docker_first_step
Add the first step to clone.
2017-06-29 15:37:35 +02:00
ik bca4ee4f06 Add the first step to clone. 2017-06-29 20:56:50 +09:00
Luclu7 5cba732c10 Added my instance (#323) 2017-06-27 11:56:37 +02:00
Wexpo Lyu 3d88f71e21 Mention that we can use prebuilt images in docs. (#313)
* Mention that we can use prebuilt images.

Instead of building our own.

* Mention that we need to comment out `build`.

If we want to use prebuilt.
2017-06-27 11:53:59 +02:00
Eugen Rochko f7aa30260a Merge pull request #322 from bovarysme/remove-cronjob-section
Remove the cronjobs section from the production guide
2017-06-25 20:11:05 +02:00
bovarysme e191aaa7a3 Remove the cronjobs section from the production guide 2017-06-25 07:52:20 +02:00
Florent Anders bccde55c91 Master (#318)
* Added my client

To the Apps.md list.

* Please add my app.

Hey guys,

we had agreed that my app would be listed here if I still followed the
GPLv3 and added enough modifications and features to really distinguish
from Tusky.

As of the newest update, we have an AMOLED mode, the ability to
customize the cards and Stories and a fullscreen card view that fill up
all the device space.

In addition to the modifications that had already been made, I feel
like this is distinguishing enough to publish it as one of the apps.

Thanks.
2017-06-20 14:34:26 +02:00
wxcafé 39fe30df48 Update Production-guide.md
Fixes the problem where the `mastodon` user has /bin/false as a shell and so `sudo -iu` won't do anything
2017-06-20 13:39:20 +02:00
Eugen Rochko 54ed3bf443 Merge pull request #315 from h-izumi/remove-unavailable-package
Remove unavailable package from General dependencies for CentOS / RHEL
2017-06-20 00:44:55 +02:00
Eugen Rochko 8b264584fc Merge pull request #317 from tinruufu/master
don't encourage people to use base64 avatar and header image uploads
2017-06-18 14:43:32 +02:00
ティン・ルーフ 5f5292f5d3 don't encourage people to use base64 avatar and header image uploads
a potential resolution to tootsuite/mastodon#3804, achieved by not
encouraging people to use upload methods without filenames

my rationale for this being the right solution is that it brings it to
parity with the media upload method, which has already proven to be
enough for library developers to understand. it should be enough that,
early in the docs, it says that 'When a file parameter is mentioned, a
form-encoded upload is expected.'

i wouldn't mind so much if the base64 upload method didn't expose such
an insidious bug, but even if it didn't, it seems reasonable to want to
encourage developers to upload all media in a consistent way
2017-06-18 13:28:46 +01:00
Hayato IZUMI 06fc3e68c5 Remove unavailable package from General dependencies for CentOS / RHEL 2017-06-18 13:52:27 +09:00
Charlotte Fields eb317b35bb added some missing info to prod. (#306)
* added some missing info

* changed login and user creation

* corrected user creation and login

hopefully
2017-06-17 15:16:48 +02:00
Charlotte Fields db5c961282 small doc fix (#307) 2017-06-17 14:30:28 +02:00
Eugen Rochko 5ce2218578 Merge pull request #312 from halcy/patch-1
Add maintainer name and link to Mastodon.py
2017-06-16 22:42:29 +02:00
Lorenz Diener bc840e8f1c Add maintainer name and link to Mastodon.py 2017-06-15 21:12:38 +02:00
Eugen Rochko 9b9d1dce81 Merge pull request #310 from aral/patch-1
Update command to checkout latest release.
2017-06-15 17:50:17 +02:00
Aral Balkan 61d6d17904 Update command to checkout latest release.
The git tag command was incorrectly checking out release candidates instead of the latest release. Fixes #309
2017-06-15 17:22:04 +02:00
Eugen Rochko c833b8328f Merge pull request #304 from manner/master
fixed typo in API documentation
2017-06-14 19:04:46 +02:00
Eugen Rochko 1ce783cb48 Merge pull request #305 from benpro/patch-2
Missing RAILS_ENV=production and bundle exec
2017-06-14 19:04:36 +02:00
Benoît S 445dc18cd9 Missing RAILS_ENV=production and bundle exec
If you're omitting RAILS_ENV and `bundle exec` you'll have:

~~~
rake aborted!                             
NameError: uninitialized constant Annotate
[…]
~~~
2017-06-14 17:40:01 +02:00
Moritz Manner 9c35223837 fixed typo in API documentation 2017-06-14 17:15:28 +02:00
Eugen Rochko 57c1a9888b Merge pull request #301 from lullis/patch-1
Create Serving_a_different_domain.md
2017-06-11 12:32:28 +02:00
Raphael Lullis 491e44c346 Create Serving_a_different_domain.md
The location directive was missing the "=" operator.
2017-06-11 03:55:38 +02:00
Eugen Rochko 45361a6b78 Merge pull request #300 from joyeusenoelle/master
Add screenshot for instance blocking
2017-06-10 11:04:19 +02:00
Eugen Rochko 2a4244ec6a Merge pull request #299 from joyeusenoelle/patch-2
Add information on blocking instances
2017-06-10 11:04:04 +02:00
Noëlle Anthony 48236528ee Add screenshot for instance blocking 2017-06-09 19:03:06 -04:00
Noëlle Anthony 9da878e76f Add information on blocking instances 2017-06-09 19:00:23 -04:00
Eugen Rochko cbc68970d7 Merge pull request #296 from ornithocoder/patch-1
Removes list of mastodon instances
2017-06-07 17:22:21 +02:00
Ornithologist Coder 4f59b1db6f Removes list of mastodon instances
This should stop PR's trying to add new instances to the list.
2017-06-07 17:08:25 +02:00
Eugen Rochko 976b8bab96 Merge pull request #294 from goofy-bz/master
Adding a tip for users
2017-06-07 00:54:04 +02:00
goofy-bz be9c63fe7e link to gif image
a tip about drag and drop image in Compose text box
2017-06-06 23:42:24 +02:00
goofy-bz 46ca8d10d4 adding an animated gif
drag and drop image
2017-06-06 23:39:48 +02:00
goofy-bz 7e22d11eaa Update User-guide.md
adding a tip : drag and drop image from desktop
2017-06-06 23:37:16 +02:00
Eugen Rochko ca01f46181 Merge pull request #293 from jeroenpraat/patch-5
Update
2017-06-06 22:38:58 +02:00
jeroenpraat d264fec126 small fix 2017-06-06 19:03:11 +02:00
jeroenpraat d3711a4ff7 Update 2017-06-06 19:00:22 +02:00
Eugen Rochko 54f31eb18f Merge pull request #292 from jeroenpraat/patch-4
Added tips for more support (incl the Discourse board)
2017-06-05 18:55:39 +02:00
jeroenpraat 84a78d7fa3 Added tips for more support (incl the Discource board) 2017-06-05 18:27:29 +02:00
Eugen Rochko f6e4a33a91 Merge pull request #291 from noraworld/fastoot
Adding Fastoot to app lists
2017-06-05 12:27:18 +02:00
noraworld 8d0309e0b9 Add Fastoot app to Browser add-ons/extensions list 2017-06-05 18:16:37 +09:00
Eugen Rochko 446346f5fb Merge pull request #288 from ProgVal/patch-4
Update resources of oc.todon.fr
2017-06-05 10:10:07 +02:00
Eugen Rochko 84347d5434 Merge pull request #290 from NeetShin/patch-2
Unified to add "@" before developers' username
2017-06-05 10:09:46 +02:00
新都心(Neet Shin) dc47e734ec Unified to add "@" before developers' username 2017-06-05 11:54:05 +05:30
Eugen Rochko 8b10938547 Merge pull request #289 from happycoloredbanana/fix-max_id
fix max_id description
2017-06-05 00:13:53 +02:00