Shel R
|
6efaee30b1
|
Merge branch 'master' into patch-1
|
2017-04-07 22:09:55 -04:00 |
|
Shel R
|
16b69e67ca
|
Merge pull request #982 from foxiehkins/master
Adding good-dragon.com instance to list
|
2017-04-07 22:09:15 -04:00 |
|
Shel R
|
698fe3686a
|
Merge pull request #982 from foxiehkins/master
Adding good-dragon.com instance to list
|
2017-04-07 22:09:15 -04:00 |
|
Shel R
|
fc78bf502e
|
Merge branch 'master' into master
|
2017-04-07 22:08:54 -04:00 |
|
Shel R
|
05be34a94b
|
Merge branch 'master' into master
|
2017-04-07 22:08:54 -04:00 |
|
Shel R
|
f2dc24d00a
|
Merge pull request #976 from shug0/patch-1
Adding masto.raildecake.fr, french instance 🌻🐘
|
2017-04-07 22:06:06 -04:00 |
|
Shel R
|
cb58694a81
|
Merge pull request #976 from shug0/patch-1
Adding masto.raildecake.fr, french instance 🌻🐘
|
2017-04-07 22:06:06 -04:00 |
|
Shel R
|
fc48d7d27d
|
Merge branch 'master' into patch-1
|
2017-04-07 22:05:38 -04:00 |
|
Shel R
|
e51b6bba94
|
Merge branch 'master' into patch-1
|
2017-04-07 22:05:38 -04:00 |
|
Shel R
|
b3f3c54b6a
|
Merge pull request #975 from tomfhowe/patch-4
Use autohiding scrollbars in Microsoft Edge
|
2017-04-07 22:03:35 -04:00 |
|
Shel R
|
7f393a0b68
|
Merge pull request #975 from tomfhowe/patch-4
Use autohiding scrollbars in Microsoft Edge
|
2017-04-07 22:03:35 -04:00 |
|
Shel R
|
17c734b017
|
Merge branch 'master' into patch-4
|
2017-04-07 22:02:26 -04:00 |
|
Shel R
|
9f43e3b428
|
Merge branch 'master' into patch-4
|
2017-04-07 22:02:26 -04:00 |
|
Shel R
|
355f92c89d
|
Merge pull request #973 from ZiiX/patch-1
added instance
|
2017-04-07 21:59:51 -04:00 |
|
Shel R
|
4a40b40324
|
Merge pull request #973 from ZiiX/patch-1
added instance
|
2017-04-07 21:59:51 -04:00 |
|
Shel R
|
03bc0d99b3
|
Merge branch 'master' into patch-1
|
2017-04-07 21:59:21 -04:00 |
|
Shel R
|
4c05f0e630
|
Merge branch 'master' into patch-1
|
2017-04-07 21:59:21 -04:00 |
|
Shel R
|
38a30c2844
|
Merge pull request #972 from amandavisconti/master
Added digitalhumanities.club instance
|
2017-04-07 21:56:57 -04:00 |
|
Shel R
|
d438eab673
|
Merge pull request #972 from amandavisconti/master
Added digitalhumanities.club instance
|
2017-04-07 21:56:57 -04:00 |
|
Shel R
|
8b56cdd949
|
Merge branch 'master' into master
|
2017-04-07 21:54:32 -04:00 |
|
Shel R
|
7b7bff04df
|
Merge branch 'master' into master
|
2017-04-07 21:54:32 -04:00 |
|
Shel R
|
d38cf274c3
|
Merge pull request #970 from estuans/patch-1
Update Production-guide.md
|
2017-04-07 21:49:57 -04:00 |
|
Shel R
|
e659608797
|
Merge pull request #970 from estuans/patch-1
Update Production-guide.md
|
2017-04-07 21:49:57 -04:00 |
|
Shel R
|
8eaeb0cba7
|
Merge branch 'master' into patch-1
|
2017-04-07 21:49:18 -04:00 |
|
Shel R
|
ed332693fe
|
Merge branch 'master' into patch-1
|
2017-04-07 21:49:18 -04:00 |
|
Shel R
|
d25093c2c9
|
Merge pull request #969 from Fortyseven/patch-1
Add social.bytestemplar.com to instances list
|
2017-04-07 21:48:58 -04:00 |
|
Shel R
|
881e4277fd
|
Merge pull request #969 from Fortyseven/patch-1
Add social.bytestemplar.com to instances list
|
2017-04-07 21:48:58 -04:00 |
|
Shel R
|
baad719a67
|
Merge branch 'master' into patch-1
|
2017-04-07 21:48:19 -04:00 |
|
Shel R
|
5dfc9854f1
|
Merge branch 'master' into patch-1
|
2017-04-07 21:48:19 -04:00 |
|
Shel R
|
4932a4a708
|
Merge pull request #959 from mkody/patch-1
Added im-in.space
|
2017-04-07 21:45:06 -04:00 |
|
Shel R
|
b300bb3b4e
|
Merge pull request #959 from mkody/patch-1
Added im-in.space
|
2017-04-07 21:45:06 -04:00 |
|
Shel R
|
c442d045a0
|
Merge branch 'master' into patch-1
|
2017-04-07 21:44:16 -04:00 |
|
Shel R
|
6d519e6fd1
|
Merge branch 'master' into patch-1
|
2017-04-07 21:44:16 -04:00 |
|
Shel R
|
fa994bc24b
|
Merge pull request #953 from Technowix/patch-1
Add niu.moe, cuz it's kawaii
|
2017-04-07 21:43:20 -04:00 |
|
Shel R
|
d2c9cc31de
|
Merge pull request #953 from Technowix/patch-1
Add niu.moe, cuz it's kawaii
|
2017-04-07 21:43:20 -04:00 |
|
Shel R
|
db00112413
|
Merge branch 'master' into patch-1
|
2017-04-07 21:42:10 -04:00 |
|
Shel R
|
065defefac
|
Merge branch 'master' into patch-1
|
2017-04-07 21:42:10 -04:00 |
|
Shel R
|
c846c92553
|
Merge pull request #944 from VirtuBox/patch-1
Update List-of-Mastodon-instances.md
|
2017-04-07 21:35:34 -04:00 |
|
Shel R
|
6bfe068904
|
Merge pull request #944 from VirtuBox/patch-1
Update List-of-Mastodon-instances.md
|
2017-04-07 21:35:34 -04:00 |
|
Shel R
|
ac2515e096
|
Merge branch 'master' into patch-1
|
2017-04-07 21:34:41 -04:00 |
|
Shel R
|
bc237d17a7
|
Merge branch 'master' into patch-1
|
2017-04-07 21:34:41 -04:00 |
|
Yann GUERN
|
33b00dd70f
|
#1141 on remote follow
The async action is send before persist, account.id not yet generated
Pull queue receive 'nil' so no profile update.
|
2017-04-08 03:24:35 +02:00 |
|
Yann GUERN
|
485d75a805
|
#1141 on remote follow
The async action is send before persist, account.id not yet generated
Pull queue receive 'nil' so no profile update.
|
2017-04-08 03:24:35 +02:00 |
|
Eugen Rochko
|
07f42f0824
|
Fix #1165 - before_action was called before protect_from_forgery
|
2017-04-08 02:30:50 +02:00 |
|
Eugen Rochko
|
4b621188ad
|
Fix #1165 - before_action was called before protect_from_forgery
|
2017-04-08 02:30:50 +02:00 |
|
David Huerta
|
9c0ca6f26d
|
Merge branch 'master' into patch-1
|
2017-04-07 19:46:07 -04:00 |
|
David Huerta
|
4fb24a70d3
|
Merge branch 'master' into patch-1
|
2017-04-07 19:46:07 -04:00 |
|
Eugen Rochko
|
81b7c81200
|
Fix #801 - Respect webfinger's canonical response of username/domain
|
2017-04-08 01:07:42 +02:00 |
|
Eugen Rochko
|
b2a7218ab7
|
Fix #801 - Respect webfinger's canonical response of username/domain
|
2017-04-08 01:07:42 +02:00 |
|
Eugen
|
714156e409
|
Merge pull request #1204 from benklop/patch-1
Update Administration-guide.md
|
2017-04-08 01:00:32 +02:00 |
|