Commit Graph

263 Commits

Author SHA1 Message Date
Ash Furrow acae9db314 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 29f0425dcd Add mst3k.interlinked.me to list of instances (#1235) 2017-04-08 21:48:16 +10:00
kadiix fba0335ed8 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) 55319d1352 Update mastodon.nuzgo.net (#1242)
Add ipv6 support
2017-04-08 20:34:53 +10:00
Eugen 0493dfb668 Revert "add persistance to Postresql container" (#1251) 2017-04-08 12:25:23 +02:00
Eugen 4cc3996be1 Merge pull request #1239 from ineffyble/patch-2
Fix my URL
2017-04-08 11:40:43 +02:00
Eugen 3d26364eb4 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 360a07082a Merge pull request #887 from valentin2105/master
add persistance to Postresql container
2017-04-08 11:39:25 +02:00
Eugen 5c962c196f Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
2017-04-08 11:38:54 +02:00
Eugen a69523a25e Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
2017-04-08 11:38:33 +02:00
Milton Mazzarri 665f6ab707 Add reference to Elixir client for Mastodon API 2017-04-08 02:48:52 -05:00
Effy Elden f2291af752 Fix my URL
Update my URL since toot.zone was shut down.
2017-04-08 16:22:07 +10:00
Valentin Ouvrard 40bf6000b2 Merge branch 'master' into master 2017-04-08 15:11:20 +11:00
Shel R 0e273c5c23 Close instance list to additions 2017-04-07 23:51:30 -04:00
Shel R 127cb4457c Merge branch 'master' into patch-1 2017-04-07 23:15:17 -04:00
Shel R 0bc030e34d Merge branch 'master' into add_indigo_zone_instance 2017-04-07 23:09:50 -04:00
Shel R c014098111 Merge branch 'master' into list-oulipo-social 2017-04-07 23:08:41 -04:00
Shel R d5998431b1 Merge branch 'master' into patch-2 2017-04-07 23:05:08 -04:00
Shel R c6a30c2272 Merge branch 'master' into patch-1 2017-04-07 23:03:07 -04:00
Shel R 210477bfb2 Merge branch 'master' into patch-1 2017-04-07 22:59:07 -04:00
Shel R 5e52f81d0b Merge branch 'master' into patch-1 2017-04-07 22:54:25 -04:00
Shel R 960bf1823f Merge branch 'master' into master 2017-04-07 22:53:42 -04:00
Shel R b7d1d57035 Merge branch 'master' into patch-2 2017-04-07 22:49:14 -04:00
Shel R 6f121ae603 Merge branch 'master' into patch-4 2017-04-07 22:47:42 -04:00
Shel R 1cbf83dfd3 Merge branch 'master' into patch-1 2017-04-07 22:46:36 -04:00
Shel R da91b207e9 Merge branch 'master' into master 2017-04-07 22:44:40 -04:00
Shel R 9ef164a3e2 Merge branch 'master' into master 2017-04-07 22:43:13 -04:00
Shel R 2caa1fa679 Merge branch 'master' into patch-1 2017-04-07 22:42:14 -04:00
Shel R 79875f5505 Merge branch 'master' into patch-1 2017-04-07 22:41:07 -04:00
Shel R 6c766318ac Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Valentin Ouvrard e08dfa6f32 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard 8fb9960e92 Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R 4062abe596 Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R aa6f267117 Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R 1b964ab4c2 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R 95440a1ac3 Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R aa7ba961c8 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R 8a46f49140 Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R aeb5f657d1 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R 9cdf42ba65 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R d42ddf0dad Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R cc3037296a Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 05bb90718d Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R 8374ca6182 Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R 34ce7c6fb9 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R fd94a0bece Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R ba611ed3b2 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R 9470afa4f3 Merge branch 'master' into patch-1 2017-04-07 21:49:18 -04:00
Shel R f3ee549b28 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R 7c7851a45c Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00