Commit Graph

638 Commits

Author SHA1 Message Date
zunda 58d6dcb46a Remove the procedure to run `rake secret` outside the container
This change will help users avoid unnecessary procedure to
complete `bundle install` outside the container.

The explanation

> To generate the PAPERCLIP_SECRET, SECRET_KEY_BASE, and
> OTP_SECRET, you may use:
>
> ```
> rake secret
> ```

gives users a false impression that secrets have to be filled in
before the image can be built. Here, with introduction of CLD3,
completion of `bundle install` became more involved procedure to
prepare tools and libraries as well as higher version of Ruby.
2017-06-02 21:19:30 -10:00
Eugen Rochko 0d9ec12d86 Merge pull request #274 from NeetShin/patch-1
Update Apps.md
2017-06-02 23:07:33 +02:00
Eugen Rochko ba06582aee Merge pull request #283 from zonuexe/vagrant-up-provider
Explicitly use --provider option for vagrant up
2017-06-02 21:09:21 +02:00
Eugen Rochko fe9a82e665 Merge pull request #286 from ornithocoder/patch-1
Removes id parameter from documentation
2017-06-02 18:25:13 +02:00
Ornithologist Coder cefb4b2f4c Removes id parameter from documentation
`id` is neither a query item (GET) nor part of the body (POST), therefore should not be in the parameter table.
2017-06-02 17:08:59 +02:00
Eugen Rochko c7fc284a44 Revert documentation for unfinished feature 2017-06-02 14:00:28 +02:00
Eugen Rochko 1a17ee126d Merge pull request #285 from darkcl/patch-1
Rename Mastodon-iOS to Mustor
2017-06-01 21:07:07 +02:00
Eugen Rochko 87b7cd6574 Merge pull request #276 from jeroensmeets/11t-changes
updated info for 11t in apps list
2017-06-01 21:05:51 +02:00
Yeung Yiu Hung 081acf7618 Rename Mastodon-iOS to Mustor 2017-06-01 20:43:09 +08:00
USAMI Kenta e8bcf6a035 Explicitly use --provider option for vagrant up
When a provider other than virtualbox is registered in Vagrant, `vagrant up` can not start Mastodon.
For example, it corresponds to the environment where Parallels Desktop is installed.
2017-05-31 12:52:03 +09:00
Eugen Rochko ba27b6ed63 Merge pull request #281 from koug44/master
Update on apache configuration
2017-05-30 16:32:53 +02:00
Eugen Rochko c1de2cbb66 Merge pull request #282 from anon5r/add_faq_in_japanese
Add faq in Japanese
2017-05-30 16:32:31 +02:00
anon e0b3506cb3 Add link to Japanese FAQ into FAQ.md 2017-05-30 19:13:08 +09:00
anon 9fbb0494d7 Add Mastodon FAQ for Japanese 2017-05-30 19:10:23 +09:00
Eugen Rochko 78751932bc Update customization guide 2017-05-30 19:06:59 +09:00
koug44 473152c792 Update on apache configuration
Added the needed ProxyPass exceptions for 1.4.1
2017-05-29 17:32:17 -04:00
Eugen Rochko 2dec4f6a51 Merge pull request #279 from myles/patch-2
Needed pkg-config to install cld3.
2017-05-29 20:39:58 +02:00
Myles Braithwaite 2da7d4fc0a Needed pkg-config to install cld3.
In Debian the package `pkg-config` is required to install the rubygem `cld3`.
2017-05-29 14:36:32 -04:00
Jeroen Smeets 11aca4e114 updated info on 11t in apps list 2017-05-29 11:01:55 +02:00
新都心(Neet Shin) 55ea9c05cb Update Apps.md 2017-05-29 00:04:10 +05:30
新都心(Neet Shin) 0cd53cad08 Update Apps.md
Added my client.
2017-05-28 18:47:26 +05:30
Eugen Rochko cc88ba21df Merge pull request #272 from tootsuite/fix-custom-scss
Update customization guide
2017-05-27 16:55:17 +02:00
Eugen Rochko d892b9ff8f Update customization guide 2017-05-27 16:51:28 +02:00
Eugen Rochko 38c6a59546 Merge pull request #270 from tootsuite/fix-api-docs
Fix API docs by adding missing attributes and methods, fix example
2017-05-26 20:21:39 +02:00
Eugen Rochko 8b5d2ba471 Fix API docs by adding missing attributes and methods, fix example
nginx config by removing overly specific configuration options
that confuse more than they help
2017-05-26 17:29:47 +02:00
Eugen Rochko d94a7d18f4 Merge pull request #266 from ornithocoder/patch-3
Adds notifications/dismiss/:id (Fixes #265)
2017-05-26 00:44:21 +02:00
Ornithologist Coder d7b090f0af Adds notifications/dismiss/:id (Fixes #265)
@Kimik0 noticed the endpoint was missing. Read more about it here #265
2017-05-25 17:46:01 +02:00
Eugen Rochko 998efd960a Merge pull request #264 from ornithocoder/patch-2
Adds language to Status
2017-05-25 14:24:14 +02:00
Eugen Rochko 321c40db06 Merge pull request #263 from ornithocoder/patch-1
Reflects the latest API version
2017-05-25 14:23:49 +02:00
Ornithologist Coder 0854f0f365 Adds language to Status
Based on:

* #1772
* #3209
2017-05-25 10:31:17 +02:00
Ornithologist Coder 390f2a747f Reflects the latest API version
The API.md document should reflect the currently API version and, for the current version, Mastodon's version is always present. Therefore, the version attribute it's not nullable.
2017-05-25 09:04:29 +02:00
Michael Smith 2e99c08902 Document "mute boosts" functionality (#260) 2017-05-24 23:50:16 +02:00
Iván Sánchez Ortega f8793d9be7 Add mastodon-api nodejs library (#261) 2017-05-24 23:37:31 +02:00
Eugen Rochko d17b64e130 Merge pull request #129 from danhunsaker/feature/nanobox
Document Nanobox Usage
2017-05-23 16:57:23 +02:00
Eugen Rochko 0ef957b91b Merge pull request #258 from nolanlawson/patch-3
s/assets/packs/
2017-05-23 16:56:57 +02:00
Nolan Lawson 6b29d736ec s/assets/packs/
`assets` are now at `packs`. Unfortunately this change will permanently cache `stats.json` and `report.html`, but these aren't super critical since they're just for debugging. I confirmed that `manifest.json` is not affected and no other non-fingerprinted assets are affected.
2017-05-22 20:07:40 -07:00
Eugen Rochko 92405a8d91 Merge pull request #257 from garbados/patch-1
Update Development-guide.md
2017-05-22 15:32:58 +02:00
Diana Thayer 887837ab87 Update Development-guide.md
Since the document specifies the `--pure-lockfile` flag, it seems inaccurate to say, "Similarly, installing JavaScript dependencies doesn't require any flags."

I've changed the text accordingly. I hope it's appropriate!
2017-05-21 22:57:17 -07:00
Eugen Rochko 770c90da74 Merge pull request #239 from jeroenpraat/patch-2
explaining DB_POOL better
2017-05-22 04:23:21 +02:00
Eugen Rochko b71e181661 Merge pull request #244 from seefood/patch-1
dependencies and webpacker
2017-05-22 04:21:43 +02:00
Eugen Rochko f4e6c29a53 Update Development-guide.md 2017-05-22 04:21:32 +02:00
Eugen Rochko 9a89190202 Update Development-guide.md 2017-05-22 04:20:26 +02:00
Eugen Rochko c29f6f2ee6 Update Development-guide.md 2017-05-22 04:19:33 +02:00
Eugen Rochko eac39a3d51 Merge pull request #255 from happycoloredbanana/search-resolve-is-optional
Fix optionality of resolve
2017-05-20 16:37:43 +02:00
happycoloredbanana 82bd43c03d Fix optionality of resolve 2017-05-20 11:31:40 +03:00
Eugen Rochko 9091a13e46 Merge pull request #254 from Artoria2e5/patch-4
Translating: minor fixup for TOC
2017-05-19 13:03:30 +02:00
Mingye Wang 1feee9e36f Translating: minor fixup for TOC 2017-05-18 21:30:53 -04:00
Eugen Rochko 6d9a867508 Merge pull request #253 from 39e/patch-1
Adding Naumanni to Apps.md
2017-05-18 19:26:44 +02:00
Aoi Tachibana 816444cfb9 Adding Naumanni to Apps.md 2017-05-19 00:06:13 +09:00
Eugen Rochko e158c21629 Merge pull request #252 from matrix9180/patch-1
Update Development-guide.md
2017-05-18 00:58:14 +02:00