Commit Graph

717 Commits

Author SHA1 Message Date
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
happycoloredbanana 48e893e5a0 fix max_id description 2017-06-05 00:24:28 +03:00
Valentin Lorentz e2fcb2f407 Update resources of oc.todon.fr 2017-06-04 17:24:38 +02:00
Eugen Rochko 6e84411c7e Updated sponsors as of June 1 2017-06-04 00:33:13 +02:00
Eugen Rochko 575a9492c8 Merge pull request #287 from zunda/no-direct-rake-run
Remove the procedure to run `rake secret` outside the container
2017-06-03 15:16:17 +02:00
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