Jonne Haß
4c750c8784
Merge branch 'master' into stable
2016-06-07 14:04:22 +02:00
Jonne Haß
0bc8e54afd
Update Nokogiri to 1.6.8
...
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29, addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
2016-06-07 13:51:33 +02:00
Jonne Haß
c8aa323d13
Set ca_file explicitly for the mail gem too
2016-06-07 13:11:32 +02:00
Jonne Haß
27569d4baa
OpenSSL verification modes other than none and peer make no sense for
...
TLS client connection, remove them from the examples.
2016-06-07 12:29:21 +02:00
Dennis Schubert
db5714d75f
updated 73 locale files [ci skip]
2016-05-21 19:00:35 +02:00
Dennis Schubert
a2864b9f40
Merge branch 'release/0.5.9.0'
2016-05-17 03:05:43 +02:00
sjain1107
4cd2f1d9c1
Add inviter diaspora-ID to the invite email #6796
...
closes #6817
2016-05-06 02:20:31 +02:00
Dennis Schubert
ec6ad16d94
Merge branch 'release/0.5.8.0'
2016-04-04 03:10:13 +02:00
Dennis Schubert
eba9e8f829
Prepare 0.5.9.0 cycle
...
[ci skip]
2016-03-30 16:52:00 +02:00
Benjamin Neff
69f08a4a7e
add fetch callbacks
2016-03-30 10:01:54 +02:00
Benjamin Neff
a3ed9da210
changes for new federation-gem version
2016-03-30 09:45:46 +02:00
Dennis Schubert
6270e22226
Start hotfix 0.5.7.1
2016-03-08 22:25:21 +01:00
Dennis Schubert
fbabc541ae
updated 111 locale files [ci skip]
2016-02-22 11:26:04 +01:00
Dennis Schubert
56ebcc7600
Remove version number padding
...
[ci skip]
2016-02-22 04:58:36 +01:00
Dennis Schubert
81ced55fed
Merge branch 'release/0.5.7.0'
2016-02-22 04:53:06 +01:00
Steffen van Bergerem
9eb0dddb1a
Speed up asset serving in development
...
closes #6702
2016-02-16 11:19:04 +01:00
Dennis Schubert
24c24374bf
Start 0.5.8.0 cycle [ci skip]
2016-02-15 01:49:15 +01:00
Steffen van Bergerem
ac5a7746e2
Remove contacts_title method and translations
...
closes #6687
2016-02-09 12:42:21 +01:00
Dennis Schubert
72fe5a79c2
Prepeare 0.5.6.3 hotfix-hotfix
2016-01-26 14:59:33 +01:00
Dennis Schubert
c04ee239c6
Prepare 0.5.6.2 hotfix
2016-01-26 14:26:10 +01:00
Dennis Schubert
64a780c831
Prepare 0.5.6.1 hotfix
2016-01-21 20:47:44 +01:00
tamatsyk
960e651764
internationalize controller rescue_from text
...
Fix typos
change forbitten to forbidden
fix styling issue and copypaste
improve code style for aspec_memberships_controller.rb with rubocop
fix styling issues
aligned elements of hash literals
fix typo
fix locale name and styling of its usage
fix failing tests
closes #6554
2016-01-20 21:37:02 +01:00
Dennis Schubert
5aef0441e8
Merge branch 'release/0.5.6.0'
2016-01-13 23:09:51 +01:00
Benjamin Neff
4cb6afdc94
fix plurals (10-19 was handled as 'one')
...
closes #6630
2016-01-12 16:25:26 +01:00
Dennis Schubert
65a28fcde0
Start 0.5.7.0 cycle
...
[ci skip]
2016-01-06 01:04:27 +01:00
Jonne Haß
d025cc38d3
Drop another plurals hack at aspects
...
It doesn't look used anymore either
2016-01-05 21:33:41 +01:00
Jonne Haß
237445d41b
Drop plurals hack at the contacts key
...
as it's not even used anymore and confuses WTI
2015-12-31 14:20:10 +01:00
Benjamin Neff
9f8e018422
add subscribe url to webfinger
2015-12-30 14:50:34 +01:00
Benjamin Neff
082e300a40
remove PublicsController completely
2015-12-30 14:50:34 +01:00
Benjamin Neff
5c8f0c1671
create queue callbacks and remove receive routes
2015-12-30 14:50:34 +01:00
Benjamin Neff
24f5244f76
move glue code back to the initializer
2015-12-30 14:48:38 +01:00
Steffen van Bergerem
4cb2575474
Add media.ccc.de as trusted oEmbed endpoint
2015-12-28 16:42:34 +01:00
Besnik Bleta
680955ad8c
Update for sq translation
2015-12-27 17:49:39 +01:00
Dennis Schubert
3ac340e03e
Prepeare 0.5.5.1 hotfix
2015-12-20 00:06:19 +01:00
cmrd Senya
922d26f976
Implement integration tests for the federation messages receive feature
...
These are some initial tests, more to come.
It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
2015-12-13 12:24:52 +01:00
Stéphane Guillou
2f4b817c46
Fix missing word in locked account message
...
closes #6577
2015-12-04 06:55:10 +01:00
Jonne Haß
29d10a42f8
start 0.5.6.0 cycle
2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7
freeze 0.5.5.0
2015-11-23 03:10:46 +01:00
Jonne Haß
bbb348ea5b
updated 32 locale files [ci skip]
2015-11-22 16:02:28 +01:00
Lincoln Stoll
6ac6dc1059
Don't set key for logfile on Heroku
...
This fixes the issue reported in #5947 . Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.
closes #6500
2015-10-14 11:00:42 +02:00
Dennis Schubert
9df2cb7290
Prepare 0.5.5.0 release
...
[ci skip]
2015-10-12 03:41:38 +02:00
Steffen van Bergerem
f7bd0bbb24
DRY app/router.js
2015-10-09 17:45:51 +02:00
Jonne Haß
c5819b9c57
Enable SQL logging by default in development mode
2015-10-05 15:22:28 +02:00
Achilleas Pipinellis
9888b4ce43
Add option to set a pid file for unicorn in diaspora.yml
...
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid
closes #6411
2015-09-19 11:33:04 +02:00
realtin
15b186518c
add moderators to report email recievers
...
and refactor coding style according to pull request comments
(#5324 )
2015-09-07 12:31:25 +02:00
Jonne Haß
c0da031e33
Merge branch 'release/0.5.3.0' into stable
2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718
updated 60 locale files [ci skip]
2015-09-06 13:53:41 +02:00
Jonne Haß
ca5fa14376
Merge branch 'release/0.5.3.0' into stable
2015-09-03 21:39:13 +02:00
Lukas Matt
23c016cf36
Update wiki links in diaspora config
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-03 21:38:56 +02:00
Dennis Schubert
f75a6147a5
Bump version number
...
[ci skip]
2015-09-01 03:52:06 +02:00
