Commit graph

261 commits

Author SHA1 Message Date
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
Shel R
0b90a13f45 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R
81b63dc586 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R
acd9cc8a6d Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R
7c16bd512c Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R
fc78bf502e Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R
fc48d7d27d Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R
03bc0d99b3 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R
8b56cdd949 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R
baad719a67 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R
c442d045a0 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R
db00112413 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00