aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/naderman/10040' into develop-olympusAndreas Fischer2011-03-071-0/+4
|\ | | | | | | | | * ticket/naderman/10040: [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
| * [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.Nils Adermann2011-03-071-0/+4
|/ | | | PHPBB3-10040
* Merge branch 'ticket/bantu/10075' into develop-olympusOleg Pudeyev2011-03-061-11/+12
|\ | | | | | | | | * ticket/bantu/10075: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
| * [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.Andreas Fischer2011-03-041-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove: - A_Jelly_Doughnut - dhn - TerraFrost Add: - nn- Move: - Brainy Rename: - Brainy -> ckwalsh PHPBB3-10075
* | Merge branch 'ticket/p/10059' into develop-olympusAndreas Fischer2011-03-062-2/+2
|\ \ | | | | | | | | | | | | * ticket/p/10059: [ticket/10059] Fix two misspellings of consistent.
| * | [ticket/10059] Fix two misspellings of consistent.Oleg Pudeyev2011-03-012-2/+2
| | | | | | | | | | | | PHPBB3-10059
* | | Merge branch 'ticket/p/9824' into develop-olympusAndreas Fischer2011-03-062-4/+34
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9824: [ticket/9824] Accept commit messages with less than perfect headings. [ticket/9824] Allow empty lines after ticket reference. [ticket/9824] Use printf instead of echo to render \n. [ticket/9824] Handle empty commit messages in commit-msg hook. [ticket/9824] Add space after [ticket/12345] in prepared commit message. [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
| * | [ticket/9824] Accept commit messages with less than perfect headings.Oleg Pudeyev2011-03-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Some commit messages exist only temporarily, because they are given on commits that are intended to be squashed. Accept such commit messages with a warning. PHPBB3-9824
| * | [ticket/9824] Allow empty lines after ticket reference.Oleg Pudeyev2011-03-011-1/+8
| | | | | | | | | | | | PHPBB3-9824
| * | [ticket/9824] Use printf instead of echo to render \n.Oleg Pudeyev2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead. PHPBB3-9824
| * | [ticket/9824] Handle empty commit messages in commit-msg hook.Oleg Pudeyev2011-03-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Git already handles the case of commit message being empty by aborting the commit and displaying a reasonably helpful message. If there is no commit message, the hook will exit with success exit code to let git do its thing. PHPBB3-9824
| * | [ticket/9824] Add space after [ticket/12345] in prepared commit message.Andreas Fischer2011-03-021-1/+1
| | | | | | | | | | | | PHPBB3-9824
| * | [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.Andreas Fischer2011-03-021-1/+1
| |/ | | | | | | PHPBB3-9824
* | Merge branch 'ticket/nickvergessen/9911' into develop-olympusOleg Pudeyev2011-03-021-2/+2
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9911: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| * | [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.Joas Schilling2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works. PHPBB3-9911
* | | Merge branch 'ticket/nickvergessen/9915' into develop-olympusOleg Pudeyev2011-03-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9915: [ticket/9915] "Length of ban:" is not displayed in ACP
| * | | [ticket/9915] "Length of ban:" is not displayed in ACPJoas Schilling2011-03-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we need to go back to "value", which we had before. PHPBB3-9915
* | | Merge branch 'ticket/samt/10072' into develop-olympusJoas Schilling2011-03-031-0/+1
|\ \ \ | |_|/ |/| | | | | | | | * ticket/samt/10072: [ticket/10072] Added the POST_NUMBER template var
| * | [ticket/10072] Added the POST_NUMBER template varSam Thompson2011-03-021-0/+1
|/ / | | | | | | PHPBB3-10072
* | Merge branch 'ticket/nickvergessen/10024' into develop-olympusIgor Wiedler2011-02-281-0/+1
|\ \ | |/ |/| | | | | * ticket/nickvergessen/10024: [ticket/10024] Populate unread information to template for styling issues.
| * [ticket/10024] Populate unread information to template for styling issues.Philippe Chevrier2011-02-281-0/+1
| | | | | | | | PHPBB3-10024
* | Merge branch 'ticket/raimon/9980' into develop-olympusIgor Wiedler2011-02-277-9/+9
|\ \ | | | | | | | | | | | | * ticket/raimon/9980: [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
| * | [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of ↵Raimon2011-01-087-9/+9
| | | | | | | | | | | | | | | | | | T_TEMPLATE_PATH PHPBB3-9980
* | | Merge branch 'ticket/naderman/9984' into develop-olympusNils Adermann2011-02-271-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/naderman/9984: [ticket/9984] Add a phing target that does not create packages.
| * | | [ticket/9984] Add a phing target that does not create packages.Nils Adermann2011-02-271-0/+1
|/ / / | | | | | | | | | PHPBB3-9984
* | | Merge branch 'task/session-tests' into develop-olympusIgor Wiedler2011-02-272-17/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/session-tests: [task/session-tests] Make result check independent of returned row order. [task/session-tests] By default the cache check now skips over db server info [task/session-tests] Correctly display message on session continue test failure [task/session-tests] Make the session id replacement of dataset values clearer
| * | | [task/session-tests] Make result check independent of returned row order.Nils Adermann2011-02-271-3/+4
| | | | | | | | | | | | | | | | PHPBB3-9732
| * | | [task/session-tests] By default the cache check now skips over db server infoNils Adermann2011-02-271-2/+9
| | | | | | | | | | | | | | | | PHPBB3-9732
| * | | [task/session-tests] Correctly display message on session continue test failureNils Adermann2011-02-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9732
| * | | [task/session-tests] Make the session id replacement of dataset values clearerNils Adermann2011-02-271-12/+32
| | | | | | | | | | | | | | | | PHPBB3-9732
* | | | Merge branch 'ticket/bantu/10009' into develop-olympusIgor Wiedler2011-02-271-19/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10009: [ticket/10009] Entries are always posts, update fields accordingly. [ticket/10009] Always show 'published' data in feed item statistics. [ticket/10009] Make atom:update output unconditional and before atom:published [ticket/10009] Send atom:updated whenever possible [ticket/10009] Differentiate published from updated in Atom feed
| * | | [ticket/10009] Entries are always posts, update fields accordingly.Andreas Fischer2011-02-211-7/+5
| | | | | | | | | | | | | | | | PHPBB3-10009
| * | | [ticket/10009] Always show 'published' data in feed item statistics.Andreas Fischer2011-02-211-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10009
| * | | [ticket/10009] Make atom:update output unconditional and before atom:publishedKevin Locke2011-02-211-9/+2
| | | | | | | | | | | | | | | | PHPBB3-10009
| * | | [ticket/10009] Send atom:updated whenever possibleKevin Locke2011-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For posts/topics which have not been edited/updated, use the creation date to populate atom:updated, as suggested by bantu. This should increase compatibility with user agents which expect an atom:updated element. PHPBB3-10009
| * | | [ticket/10009] Differentiate published from updated in Atom feedKevin Locke2011-02-211-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the handling of dates to differentiate between the date when an entry was published and the date on which it was last updated. Incorporate this information into the Atom feed by using <published> and <updated> appropriately according to sections 4.2.9 and 4.2.15 of the spec. PHPBB3-10009
* | | | Merge branch 'ticket/nickvergessen/10036' into develop-olympusAndreas Fischer2011-02-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10036: [ticket/10036] Use image from configuration file for displaying online-status.
| * | | | [ticket/10036] Use image from configuration file for displaying online-status.Joas Schilling2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10036
* | | | | Merge branch 'ticket/bantu/9912' into develop-olympusOleg Pudeyev2011-02-261-6/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * ticket/bantu/9912: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
| * | | | [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.Andreas Fischer2011-02-251-6/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also moves the code up to the point where we know that the user is a bot. Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314 PHPBB3-9912
* | | | Merge branch 'ticket/igorw/10060' into develop-olympusAndreas Fischer2011-02-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/10060: [ticket/10060] Fix test suite under MySQL
| * | | | [ticket/10060] Fix test suite under MySQLIgor Wiedler2011-02-251-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Regression from PHPBB3-10043, a typo caused the database tests to fail under MySQL. PHPBB3-10060
* | | | Merge branch 'ticket/callumacrae/7834' into develop-olympusOleg Pudeyev2011-02-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/7834: [ticket/7834] Topic time didn't update when first post was deleted
| * | | | [ticket/7834] Topic time didn't update when first post was deletedCallum Macrae2011-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the first post of a topic was deleted, the topic time didn't update - it should have changed to the time of the next post. This commit simply applies lefty74's patch posted in the ticket. It gets the post time of the next post from the database, and updates the thread accordingly. This patch is not my work at all and all credits go to lefty74, I just transferred it onto GitHub PHPBB3-7834
* | | | | Merge branch 'ticket/callumacrae/9872' into develop-olympusOleg Pudeyev2011-02-241-38/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/9872: [ticket/9872] Removed some useless code that broke delete_posts
| * | | | | [ticket/9872] Removed some useless code that broke delete_postsCallum Macrae2011-02-241-38/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the ACP, there is the option to delete a user and all their posts. This would then call the user_delete function and define $mode as 'remove'. On lines 485-521 was some code that would delete their topics, then after that there would be a call to delete_posts - which would also delete their topics. It would not update the board statistics, and the thread count would remain the same, even though several had been deleted. It stopped delete_topics functioning correctly, so delete_topics would not update the board statistics either. My solution to this is to delete lines 485-521 and allow delete_posts to call delete_topics, thus updating the thread count in the statistics. PHPBB3-9872
* | | | | Merge branch 'ticket/callumacrae/9997' into develop-olympusOleg Pudeyev2011-02-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/callumacrae/9997: [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
| * | | | | [ticket/9997] Fixed an inconsistency in the Moderator Control PanelCallum Macrae2011-02-241-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of the Approve / Disapprove buttons was inconsistent in the Moderator Control Panel - while on the main page and the moderation queue itself the Approve button was to the right of the Disapprove button, in the post details the Approve button was to the left of the Disapprove button. This very simple edit simply switches the position of these two buttons in the post details page in the mcp. PHPBB3-9995
* | | | | Merge branch 'ticket/nickvergessen/9874' into develop-olympusOleg Pudeyev2011-02-244-14/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9874: [ticket/9874] view_log() performs unneeded count query over all log entries.
| * | | | | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9874