Commit Graph

272 Commits (0cdf4567c731705056b438cf632aaad014584eab)

Author SHA1 Message Date
Christopher Su fdf6954537 Fix redirect link on Tuning.md (#1595) 2017-04-12 12:40:37 +02:00
Eugen 4d876e9453 Moving docs to tootsuite/documentation (#1550) 2017-04-11 12:03:02 -04:00
Valentin Ouvrard 891e67669e Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253)
* enable commented volume in docker-compose.yml

* Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability

* add my instance to the list

* enable GZIP on nginx.conf

* readd root /home/mastodon/live/public;
2017-04-11 16:04:56 +02:00
David Libeau 68231498a8 Add Mastodon.tools (#1457) 2017-04-10 23:30:40 -04:00
Matt Jankowski b4950a59bb Version bumps for ruby and misc gems (#1159)
* Update rspec-rails to version 3.5.2

* Update addressable to version 2.5.1

* Update autoprefixer-rails to version 6.7.7.1

* Update bullet to version 5.5.1

* Update domain_name to version 0.5.20170404

* Update letter_opener_web to version 1.3.1

* Upate redis-rails to version 5.0.2

* Update active_record_query_trace to version 1.5.4

* Update capistrano-rails to version 1.2.3

* Update dotenv-rails to version 2.2.0

* Update pg to version 0.20.0

* Update tilt to version 2.0.7

* Update warden to version 1.2.7

* Update tins to version 1.13.2

* Update terminal-table to version 1.7.3

* Update oj to version 2.18.5

* Update simplecov to version 0.14.1

* Update uglifier to version 3.1.13

* Update hashdiff to version 0.3.2

* Update webmock to version 2.3.2

* Update devise to version 4.2.1

* Use ruby version 2.4.1

* Update sass to version 3.4.23

* Update puma to version 3.8.2

* Update will_paginate to version 3.1.5

* Update font-awesome-rails to version 4.7.0.1

* Update fuubar to version 2.2.0

* Update pry-rails to version 0.3.6

* Update simple-navigation to version 4.0.5

* Update rubocop to version 0.48.1

* Update doorkeeper to version 4.2.5

* Update faker to version 1.7.3

* Update aws-sdk to version 2.9.5

* Update fabrication to version 2.16.1

* Update hamlit-rails to version 0.2.0

* Update http to version 2.2.1

* Update httplog to version 0.99.2

* Update sidekiq to version 4.2.10

* Update rspec-sidekiq to version 3.0.0

* Update pghero to version 1.6.4

* Update rack-cors to version 0.4.1

* Update i18n-tasks to version 0.9.13

* Update ruby-oembed to version 0.12.0

* Update jquery-rails to version 4.3.1

* Update simple_form to version 3.4.0

* Update react-rails to version 1.11.0

* Update aws-sdk to version 2.9.6

* Update sidekiq-unique-jobs to version 5.0.0

* Update uglifier to version 3.2.0
2017-04-10 22:47:41 +02:00
Alexsander Akers f36798c0fe Fix references to "v1" API (#1460)
References to `vi` API version replaced with `v1`
2017-04-10 21:11:59 +02:00
Ryan Freebern 0bb143918b Minor clarifications (#1386) 2017-04-10 13:01:43 +02:00
Ornithologist Coder b54a75e183 Minor change to Entity on API.md (Relationship) (#1356) 2017-04-09 19:10:38 +02:00
Ornithologist Coder d93ee1676c Minor API.md changes (#1351) 2017-04-09 18:36:03 +02:00
Ornithologist Coder c678cb6d64 Minor change on API.md (#1352) 2017-04-09 18:35:51 +02:00
David Celis 6e0b4032b3 Allow users to update their Account in the API (#1179)
* Allow users to update their Account in the API

It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.

Signed-off-by: David Celis <me@davidcel.is>

* Add /api/v1/accounts/update_credentials to the API docs

Signed-off-by: David Celis <me@davidcel.is>
2017-04-09 18:33:40 +02:00
Ash Furrow 1eae01edcd Adds user confirmation rake task (#1300)
* Adds task to confirm user by email.

* Adds documentation for manual confirmation.
2017-04-09 01:09:46 +02:00
Elizabeth Myers 9938145d91 Add mst3k.interlinked.me to list of instances (#1235) 2017-04-08 21:48:16 +10:00
kadiix e6175f7d0f Update mastodon.brussels instance name on List of Instances
Correct mastodon.brussels.fr to mastodon.brussels
2017-04-08 21:05:49 +10:00
Thibaut (Eychics) e19a4c3957 Update mastodon.nuzgo.net (#1242)
Add ipv6 support
2017-04-08 20:34:53 +10:00
Eugen dfb355c53e Revert "add persistance to Postresql container" (#1251) 2017-04-08 12:25:23 +02:00
Eugen 5b69583ffb Merge pull request #1239 from ineffyble/patch-2
Fix my URL
2017-04-08 11:40:43 +02:00
Eugen d9a1e9dcb6 Merge pull request #1238 from milmazz/hunter-client
Add reference to Elixir client for Mastodon API
2017-04-08 11:40:20 +02:00
Eugen 56eef22b14 Merge pull request #887 from valentin2105/master
add persistance to Postresql container
2017-04-08 11:39:25 +02:00
Eugen a42df988b9 Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Eugen 7fc70f03ba Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
2017-04-08 11:38:33 +02:00
Milton Mazzarri eeb8cc0fa0 Add reference to Elixir client for Mastodon API 2017-04-08 02:48:52 -05:00
Effy Elden 1a6ed073fa Fix my URL
Update my URL since toot.zone was shut down.
2017-04-08 16:22:07 +10:00
Valentin Ouvrard 88af022912 Merge branch 'master' into master 2017-04-08 15:11:20 +11:00
Shel R fb23e13cc5 Close instance list to additions 2017-04-07 23:51:30 -04:00
Shel R 22598c0887 Merge branch 'master' into patch-1 2017-04-07 23:15:17 -04:00
Shel R d01f588d77 Merge branch 'master' into add_indigo_zone_instance 2017-04-07 23:09:50 -04:00
Shel R 4e9312bba3 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00
Shel R a876a87890 Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R 9397634b9c Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R 05b6aa25dc Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
Shel R 45f9242902 Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R 2d0cf0e690 Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R a063083b1a Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
Shel R 1969549e50 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R b3ebd07861 Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R 4dc42528b2 Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R 758cf4ef65 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R 9ab9130d04 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R cc9418281b Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R 9539c90339 Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Valentin Ouvrard e88edb4ef4 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard a5eb515d0e Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R c249d9091b Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R ef6b1aac3a Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R ae7f3d9203 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R bc5fb211ca Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R 780c512ff5 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R 76c073d4fd Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R 71077a7605 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00