aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
|
* Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-2/+8
|\ | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-274-5/+11
| |
* | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-1/+0
|\ \ | | | | | | | | | | | | * marc1706/ticket/11864: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| * | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
|/ / | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into ↵Nathan Guse2013-09-133-0/+23
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus
| * | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
|/ / | | | | | | PHPBB3-11811
* | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
|\ \ | | | | | | Update fabpot/goutte
| * | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11831
| * | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
| | | | | | | | | | | | PHPBB3-11831
* | | Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-3/+5
|\ \ \ | | | | | | | | [ticket/11829] Use report_closed to determine status in MCP report_details
| * | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-044-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
* | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
| * | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
| | | | | | | | | | | | A wrong fix version was assigned to PHPBB3-11288.
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-053-2/+11
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.Andreas Fischer2013-09-021-0/+3
| |
| * [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-024-5/+11
| |
* | Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympusAndreas Fischer2013-09-021-1/+1
|\ \ | | | | | | | | | | | | * imkingdavid/ticket/11823: [ticket/11823] Set up nginx server to match PHP files with characters after .php
| * | [ticket/11823] Set up nginx server to match PHP files with characters after .phpDavid King2013-09-021-1/+1
|/ / | | | | | | PHPBB3-11823
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-025-5/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| * Merge remote-tracking branch 'nickvergessen/ticket/11769' into ↵Andreas Fischer2013-09-025-5/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * nickvergessen/ticket/11769: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php
| | * [ticket/11769] Allow using 0 as poster nameJoas Schilling2013-09-021-1/+1
| | | | | | | | | | | | PHPBB3-11769
| | * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | | | | | | | | | | PHPBB3-11769
| | * [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | | | | | | | | | PHPBB3-11769
| | * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-232-6/+7
| | | | | | | | | | | | PHPBB3-11769
| | * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-232-2/+10
| |/ | | | | | | | | | | | | | | Only supply the username, when it is a guest posting or we edit and it was supplied, otherwise post_data might hold data of the post we quote, in which case username is the original poster, not the current one. PHPBB3-11769
* | Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympusJoas Schilling2013-09-023-3/+3
|\ \ | | | | | | | | | | | | * bantu/ticket/11821: [ticket/11821] Fix comma usage next to "You are receiving this notification".
| * | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
|/ / | | | | | | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821
* | Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympusJoas Schilling2013-08-261-0/+2
|\ \ | | | | | | | | | | | | * bantu/ticket/11799: [ticket/11799] Send anti abuse headers in "new password" emails.
| * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
|/ / | | | | | | PHPBB3-11799
* | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-201-1/+1
|\ \ | |/ | | | | | | * prep-release-3.0.12: [ticket/11802] replace $browser with $user->browser
| * Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12Andreas Fischer2013-08-201-1/+1
| |\ | | | | | | | | | | | | * dhruvgoel92/ticket/11802: [ticket/11802] replace $browser with $user->browser
| | * [ticket/11802] replace $browser with $user->browserDhruv2013-08-201-1/+1
| |/ | | | | | | PHPBB3-11802
* | Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympusAndreas Fischer2013-08-192-18/+18
|\ \ | | | | | | | | | | | | * Prosk8er/ticket/11801: [ticket/11801] removed some whitespace and added missing semi colon's in css
| * | [ticket/11801] removed some whitespace and added missing semi colon's in cssProsk8er2013-08-192-18/+18
|/ / | | | | | | PHPBB3-11801
* | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-182-2/+2
|\ \ | | | | | | | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove inline color in memberlist_view
| * | [ticket/11789] Remove inline color in memberlist_viewVjacheslav Trushkin2013-08-182-2/+2
| | | | | | | | | | | | PHPBB3-11789
* | | Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympusAndreas Fischer2013-08-184-5/+13
|\ \ \ | |/ / | | | | | | | | | * cyberalien/ticket/11789: [ticket/11789] Remove colors from HTML code
| * | [ticket/11789] Remove colors from HTML codeVjacheslav Trushkin2013-08-144-5/+13
| | | | | | | | | | | | PHPBB3-11789
* | | Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympusAndreas Fischer2013-08-161-10/+10
|\ \ \ | | | | | | | | | | | | | | | | * rechosen/ticket/11794: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
| * | | [ticket/11794] Add missing array element commas to docs/coding-guidelines.htmlrechosen2013-08-161-10/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794
* | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-154-103/+200
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| * Merge remote-tracking branch 'nickvergessen/ticket/11775' into ↵Andreas Fischer2013-08-154-103/+200
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * nickvergessen/ticket/11775: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| | * [ticket/11775] Fix doc blocks syntaxJoas Schilling2013-08-151-1/+1
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Remove spaces at line endsJoas Schilling2013-08-151-4/+4
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Split test into multiple stepsJoas Schilling2013-08-121-1/+25
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Add functional test for moving the last postJoas Schilling2013-08-091-0/+43
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Backport moving of the posting functions to 3.0Joas Schilling2013-08-082-101/+131
| | | | | | | | | | | | PHPBB3-11775
| | * [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| |/ | | | | | | PHPBB3-11775
* | Merge remote-tracking branch 's9e/ticket/11762' into develop-olympusJoas Schilling2013-08-032-2/+40
|\ \ | | | | | | | | | | | | | | | | | | * s9e/ticket/11762: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-26 04:39:17 +0000