Build: #1210 was successful Changes by Marc

Stages & jobs

  1. Default Stage

Code commits

phpBB Master

  • Marc

    Marc 573fe5ddf842be0bc6e5470afce57331ef31cbab

    Merge branch '3.3.x'

  • Marc

    Marc 8758cb641fa5aa35badedbbe5a993d368ce49419

    Merge pull request #6558 from marc1706/ticket/17204-master
    [ticket/17204] Update composer dependencies to latest versions -- master version

  • Marc

    Marc f6b4c5b70d14402dfd911d4af4992175961e6943 m

    Merge pull request #6557 from marc1706/ticket/17204
    [ticket/17204] Update composer dependencies to latest versions

  • Marc

    Marc d65141aa75d95a04ab6917f4e5a611a3a5a230b2

    Merge branch '3.3.x'

  • Marc

    Marc fe84120bf27dcd36ec613ea2e77bdcdfc3f1b423 m

    Merge pull request #6490 from rxu/ticket/16470
    [ticket/16470] Update user last visit time on session begin

  • rxu

    rxu 9e130333c02fcf11ae23c6924124d7658871beed m

    [ticket/16470] remove unneeded migration, adjust code
    PHPBB3-16470

    • phpBB/phpbb/db/migration/data/v33x/update_user_lastvisit_data.php (version 9e130333c02fcf11ae23c6924124d7658871beed)
    • phpBB/phpbb/session.php (version 9e130333c02fcf11ae23c6924124d7658871beed)
  • Marc

    Marc 8a951a6ad34e185215a84aee7f37602a84885657 m

    [ticket/17204] Update node dependencies
    PHPBB3-17204

    • package-lock.json (version 8a951a6ad34e185215a84aee7f37602a84885657)
    • package.json (version 8a951a6ad34e185215a84aee7f37602a84885657)
  • Marc

    Marc be9e833661e0e7f5619ab0dd2b2ab8fad4edd777 m

    [ticket/17204] Update composer dependencies on master
    PHPBB3-17204

    • phpBB/composer.lock (version be9e833661e0e7f5619ab0dd2b2ab8fad4edd777)
  • Marc

    Marc 101d8fd52e461c3b07bbe333930f7c5258a2303f m

    Merge branch 'ticket/17204' into ticket/17204-master

  • Marc

    Marc 2b7d8020b97f3a6b96cce52cc5d0be206fa9fc95 m

    [ticket/17204] Update composer to latest version
    PHPBB3-17204

    • composer.phar (version 2b7d8020b97f3a6b96cce52cc5d0be206fa9fc95)
  • Marc

    Marc bb7e7b682d408347b0c061f7235c98c9af2d9617 m

    [ticket/17204] Update composer dependencies to latest versions
    PHPBB3-17204

    • phpBB/composer.lock (version bb7e7b682d408347b0c061f7235c98c9af2d9617)
  • rxu

    rxu 7ba5f8f22aa334a27aa7f5074b0be32b2a351793 m

    [ticket/16470] Revert session_time sync back
    This reverts changes made by last 2 commits as they seem to break things.

    PHPBB3-16470

    • phpBB/includes/acp/acp_main.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • phpBB/includes/functions.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • phpBB/includes/functions_display.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • phpBB/memberlist.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • phpBB/phpbb/db/migration/data/v33x/update_user_lastvisit_data.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • phpBB/phpbb/session.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
    • tests/session/garbage_collection_test.php (version 7ba5f8f22aa334a27aa7f5074b0be32b2a351793)
  • rxu

    rxu f99d1a7a51116f04e606c149712068b1cce67fbc m

    [ticket/16470] Remove tests for user_lastvisit vs session_time sync
    PHPBB3-16470
    PHPBB3-14173

    • tests/session/garbage_collection_test.php (version f99d1a7a51116f04e606c149712068b1cce67fbc)
  • rxu

    rxu 33dfaa478c0349a7d52a2361674875c4aa8efe35 m

    [ticket/16470] Further do not rely on session_time displaying user activity
    session_time has not been updated during session_length, so relying on it last
    activity data will be incorrect, especially if session_length value is high.
    Thus rely on regular and properly updated user_lastvisit.
    Remove user_lastvisit vs with session_time sync for the same reason.
    Also get rid of the session_last_visit field as it floats between
    user_lastvisit and session_time and actually is meaningless.

    PHPBB3-16470
    PHPBB3-14173

    • phpBB/includes/acp/acp_main.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
    • phpBB/includes/functions.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
    • phpBB/includes/functions_display.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
    • phpBB/memberlist.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
    • phpBB/phpbb/db/migration/data/v33x/update_user_lastvisit_data.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
    • phpBB/phpbb/session.php (version 33dfaa478c0349a7d52a2361674875c4aa8efe35)
  • rxu

    rxu 735b8260632f0cd25a7a40b1f6b669ff2caa0d9f m

    [ticket/16470] Do not sync user last visit time with expired sessions time
    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/session.php (version 735b8260632f0cd25a7a40b1f6b669ff2caa0d9f)
  • rxu

    rxu bbe2b213108f94121e05008fff23ed9ed3424e9d m

    [ticket/16470] Correctly handle user last visit update on session create
    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/session.php (version bbe2b213108f94121e05008fff23ed9ed3424e9d)
  • rxu

    rxu 9e55d3cb44b7dc803192cd043c0646850a23eeea m

    [ticket/16470] Adjust user last visit time update logic
    Previous logic doesn't work correctly as session_time value got updated
    in regular manner, so that its 60 seconds lag with time_now
    can be unreachable in some cases. So update user_lastvisit if it lags
    for 60 sec of session_time.

    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/session.php (version 9e55d3cb44b7dc803192cd043c0646850a23eeea)
  • rxu

    rxu a14e8f8ce5c9ea788ae0d6d86b3cece6aa486b52 m

    [ticket/16470] Adjust method result type
    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/session.php (version a14e8f8ce5c9ea788ae0d6d86b3cece6aa486b52)
  • rxu

    rxu aefdd86020441bdc9f6032a82dd0da72860079ed m

    [ticket/16470] Add migration to update existing data
    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/db/migration/data/v33x/update_user_lastvisit_data.php (version aefdd86020441bdc9f6032a82dd0da72860079ed)
  • rxu

    rxu aafb5225387809f41ed432c1606cc454d3f5c908 m

    [ticket/16470] Update user last visit time on session begin
    Update user last visit time on session begin same way as on session create.

    PHPBB3-16470
    PHPBB3-14173

    • phpBB/phpbb/session.php (version aafb5225387809f41ed432c1606cc454d3f5c908)