266 Commits

Author	SHA1	Message	Date
Ryan Freebern	9bb398ee91	Minor clarifications (#1386)	2017-04-10 13:01:43 +02:00
Ornithologist Coder	43f955e31f	Minor change to Entity on API.md (Relationship) (#1356)	2017-04-09 19:10:38 +02:00
Ornithologist Coder	b16fbd52b2	Minor API.md changes (#1351)	2017-04-09 18:36:03 +02:00
Ornithologist Coder	3b34c28bee	Minor change on API.md (#1352)	2017-04-09 18:35:51 +02:00
David Celis	d4fe6cd2bf	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	6e3925521d	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	941a593ea8	Add mst3k.interlinked.me to list of instances (#1235)	2017-04-08 21:48:16 +10:00
kadiix	49043f644d	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)	c6b0707cf6	Update mastodon.nuzgo.net (#1242) ... Add ipv6 support	2017-04-08 20:34:53 +10:00
Eugen	211920b622	Revert "add persistance to Postresql container" (#1251)	2017-04-08 12:25:23 +02:00
Eugen	a345eb44fc	Merge pull request #1239 from ineffyble/patch-2 ... Fix my URL	2017-04-08 11:40:43 +02:00
Eugen	7b814d5bcb	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	9f9f4b248e	Merge pull request #887 from valentin2105/master ... add persistance to Postresql container	2017-04-08 11:39:25 +02:00
Eugen	3660f01f60	Merge pull request #1115 from vmincev/patch-1 ... Update Production-guide.md	2017-04-08 11:38:54 +02:00
Eugen	a2ec54a20b	Merge pull request #1198 from huertanix/patch-1 ... Update Heroku-guide.md	2017-04-08 11:38:33 +02:00
Milton Mazzarri	b04cbb9f5d	Add reference to Elixir client for Mastodon API	2017-04-08 02:48:52 -05:00
Effy Elden	75aade3de2	Fix my URL ... Update my URL since toot.zone was shut down.	2017-04-08 16:22:07 +10:00
Valentin Ouvrard	3c48c9ac2e	Merge branch 'master' into master	2017-04-08 15:11:20 +11:00
Shel R	ecf0320a78	Close instance list to additions	2017-04-07 23:51:30 -04:00
Shel R	50910d1543	Merge branch 'master' into patch-1	2017-04-07 23:15:17 -04:00
Shel R	17690f51a2	Merge branch 'master' into add_indigo_zone_instance	2017-04-07 23:09:50 -04:00
Shel R	315ff648c8	Merge branch 'master' into list-oulipo-social	2017-04-07 23:08:41 -04:00
Shel R	63686fd36f	Merge branch 'master' into patch-2	2017-04-07 23:05:08 -04:00
Shel R	ae9d2f4a32	Merge branch 'master' into patch-1	2017-04-07 23:03:07 -04:00
Shel R	741bbba6ff	Merge branch 'master' into patch-1	2017-04-07 22:59:07 -04:00
Shel R	971c4de18c	Merge branch 'master' into patch-1	2017-04-07 22:54:25 -04:00
Shel R	3c5b0c55cb	Merge branch 'master' into master	2017-04-07 22:53:42 -04:00
Shel R	b67b60fec3	Merge branch 'master' into patch-2	2017-04-07 22:49:14 -04:00
Shel R	d6827e38a6	Merge branch 'master' into patch-4	2017-04-07 22:47:42 -04:00
Shel R	e7d7a99fbc	Merge branch 'master' into patch-1	2017-04-07 22:46:36 -04:00
Shel R	abab82ec1e	Merge branch 'master' into master	2017-04-07 22:44:40 -04:00
Shel R	38c5130930	Merge branch 'master' into master	2017-04-07 22:43:13 -04:00
Shel R	c9f15f7991	Merge branch 'master' into patch-1	2017-04-07 22:42:14 -04:00
Shel R	9edee2e64f	Merge branch 'master' into patch-1	2017-04-07 22:41:07 -04:00
Shel R	c890b86ef6	Merge branch 'master' into patch-2	2017-04-07 22:39:59 -04:00
Valentin Ouvrard	5b571fc434	Merge branch 'master' into master	2017-04-08 13:39:31 +11:00
Valentin Ouvrard	3e4eb9c95f	Merge branch 'master' into master	2017-04-08 13:39:09 +11:00
Shel R	7826b5e93d	Merge branch 'master' into patch-1	2017-04-07 22:38:37 -04:00
Shel R	c945f29e96	Merge branch 'master' into patch-1	2017-04-07 22:35:45 -04:00
Shel R	cf03634e74	Merge branch 'master' into add-elao-com-instance	2017-04-07 22:34:45 -04:00
Shel R	d7d165db5b	Merge branch 'master' into add-infinimatix.net-instance	2017-04-07 22:33:40 -04:00
Shel R	7632178300	Merge branch 'master' into patch-1	2017-04-07 22:23:50 -04:00
Shel R	3e8c1a1c36	Merge branch 'master' into master	2017-04-07 22:17:53 -04:00
Shel R	1b42f717f2	Merge branch 'master' into master	2017-04-07 22:15:55 -04:00
Shel R	9981972844	Merge branch 'master' into patch-1	2017-04-07 22:14:08 -04:00
Shel R	cf13c97cb2	Merge branch 'master' into master	2017-04-07 22:13:06 -04:00
Shel R	451b7431c9	Merge branch 'master' into patch-2	2017-04-07 22:11:24 -04:00
Shel R	6efaee30b1	Merge branch 'master' into patch-1	2017-04-07 22:09:55 -04:00
Shel R	05be34a94b	Merge branch 'master' into master	2017-04-07 22:08:54 -04:00
Shel R	e51b6bba94	Merge branch 'master' into patch-1	2017-04-07 22:05:38 -04:00