lp:phpbb

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

Moved to GitHub.

8622. By git-gate on 2012-11-01

commit d866624ea7cbc4ff8e5515f66dbb984cbd565414
Merge: 790e644 0ba2bff
Author: Nils Adermann <email address hidden>
Date: Sat Sep 1 16:11:57 2012 +0200

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/10873] Change language for notice about undelivered, deleted PM.

8621. By git-gate on 2012-11-01

commit 790e64433d26da1e819c9eaa96ad812c402286db
Merge: 1128ff1 d908d93
Author: Nils Adermann <email address hidden>
Date: Sat Sep 1 07:05:29 2012 -0700

    Merge pull request #921 from imkingdavid/ticket/10444

    [ticket/10444] Do not default to the previous post edit reason.

8620. By git-gate on 2012-11-01

commit 1128ff1e580361db7f7ecc72d496fdd347cbe0f2
Merge: d0ce637 7cf49a8
Author: Andreas Fischer <email address hidden>
Date: Mon Aug 27 01:35:46 2012 +0200

    Merge remote-tracking branch 'mvinny/ticket/11065' into develop

    * mvinny/ticket/11065:
      [ticket/11065] Close li tag on topic display options at MCP

8619. By git-gate on 2012-11-01

commit d0ce637251da211b2e969f7a173d3bde97b0894b
Merge: 18039cf e1a4aa3
Author: Andreas Fischer <email address hidden>
Date: Sun Aug 26 18:56:09 2012 +0200

    Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

    * Fyorl/feature/attach-dl: (75 commits)
      [feature/attach-dl] Removed the use of some abbreviations
      [feature/attach-dl] Changed $files_added checks
      [feature/attach-dl] Renamed $post_id to $post_msg_id
      [feature/attach-dl] Fixed a comment
      [feature/attach-dl] Optimised an sql query
      [feature/attach-dl] Fixed the logic in an sql statement
      [feature/attch-dl] $forum_id cast to int
      [feature/attach-dl] Fixed $file_added to $files_added
      [feature/attach-dl] Moved definition of $archive_name
      [feature/attach-dl] Swapped the order of an if statement
      [feature/attach-dl] Cast variables to int
      [feature/attach-dl] Added $archive_path
      [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
      [feature/attach-dl] Renamed $count to $files_added
      [feature/attach-dl] Removed sprintf() use
      [feature/attach-dl] Removed need for array_keys()
      [feature/attach-dl] Added multiple attachment downloads to PMs
      [feature/attach-dl] Removed reliance on current($row)
      [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
      [feature/attach-dl] Moved PM authentication handling into own function
      ...

8618. By git-gate on 2012-11-01

commit 18039cfa6af73d6582145023b6a3e67788d7a948
Merge: 90d26bb 4db4731
Author: Nils Adermann <email address hidden>
Date: Sun Aug 26 15:22:12 2012 +0200

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php

8617. By git-gate on 2012-08-07

commit 03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0
Merge: 61eb015 1fcb269
Author: Oleg Pudeyev <email address hidden>
Date: Fri May 11 02:36:47 2012 -0400

    Merge PR #785 branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/10835] changing "e-mail" to "email"
      [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
      [ticket/10835] fixing misleading message in UCP

    Conflicts:
     phpBB/language/en/ucp.php

8616. By git-gate on 2012-08-07

commit 61eb0151f0bd9ea5a0f1b229fc80de35a4fac2cf
Merge: c136bed 4b3d807
Author: Oleg Pudeyev <email address hidden>
Date: Thu May 10 15:58:55 2012 -0400

    Merge PR #725 branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/9896] Links changed

8615. By git-gate on 2012-08-07

commit c136bedf07aa58d1c8db46337b2dc0f149bfb0ac
Merge: 1d0607c 12bf9b4
Author: Oleg Pudeyev <email address hidden>
Date: Thu May 10 14:43:14 2012 -0400

    Merge PR #799 branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/10881] Replace old (and unify) file headers in develop files.

8614. By git-gate on 2012-08-07

commit 1d0607cbb31865b5128a1a2b92b415386aee0788
Merge: 1a9b30b 0488d70
Author: Andreas Fischer <email address hidden>
Date: Wed May 9 13:30:09 2012 +0200

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/10843] Backport changes to install language.
      [ticket/10834] Backport general development language changes to 3.0.

    Conflicts:
     phpBB/docs/INSTALL.html
     phpBB/docs/README.html

8613. By git-gate on 2012-08-07

commit 1a9b30b87118333f0d58eaec3762fc1a579d7b8a
Merge: 30579ec 12dbcc7
Author: Andreas Fischer <email address hidden>
Date: Wed May 9 12:55:58 2012 +0200

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/10858] Move generic row seeking to DBAL
      [ticket/10858] Tests for row seeking with fetchfield()
      [ticket/10858] Fix MSSQL Native's row seeking behavior

    Conflicts:
     tests/dbal/select_test.php