kadiix
|
5d5bda0c72
|
Merge branch 'master' into patch-1
|
2017-04-06 19:32:31 +02:00 |
|
Eugen
|
9df50099a1
|
Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
|
2017-04-06 19:32:12 +02:00 |
|
kadiix
|
1c8d5e7db7
|
Add an instance.
|
2017-04-06 19:15:57 +02:00 |
|
Eugen
|
0d8e51ecb4
|
Merge pull request #1048 from ashfurrow/slugignore
Updates slugignore
|
2017-04-06 19:09:45 +02:00 |
|
Eugen
|
22de99ae87
|
Merge pull request #1070 from alexgleason/patch-4
Linux users must enable NFS for Vagrant
|
2017-04-06 19:02:14 +02:00 |
|
Alex Gleason
|
d1527b2d94
|
Linux users must enable NFS for Vagrant
|
2017-04-06 12:16:39 -04:00 |
|
Ash Furrow
|
07c9d0d108
|
Updates slugignore.
|
2017-04-06 07:53:48 -04:00 |
|
Eugen Rochko
|
0db2a0c7c4
|
Fix wrong pubsub channel on public timelines
|
2017-04-06 04:03:23 +02:00 |
|
Eugen
|
f10668da16
|
Merge pull request #1013 from blackle/master
Catch more errors in process_follows so it doesn't fail
|
2017-04-06 02:35:34 +02:00 |
|
Eugen Rochko
|
fb6459d303
|
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again
|
2017-04-06 02:26:59 +02:00 |
|
blackle
|
70f485a9e7
|
Catch more errors in process_follows so it doesn't fail
|
2017-04-05 20:04:13 -04:00 |
|
Eugen
|
1e33e5c67f
|
Merge pull request #993 from foozmeat/patch-1
Use NFS for the shared folder because it dramatically decreases latency for git operations.
|
2017-04-05 23:26:44 +02:00 |
|
Eugen Rochko
|
cd68e54a7d
|
Split SalmonWorker into smaller parts, move profile updating into another job
|
2017-04-05 21:43:10 +02:00 |
|
James Moore
|
3f54a0eca0
|
Use NFS for the shared folder because it dramatically decreases latency for git operations.
|
2017-04-05 11:53:39 -07:00 |
|
Eugen
|
afc48578a4
|
Merge pull request #958 from yiskah/patch-1
Correct innacurate info and other fixes
|
2017-04-05 20:48:19 +02:00 |
|
Eugen Rochko
|
c9116f673f
|
Merge branch 'krainboltgreene-broadcast-to-worker'
|
2017-04-05 19:46:28 +02:00 |
|
Eugen Rochko
|
5189ce9cd1
|
Replace calls to FeedManager#inline_render and #broadcast
|
2017-04-05 19:45:18 +02:00 |
|
Eugen Rochko
|
21966f0af3
|
Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker
|
2017-04-05 19:29:46 +02:00 |
|
Eugen Rochko
|
06e3d9bdd8
|
Make sure Rabl is using Oj
|
2017-04-05 19:29:30 +02:00 |
|
Eugen
|
54329947ab
|
Fix wrong variable used in publish channel
|
2017-04-05 18:58:32 +02:00 |
|
Eugen
|
b9ddfff8f6
|
Add proper message to PushUpdateWorker, use redis directly
|
2017-04-05 18:48:41 +02:00 |
|
Eugen
|
d67e1fe44d
|
Merge branch 'master' into broadcast-to-worker
|
2017-04-05 18:44:33 +02:00 |
|
Jonathan Hurter
|
f210b2b7ef
|
Make scalingo doc clearer
|
2017-04-05 17:48:55 +02:00 |
|
Jonathan Hurter
|
2ecc791d9a
|
Fix wrong url in scalingo.json
|
2017-04-05 17:28:11 +02:00 |
|
shel
|
fd0096f899
|
Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
|
2017-04-05 10:58:41 -04:00 |
|
Eugen
|
b89f37e445
|
Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
|
2017-04-05 16:50:46 +02:00 |
|
Jonathan Hurter
|
8752dc9186
|
Add doc
|
2017-04-05 16:00:48 +02:00 |
|
Jonathan Hurter
|
18caabad8a
|
Use root repository url
|
2017-04-05 15:52:06 +02:00 |
|
Jonathan Hurter
|
3c7acd0ab6
|
Add Scalingo one click on readme
|
2017-04-05 15:33:19 +02:00 |
|
Eugen
|
437bc1880b
|
Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
|
2017-04-05 15:24:52 +02:00 |
|
Eugen
|
676763dbc8
|
Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
|
2017-04-05 15:24:40 +02:00 |
|
Eugen
|
10fa3627ea
|
Merge pull request #939 from JantsoP/master
More translation updates
|
2017-04-05 15:24:24 +02:00 |
|
Padraig Fahy
|
9efa03d2be
|
Adding mastodon.irish
|
2017-04-05 14:00:35 +01:00 |
|
Eugen
|
3a39a67901
|
Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
|
2017-04-05 14:57:38 +02:00 |
|
Eugen
|
db522ed61a
|
Merge pull request #931 from farlistener/patch-3
Typography on partY
|
2017-04-05 14:57:14 +02:00 |
|
Eugen
|
9c3c6f6e51
|
Merge pull request #936 from Angristan/patch-7
Add git and curl as dependencies
|
2017-04-05 14:57:01 +02:00 |
|
Jantso Porali
|
5c414eeb45
|
updated blocking translation
|
2017-04-05 14:53:35 +02:00 |
|
Jantso Porali
|
16d14e854b
|
updated two-way auth and preferences translation
|
2017-04-05 14:49:29 +02:00 |
|
Jantso Porali
|
d49612327a
|
updated translation for about page
|
2017-04-05 14:47:42 +02:00 |
|
Jonathan Hurter
|
ffa888d59f
|
Add node_modules and .cache to slugignore
|
2017-04-05 14:28:14 +02:00 |
|
Eugen Rochko
|
8f38353c4d
|
Only render public payload once in FanOutOnWrite
|
2017-04-05 14:26:17 +02:00 |
|
wxcafé
|
37bd8d45ed
|
Update List-of-Mastodon-instances.md
|
2017-04-05 14:21:45 +02:00 |
|
Angristan
|
0bd1bdfc44
|
Add git and curl as dependencies
In some VPS templates, they are not installed by default.
|
2017-04-05 14:11:08 +02:00 |
|
Jonathan Hurter
|
f3cc1e4416
|
Install nodejs before ruby
|
2017-04-05 13:53:30 +02:00 |
|
nicobz25
|
1e9b047d16
|
Merge branch 'master' into patch-1
|
2017-04-05 13:48:31 +02:00 |
|
Jonathan Hurter
|
05eba582ef
|
Add scalingo support
|
2017-04-05 13:45:03 +02:00 |
|
Eugen Rochko
|
6687c4a114
|
Add index on mentions status_id
|
2017-04-05 13:32:57 +02:00 |
|
Eugen Rochko
|
3cc7378924
|
Replace ActionCable broadcast call with simple redis publish
|
2017-04-05 13:28:46 +02:00 |
|
Cédric Levieux
|
06d3e7dbba
|
Typography on partY
|
2017-04-05 13:19:34 +02:00 |
|
nicobz25
|
6ea25d695a
|
Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
|
2017-04-05 13:13:09 +02:00 |