Skip to content
Commits on Jun 30, 2016
  1. @denschub

    Merge pull request #6899 from svbergerem/cuke-notification-hidden-con…

    …versation
    
    Add cuke for deleting conversations
    denschub committed Jun 30, 2016
Commits on Jun 29, 2016
  1. @svbergerem
  2. @svbergerem
Commits on Jun 28, 2016
  1. @denschub
  2. @denschub
  3. @denschub

    Release 0.5.10.1

    denschub committed Jun 28, 2016
  4. @denschub
  5. @denschub
  6. @denschub
  7. @denschub

    Merge branch 'release/0.5.10.0'

    denschub committed Jun 28, 2016
Commits on Jun 27, 2016
  1. @jhass

    Merge pull request #6895 from cmrd-senya/services-spec-fixup

    Fix up nodeinfo tests
    jhass committed on GitHub Jun 28, 2016
  2. @cmrd-senya

    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.
    cmrd-senya committed Jun 27, 2016
  3. @denschub

    Merge pull request #6894 from SuperTux88/fetch-missing-persons

    fetch unknown persons to generate url
    denschub committed Jun 27, 2016
  4. @denschub

    Merge pull request #6893 from SuperTux88/configure-typhoeus

    configure concurrency and verbose in diaspora_federation gem
    denschub committed Jun 27, 2016
  5. @SuperTux88
  6. @SuperTux88
  7. @jhass

    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.
    jhass committed Jun 27, 2016
  8. @jhass

    update changelog [ci skip]

    jhass committed Jun 27, 2016
  9. @jhass

    Merge pull request #6890 from SuperTux88/connection-tester-refactoring

    Improve ConnectionTester
    jhass committed on GitHub Jun 27, 2016
  10. @jhass

    Merge pull request #6891 from SuperTux88/travis-order

    start cucumber jobs before other jobs
    jhass committed on GitHub Jun 27, 2016
  11. @SuperTux88

    start cucumber jobs before other jobs

    the whole build is faster, if the workers start first with the longer
    running jobs.
    SuperTux88 committed Jun 27, 2016
  12. @SuperTux88
  13. @SuperTux88
  14. @SuperTux88
Commits on Jun 26, 2016
  1. @jhass

    Merge pull request #6889 from SuperTux88/bump-federation-gem

    bump diaspora_federation to 0.1.1
    jhass committed on GitHub Jun 26, 2016
  2. @SuperTux88

    bump diaspora_federation to 0.1.1

    This fetches reshare roots if they are not available locally already.
    SuperTux88 committed Jun 26, 2016
  3. @jhass

    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.
    jhass committed Jun 26, 2016
  4. @jhass

    Merge pull request #6888 from SuperTux88/fix-message-sender

    fix sender for messages for old pods
    jhass committed on GitHub Jun 26, 2016
  5. @SuperTux88

    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.
    SuperTux88 committed Jun 26, 2016
  6. @jhass

    Merge branch 'stable' into develop

    jhass committed Jun 26, 2016
  7. @jhass
  8. @jhass
  9. @denschub

    Merge pull request #6887 from SuperTux88/fix-relayable-retraction-sender

    Fix relayable retraction sender
    denschub committed Jun 26, 2016
  10. @SuperTux88
  11. @SuperTux88
Something went wrong with that request. Please try again.