Commit graph

17807 commits

Author SHA1 Message Date
Steffen van Bergerem
58c7478133
Remove messagebus_ruby_api gem
Messagebus closed in 2015. See https://web.archive.org/web/20150623093956/https://www.messagebus.com/ for more information.
2016-07-07 18:48:31 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions
Filter mentions on status message creation
2016-07-06 22:27:13 +02:00
Jonne Haß
5775647180
update changelog for #6905 [ci skip] 2016-07-06 01:58:32 +02:00
aoh0x7DE
d75f795cad Fix issue #6847 (#6905)
* Fix issue #6847
2016-07-06 01:57:23 +02:00
Steffen van Bergerem
5778e7b386
Remove .hound.yml [ci skip] 2016-07-06 01:31:13 +02:00
Jonne Haß
d460678c9a
add CodeClimate config 2016-07-06 00:59:16 +02:00
Jonne Haß
751654cdad Merge pull request #6907 from svbergerem/translations
Remove unused translations from diaspora.yml, add missing ones
2016-07-06 00:36:35 +02:00
Jonne Haß
29d071679b
use svg badges [ci skip] 2016-07-05 23:43:00 +02:00
Jonne Haß
bcd7894e59
add code coverage reporting 2016-07-05 23:35:53 +02:00
Steffen van Bergerem
bef5241512
Remove unused translations from diaspora.yml, add missing ones 2016-07-05 23:34:31 +02:00
Steffen van Bergerem
46cbc6e52a
Filter mentions on status message creation 2016-07-04 10:26:45 +02:00
Jonne Haß
9aaf58de12 Merge pull request #6901 from svbergerem/remove-unused-translations
Remove unused translations
2016-07-03 20:59:06 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Jakob Kramer
8d16270fcb
Remove unused strings from translation files 2016-07-03 10:18:08 +02:00
Dennis Schubert
cb1bfc2b3b
Merge pull request #6899 from svbergerem/cuke-notification-hidden-conversation
Add cuke for deleting conversations
2016-06-30 04:51:36 +02:00
Steffen van Bergerem
e67c3ace74
Add cuke for deleting conversations 2016-06-29 21:37:26 +02:00
Steffen van Bergerem
b2d26257d4
Use the correct flash message for new conversations 2016-06-29 21:37:00 +02:00
Dennis Schubert
7c6e7dbf0b
Merge branch 'stable' into develop 2016-06-28 22:06:35 +02:00
Dennis Schubert
8cd3f31da6
Merge branch 'master' into stable 2016-06-28 22:06:00 +02:00
Dennis Schubert
91bf63ec8a
Release 0.5.10.1 2016-06-28 22:05:21 +02:00
Dennis Schubert
8421289e3b
Re-add mysql2 to the Gemfile.lock 2016-06-28 22:05:17 +02:00
Dennis Schubert
eea8d6c6f4
Merge branch 'stable' into develop 2016-06-28 21:42:02 +02:00
Dennis Schubert
bb50744e47
Merge branch 'master' into stable 2016-06-28 21:41:46 +02:00
Dennis Schubert
f09827311a
Merge branch 'release/0.5.10.0' 2016-06-28 21:39:54 +02:00
Jonne Haß
18fc98d3aa Merge pull request #6895 from cmrd-senya/services-spec-fixup
Fix up nodeinfo tests
2016-06-28 00:15:08 +02:00
cmrd Senya
27ae4ff4fd
Fix up nodeinfo tests
Tests for nodeinfo failed if services config are non-default. Fix it
to pick the data for comparation from application settings.
2016-06-27 22:54:01 +03:00
Dennis Schubert
fddec62828
Merge pull request #6894 from SuperTux88/fetch-missing-persons
fetch unknown persons to generate url
2016-06-27 15:01:18 +02:00
Dennis Schubert
82c601c9e8
Merge pull request #6893 from SuperTux88/configure-typhoeus
configure concurrency and verbose in diaspora_federation gem
2016-06-27 15:00:56 +02:00
Benjamin Neff
3bfc4003fb fetch unknown persons to generate url 2016-06-27 14:43:19 +02:00
Benjamin Neff
f0d7e124a9 configure concurrency and verbose in diaspora_federation gem 2016-06-27 14:13:41 +02:00
Jonne Haß
09908a45fb
StatusMessage#raw_message returns empty string for NULL values
Previously the federation layer has written the empty string to the
database, now it writes nil/no value to it while our code still expects
the empty string in some cases. Restore the old assumption by returning
the empty string, the real raw value by now is available again in
StatusMessage#text for those that need it, such as validations or tests.
2016-06-27 12:07:11 +02:00
Jonne Haß
54026f4a63
update changelog [ci skip] 2016-06-27 10:40:26 +02:00
Jonne Haß
4b116e3498 Merge pull request #6890 from SuperTux88/connection-tester-refactoring
Improve ConnectionTester
2016-06-27 10:38:48 +02:00
Jonne Haß
e51344045a Merge pull request #6891 from SuperTux88/travis-order
start cucumber jobs before other jobs
2016-06-27 10:38:21 +02:00
Benjamin Neff
9a7ce382a9 start cucumber jobs before other jobs
the whole build is faster, if the workers start first with the longer
running jobs.
2016-06-27 05:19:02 +02:00
Benjamin Neff
c0ab42fecc check if links is an array in the JRD 2016-06-27 04:04:09 +02:00
Benjamin Neff
2a0e87957f validate NodeInfo json against schema in ConnectionTester 2016-06-27 04:04:09 +02:00
Benjamin Neff
da1a02892d log backtrace for unexpected errors in ConnectionTester 2016-06-27 04:04:09 +02:00
Jonne Haß
28ca071e79 Merge pull request #6889 from SuperTux88/bump-federation-gem
bump diaspora_federation to 0.1.1
2016-06-26 21:59:33 +02:00
Benjamin Neff
3497183645 bump diaspora_federation to 0.1.1
This fetches reshare roots if they are not available locally already.
2016-06-26 21:43:15 +02:00
Jonne Haß
5d318400c9
Diaspora::Federation::Receive::ignore_existing_guid returns nil when
ignoring the error message

Previously it returned the return value of Logging::Logger#warn, which
is true for loggers that log the warn level. However
Diaspora::Federation::Receive::receive_relayable checks the return value
for truthiness in order to decide whether to attempt to relay it,
resulting in a NoMethodError: undefined method `parent' for
true:TrueClass in Diaspora::Federation::Receive::relay_relayable

This change is cosmetic as the exception raised prevented any action
that shouldn't happen anyway, so there's no actual logic change.
2016-06-26 17:01:33 +02:00
Jonne Haß
36058f06c6 Merge pull request #6888 from SuperTux88/fix-message-sender
fix sender for messages for old pods
2016-06-26 14:31:24 +02:00
Benjamin Neff
9a3f653c45 fix sender for messages for old pods
Send a second message to remote recipients with conversation-author
as salmon author if the conversation-author is local.

The first dispatch will fail on old pods. New pods will ignore the
second message, if the guid already exist.
2016-06-26 14:05:52 +02:00
Jonne Haß
6ffbfe3943
Merge branch 'stable' into develop 2016-06-26 13:12:43 +02:00
Jonne Haß
13d841fe2b
Merge branch 'release/0.5.10.0' into stable 2016-06-26 13:12:22 +02:00
Jonne Haß
266ada3f24
script/server: check for main.js instead of home.css 2016-06-26 13:11:43 +02:00
Dennis Schubert
9a033c7f68 Merge pull request #6887 from SuperTux88/fix-relayable-retraction-sender
Fix relayable retraction sender
2016-06-26 11:12:53 +02:00
Benjamin Neff
9fda255add use the parent author of the target as sender for relayable retractions 2016-06-26 11:05:23 +02:00
Benjamin Neff
5e0b1dd28d use match_array for comment_service_spec 2016-06-26 10:43:27 +02:00