aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/8610] Throw an error when the dest topic isn't setTristan Darricau2014-05-271-1/+1
| | | | PHPBB3-8610
* [ticket/8610] Fix bookmarks when merging all the posts of a topicTristan Darricau2014-05-271-4/+18
| | | | PHPBB3-8610
* [ticket/8610] Merging topics does not handle bookmarks correctlyTristan Darricau2014-05-101-3/+17
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-8610 PHPBB3-8610
* Merge pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-082-9/+14
|\ | | | | | | | | | | | | | | | | | | [ticket/12451] Split lang vars in posting.php for plurals * Elsensee/ticket/12451: [ticket/12451] Remove duplicated lang var [ticket/12451] Use new line to concatenate strings [ticket/12451] Split TOO_MANY_CHARS vars for plurals [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
| * [ticket/12451] Remove duplicated lang varOliver Schramm2014-05-032-12/+10
| | | | | | | | PHPBB3-12451
| * [ticket/12451] Use new line to concatenate stringsOliver Schramm2014-05-031-2/+2
| | | | | | | | PHPBB3-12451
| * [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-032-3/+6
| | | | | | | | PHPBB3-12451
| * [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-032-3/+7
| | | | | | | | PHPBB3-12451
* | Merge pull request #2360 from Nicofuma/ticket/12025Joas Schilling2014-05-081-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12025] Post Preview no longer shows warnings * Nicofuma/ticket/12025: [ticket/12025] Apply DeMorgan [ticket/12025] Fixing the condition.... [ticket/12025] Don't show any error on preview if the message is empty [ticket/12025] Post Preview no longer shows warnings
| * | [ticket/12025] Apply DeMorganTristan Darricau2014-05-051-1/+1
| | | | | | | | | | | | PHPBB3-12025
| * | [ticket/12025] Fixing the condition....Nicofuma2014-04-281-1/+1
| | | | | | | | | | | | PHPBB3-12025
| * | [ticket/12025] Don't show any error on preview if the message is emptyNicofuma2014-04-271-1/+4
| | | | | | | | | | | | PHPBB3-12025
| * | [ticket/12025] Post Preview no longer shows warningsNicofuma2014-04-261-1/+1
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12025 PHPBB3-12025
* | | Merge pull request #2408 from prototech/ticket/12500Joas Schilling2014-05-081-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12500] Set a title attribute in user.img() * prototech/ticket/12500: [ticket/12500] Set a title attribute in user.img()
| * | | [ticket/12500] Set a title attribute in user.img()Cesar G2014-05-041-2/+8
| | | | | | | | | | | | | | | | PHPBB3-12500
* | | | Merge pull request #2414 from prototech/ticket/12440Joas Schilling2014-05-083-3/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12440] Set browser URL to point to specific post when using view=unread * prototech/ticket/12440: [ticket/12440] Use a more generic approach for replacing the URL. [ticket/12440] Set browser URL to point to specific post when using view=unread Conflicts: phpBB/styles/prosilver/template/viewtopic_body.html
| * | | | [ticket/12440] Use a more generic approach for replacing the URL.Cesar G2014-05-061-15/+71
| | | | | | | | | | | | | | | | | | | | PHPBB3-12440
| * | | | [ticket/12440] Set browser URL to point to specific post when using view=unreadCesar G2014-05-053-3/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-12440
* | | | | Merge pull request #2418 from Nicofuma/ticket/12402Joas Schilling2014-05-081-0/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins * Nicofuma/ticket/12402: [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
| * | | | | [ticket/12402] CAPTCHA plugin migration fails to detect missing pluginsTristan Darricau2014-05-061-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12402
* | | | | | Merge pull request #2419 from prototech/ticket/12510Joas Schilling2014-05-081-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12510] Convert & to & in build_url() when no params are stripped. * prototech/ticket/12510: [ticket/12510] Convert & to & in build_url() when no params are stripped.
| * | | | | | [ticket/12510] Convert & to & in build_url() when no params are stripped.Cesar G2014-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12510
* | | | | | | Merge pull request #2422 from Nicofuma/ticket/12428Joas Schilling2014-05-081-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12428] Incorrect from version in database update log entry * Nicofuma/ticket/12428: [ticket/12428] Use the database to store the original version number [ticket/12428] Incorrect from version in database update log entry
| * | | | | | | [ticket/12428] Use the database to store the original version numberTristan Darricau2014-05-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12428
| * | | | | | | [ticket/12428] Incorrect from version in database update log entryTristan Darricau2014-05-071-1/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12428 PHPBB3-12428
* | | | | | | Merge pull request #2423 from rxu/ticket/12511Joas Schilling2014-05-081-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12511] Add missing titles for profile fields in members group view * rxu/ticket/12511: [ticket/12511] Add missing titles for profile fields in members group view
| * | | | | | | [ticket/12511] Add missing titles for profile fields in members group viewrxu2014-05-071-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For memberlist group view in cases the group is presented with the group leader and group members, for members profile fields titles are missing: Posts, Joined, Last active and custom profile fields titles. PHPBB3-12511
* | | | | | | Merge pull request #2424 from VSEphpbb/ticket/12513Joas Schilling2014-05-085-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12513] Add simple_header head event with support for asset calls * VSEphpbb/ticket/12513: [ticket/12513] Add asset include support to simple header/footer in ACP [ticket/12513] Add simple_header head event with support for CSS assets calls
| * | | | | | | [ticket/12513] Add asset include support to simple header/footer in ACPMatt Friedman2014-05-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12513
| * | | | | | | [ticket/12513] Add simple_header head event with support for CSS assets callsMatt Friedman2014-05-073-0/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12513
* | | | | | | Merge pull request #2421 from n-aleha/ticket/12493Joas Schilling2014-05-081-8/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12493] Fix sql query for selection of users that have disabled PM * n-aleha/ticket/12493: [ticket/12493] Add functional test [ticket/12493] Fix sql query for selection of users that have disabled PM
| * | | | | | | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* | | | | | | Merge pull request #2400 from PayBas/ticket/12488Joas Schilling2014-05-075-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12488] Add user warning indication to viewtopic posts * PayBas/ticket/12488: [ticket/12488] subSilver2 fix (no longer displays if warnings = 0) [ticket/12488] Typo fix [ticket/12488] Removed <em> and removed anonymous check [ticket/12488] Add user warning indication to viewtopic posts
| * | | | | | | [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)PayBas2014-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know what I was thinking with this PHPBB3-12488
| * | | | | | | [ticket/12488] Typo fixPayBas2014-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12488
| * | | | | | | [ticket/12488] Removed <em> and removed anonymous checkPayBas2014-05-044-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12488
| * | | | | | | [ticket/12488] Add user warning indication to viewtopic postsPayBas2014-05-035-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12488
* | | | | | | | Merge pull request #2413 from prototech/ticket/12357Joas Schilling2014-05-071-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12357] Support routes in generate_smilies() function. * prototech/ticket/12357: [ticket/12357] Support routes in generate_smilies() function.
| * | | | | | | [ticket/12357] Support routes in generate_smilies() function.Cesar G2014-05-051-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12357
* | | | | | | Merge remote-tracking branch 'Elsensee/ticket/suheb/12185' into develop-ascraeusCesar G2014-05-061-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/suheb/12185: [ticket/12185] Fix and increase width [ticket/12185] Fixing the width of topic header for translation.
| * | | | | | | [ticket/12185] Fix and increase widthOliver Schramm2014-05-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12185
| * | | | | | | [ticket/12185] Fixing the width of topic header for translation.Suhaib Khan2014-04-261-2/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12185
* | | | | | | Merge pull request #2330 from Nicofuma/ticket/12421Joas Schilling2014-05-063-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12421] Don't parse [attachment] tags if user can't view them * Nicofuma/ticket/12421: [ticket/12421] Rebase and enable tests [ticket/12421] Don't parse [attachment] tags if user can't view them
| * | | | | | | [ticket/12421] Rebase and enable testsTristan Darricau2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12421
| * | | | | | | [ticket/12421] Don't parse [attachment] tags if user can't view themTristan Darricau2014-05-063-1/+11
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12421 PHPBB3-12421
* | | | | | | [ticket/12507] Move the 'require' statementTristan Darricau2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12507
* | | | | | | [ticket/12507] Add console command to purge the cacheTristan Darricau2014-05-063-0/+74
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12507
* | | | | | Merge pull request #2373 from Nicofuma/ticket/12459Joas Schilling2014-05-067-21/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12459] Unapproved posts/topics are not correctly handled in feeds * Nicofuma/ticket/12459: [ticket/12459] Change language strings [ticket/12459] Enable related tests [ticket/12459] Fix: Differentiating unapproved and deleted posts [ticket/12459] Fix: Soft deleted topics should appear in feeds [ticket/12459] Fix: the posts were always marked as unapproved
| * | | | | | [ticket/12459] Change language stringsTristan Darricau2014-05-052-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12459
| * | | | | | [ticket/12459] Fix: Differentiating unapproved and deleted postsTristan Darricau2014-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unapproved and deleted posts should not be displayed with the same message (POST_UNAPPROVED) PHPBB3-12459