aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/igorw/9669' into developAndreas Fischer2011-03-071-30/+87
|\ | | | | | | | | | | | | | | | | * ticket/igorw/9669: [ticket/9669] Replace spaces with tabs [ticket/9669] Switch if/else to make the if positive [ticket/9669] Make sure normalize_nfc returns string [ticket/9669] Add isNormalized checks for performance [ticket/9669] Add native Normalizer support
| * [ticket/9669] Replace spaces with tabsIgor Wiedler2011-03-071-1/+1
| | | | | | | | PHPBB3-9669
| * [ticket/9669] Switch if/else to make the if positiveIgor Wiedler2011-03-061-33/+33
| | | | | | | | PHPBB3-9669
| * [ticket/9669] Make sure normalize_nfc returns stringIgor Wiedler2011-03-051-3/+3
| | | | | | | | | | | | Normalizer::normalize can return null, cast to a string. PHPBB3-9669
| * [ticket/9669] Add isNormalized checks for performanceIgor Wiedler2011-03-051-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Since isNormalized is less expensive than normalize[1] and normalization will be applied repeatedly in most cases[2], it's more efficient to check for isNormalized. [1] http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32718&p=208005#p208005 [2] phpBB 3.0 has a call to utf8_normalize_nfc wrapped around any multibyte request_var call. PHPBB3-9669
| * [ticket/9669] Add native Normalizer supportIgor Wiedler2011-03-051-30/+75
| | | | | | | | | | | | | | PHP 5.3 includes the previous pecl extension "intl" which has a native UTF-8 normalizer. PHPBB3-9669
* | Merge branch 'ticket/naderman/10080' into developNils Adermann2011-03-072-2/+25
|\ \ | | | | | | | | | | | | * ticket/naderman/10080: [ticket/10080] Allow resetting the request instance used by request_var.
| * | [ticket/10080] Allow resetting the request instance used by request_var.Nils Adermann2011-03-072-2/+25
| | | | | | | | | | | | PHPBB3-10080
* | | Merge branch 'develop-olympus' into developNils Adermann2011-03-073-206/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10081] remove $phpEx. [ticket/10081] Cleanup Template Tests.
| * \ \ Merge branch 'ticket/aptx/10081' into develop-olympusNils Adermann2011-03-073-206/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/aptx/10081: [ticket/10081] remove $phpEx. [ticket/10081] Cleanup Template Tests.
| | * | | [ticket/10081] remove $phpEx.Marek A. Ruszczynski2011-03-071-10/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10081
| | * | | [ticket/10081] Cleanup Template Tests.Marek A. Ruszczynski2011-03-073-199/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | There are no incomplete template tests anymore. PHPBB3-10081
* | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-071-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/naderman/10011: [ticket/10011] Removing __DIR__ uses I missed in previous commit
| * | | [ticket/10011] Removing __DIR__ uses I missed in previous commitNils Adermann2011-03-071-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10011
* | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-072-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * ticket/naderman/10011: [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
| * | | [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.Nils Adermann2011-03-072-7/+7
| | | | | | | | | | | | | | | | PHPBB3-10011
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-071-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * develop-olympus: [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
| * | 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 'develop-olympus' into developOleg Pudeyev2011-03-061-11/+12
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
| * | 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 'develop-olympus' into developAndreas Fischer2011-03-064-6/+36
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | * develop-olympus: [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/10059] Fix two misspellings of consistent. [ticket/9824] Add space after [ticket/12345] in prepared commit message. [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
| * | 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 'develop-olympus' into developOleg Pudeyev2011-03-021-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
| * | 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 'develop-olympus' into developOleg Pudeyev2011-03-021-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9915] "Length of ban:" is not displayed in ACP
| * | | 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 'develop-olympus' into developJoas Schilling2011-03-031-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10072] Added the POST_NUMBER template var
| * | | 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/bantu/9766' into developOleg Pudeyev2011-03-012-27/+0
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9766: [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
| * | | [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.Andreas Fischer2011-03-012-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code() methods. We never call it and it has a bogus body. PHPBB3-9766
* | | | Merge branch 'ticket/p/10070' into developAndreas Fischer2011-03-012-708/+708
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/p/10070: [ticket/10070] Fixed line endings after ticket/9549.
| * | | [ticket/10070] Fixed line endings after ticket/9549.Oleg Pudeyev2011-03-012-708/+708
|/ / / | | | | | | | | | PHPBB3-10070
* | | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-0125-237/+1218
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/9549: [ticket/9549] Display users in their primary group instead of their first group [ticket/9549] Change default value of "sort legend by group name" to false. [ticket/9549] Fix displaying empty groups [ticket/9549] Fix language strings. [ticket/9549] Only add group to legend/teampage when the checkbox is checked. [ticket/9549] New method move() to move a group more than 1 up/down. [ticket/9549] Fix some minor issues with descriptions and coding-guidelines. [ticket/9549] Throw an error when the given field-name is invalid. [ticket/9549] Make the class non static and extend delete_group function. [ticket/9549] Add template changes for subsilver2. [ticket/9549] Enhance teampage and legend functionality [ticket/9549] Add the module and files for the ACP. [ticket/9549] Update database with the new config values and columns [ticket/9549] Enhance teampage functionality with a new class, group_positions. Conflicts: phpBB/install/database_update.php
| * | | [ticket/9549] Display users in their primary group instead of their first groupJoas Schilling2011-02-252-1/+6
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Change default value of "sort legend by group name" to false.Joas Schilling2011-02-242-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Fix displaying empty groupsJoas Schilling2011-02-241-15/+20
| | | | | | | | | | | | | | | | PHPBB3-9549
| * | | [ticket/9549] Fix language strings.Joas Schilling2011-02-181-4/+4
| | | | | | | | | | | | | | | | PHPBB3-9549