Erwan Leboucher
0c4e9fdda0
Merge branch 'master' into patch-4
2017-04-07 12:43:56 +02:00
Eugen Rochko
9bb84337a7
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
Eugen Rochko
e3a3422a65
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
Eugen Rochko
a1c63cb01d
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
Eugen Rochko
624a9a7136
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
Eugen
1781fcaea4
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
Eugen
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
Sergei Č
44ded06f3b
Update List-of-Mastodon-instances.md
2017-04-07 11:54:41 +03:00
Sergei Č
8e7d0bda40
Update List-of-Mastodon-instances.md
2017-04-07 11:54:41 +03:00
Eugen
24c77e57b2
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ( #1124 )
...
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
Eugen
6d6a429af8
Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ( #1124 )
...
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder
StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker
PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.
All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri
* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
Jason Rhodes
af34bcad02
Email service options :P
...
Small addition in case people want email service options, sparkpost.com gives you 100k/mo free
2017-04-06 22:48:17 -04:00
Jason Rhodes
5d43a9cae2
Email service options :P
...
Small addition in case people want email service options, sparkpost.com gives you 100k/mo free
2017-04-06 22:48:17 -04:00
Tristan Mahé
a80680cf3f
updated instance hostname
2017-04-06 17:18:40 -07:00
Tristan Mahé
8a4ff30ceb
updated instance hostname
2017-04-06 17:18:40 -07:00
Vladimir Mincev
bfe3d5a719
Update Production-guide.md
...
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
Vladimir Mincev
56f4a94e7b
Update Production-guide.md
...
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
Eugen Rochko
b184c13102
Low-hanging fruit of query optimization, these indices were missing
2017-04-07 00:04:38 +02:00
Eugen Rochko
31597fd377
Low-hanging fruit of query optimization, these indices were missing
2017-04-07 00:04:38 +02:00
YDrogen
cee4b3a359
Added masto.razrnet.fr
2017-04-06 23:59:56 +02:00
YDrogen
4b08b7c502
Added masto.razrnet.fr
2017-04-06 23:59:56 +02:00
Eugen
b2410a382a
Merge pull request #1100 from mjankowski/mj-reduce-image-size
...
Reduce size of background-photo.jpeg
2017-04-06 22:59:48 +02:00
Eugen
8cb7d157bd
Merge pull request #1100 from mjankowski/mj-reduce-image-size
...
Reduce size of background-photo.jpeg
2017-04-06 22:59:48 +02:00
Eugen
de9e454ba5
Merge pull request #1103 from alimony/vagrant-tweaks-01
...
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:58:44 +02:00
Eugen
acf10a2c87
Merge pull request #1103 from alimony/vagrant-tweaks-01
...
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:58:44 +02:00
Markus Amalthea Magnuson
ed4d3c53be
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:34:59 +02:00
Markus Amalthea Magnuson
7596de1aec
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:34:59 +02:00
Matt Jankowski
7411863663
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Matt Jankowski
97ae53daa8
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Eugen
b7d04bd252
Merge pull request #1088 from Wonderfall/master
...
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Eugen
cd77c75d6c
Merge pull request #1088 from Wonderfall/master
...
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Tristan Mahé
fe26dd71ad
Added pericles.world in the list of instances
2017-04-06 12:05:37 -07:00
Tristan Mahé
cfbd90cf44
Added pericles.world in the list of instances
2017-04-06 12:05:37 -07:00
Wonderfall
9e2f235405
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
Wonderfall
ed2bfdee67
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
Wonderfall
b2e3d99f82
add metadata to Dockerfile
2017-04-06 20:57:16 +02:00
Wonderfall
a3318814e1
add metadata to Dockerfile
2017-04-06 20:57:16 +02:00
isati
7b92127188
Add manx.social instance
2017-04-06 19:31:25 +01:00
isati
acf6436a99
Add manx.social instance
2017-04-06 19:31:25 +01:00
Erwan Leboucher
a1e37a05f9
Update List-of-Mastodon-instances.md
2017-04-06 20:18:56 +02:00
Erwan Leboucher
a0f1f9c664
Update List-of-Mastodon-instances.md
2017-04-06 20:18:56 +02:00
kadiix
7006cbe5e1
Merge branch 'master' into patch-1
2017-04-06 19:33:36 +02:00
kadiix
f0d1107c53
Merge branch 'master' into patch-1
2017-04-06 19:33:36 +02:00
kadiix
81bb50a15b
Update List-of-Mastodon-instances.md
2017-04-06 19:33:17 +02:00
kadiix
02c1ad5347
Update List-of-Mastodon-instances.md
2017-04-06 19:33:17 +02:00
Eugen
513456fa36
Merge pull request #1038 from wade-r/optimize-dockerfile
...
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
Eugen
fa494dbb1d
Merge pull request #1038 from wade-r/optimize-dockerfile
...
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
kadiix
5d5bda0c72
Merge branch 'master' into patch-1
2017-04-06 19:32:31 +02:00
kadiix
a736b28646
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