aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| | | | | | | | | | | | PHPBB3-11542
| * | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
| | | | | | | | | | | | PHPBB3-11542
* | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into ↵Andreas Fischer2013-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
| * | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the script would incorrectly remove the word "install" from the script_path when trying to remove the last folder in the path named "/install". This would lead to issues when the path you are installing phpBB contained "install". For example "/install_test/install" would become "/_test". This change gets the parent folder instead of replacing all "install". $name contains /install_test/install/index.php from start and running dirname() gives /install_test/install. Running dirname once more gives the parent folder of install, /install_test. PHPBB3-11536
* | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11545: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| * | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-162-5/+26
|/ / / | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
* | | Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympusAndreas Fischer2013-05-152-0/+64
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11541: [ticket/11541] Add unit tests for style_select()
| * | | [ticket/11541] Add unit tests for style_select()Joas Schilling2013-05-142-0/+64
| | |/ | |/| | | | | | | PHPBB3-11541
* | | Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympusAndreas Fischer2013-05-152-1/+2
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11546: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| * | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-152-1/+2
|/ / / | | | | | | | | | PHPBB3-11546
* | | Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympusAndreas Fischer2013-05-151-0/+34
|\ \ \ | |_|/ |/| | | | | | | | * nickvergessen/ticket/11540: [ticket/11540] Add unit tests for is_absolute()
| * | [ticket/11540] Add unit tests for is_absolute()Joas Schilling2013-05-141-0/+34
| |/ | | | | | | PHPBB3-11540
* | Merge pull request #1403 from bantu/ticket/11105Nils Adermann2013-05-122-2/+2
|\ \ | |/ |/| [ticket/11105] Add mandatory space to content part of meta http-equiv=re...
| * [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
| | | | | | | | | | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* | Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
|\ \ | |/ |/| [ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
| * [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
| | | | | | | | PHPBB3-11324
* | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
|\ \ | |/ |/| | | | | | | * naderman/ticket/11529: [ticket/11529] Format markdown code correctly [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
| * [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| | | | | | | | PHPBB3-11529
| * [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
|/ | | | PHPBB3-11529
* Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
|\ | | | | [ticket/11513] Install PHPUnit via Composer
| * [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
|/ | | | PHPBB3-11513
* Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
|\ | | | | [ticket/11526] Increase composer minimum-stability from beta to stable
| * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | | | | | | PHPBB3-11526
| * [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| | | | | | | | PHPBB3-11526
| * Merge branch 'ticket/11527' into ticket/11526Andreas Fischer2013-05-091-0/+0
| |\ | | | | | | | | | | | | * ticket/11527: [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
* | \ Merge pull request #1392 from bantu/ticket/11527Nils Adermann2013-05-091-0/+0
|\ \ \ | |/ / |/| / | |/ [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
| * [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.Andreas Fischer2013-05-091-0/+0
|/ | | | PHPBB3-11527
* Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-067-28/+42
|\ | | | | | | | | | | * MGaetan89/ticket/11144: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-1/+1
| | | | | | | | | | | | Replace spaces with tabs PHPBB3-11144
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-067-28/+42
| | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
* | Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympusAndreas Fischer2013-05-021-1/+1
|\ \ | | | | | | | | | | | | * hjpotter92/ticket/11517: [ticket/11517] Fix list numbering
| * | [ticket/11517] Fix list numberinghjpotter922013-05-021-1/+1
|/ / | | | | | | PHPBB3-11517
* | Merge pull request #1358 from MGaetan89/ticket/9975Nils Adermann2013-04-242-1/+2
|\ \ | |/ |/| [ticket/9975] Translate missing style error message
| * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-212-1/+2
|/ | | | | | | The error message about missing style data was not translated PHPBB3-9975
* Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympusAndreas Fischer2013-04-151-0/+3
|\ | | | | | | | | | | * dhruvgoel92/ticket/11493: [ticket/11493] add checks for Notice and Warning [ticket/11493] add check for phpBB Debug in functional tests
| * [ticket/11493] add checks for Notice and WarningDhruv2013-04-151-0/+2
| | | | | | | | PHPBB3-11493
| * [ticket/11493] add check for phpBB Debug in functional testsDhruv2013-04-151-0/+1
| | | | | | | | PHPBB3-11493
* | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-04-121-41/+42
|\ \ | |/ |/| | | | | | | * ticket/11358: [ticket/11358] Removed all trailing white spaces. [ticket/11358] Fixed the code according to coding guidlines.
| * [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | | | | | | | | | | | Removed all trailing white spaces with new lines. PHPBB3-11358
| * [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
| | | | | | | | | | | | | | Added proper indentation and new line after break in switch statement. PHPBB3-11358
* | Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
|\ \ | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/6723: [ticket/6723] Show info that message has been deleted before delivery
| * | [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the message has been deleted before the delivery it will still show in the message history, although with an empty message. This patch will change that behavior to showing the info that it has been deleted before it was delivered in red letters. The red letters ensure that users won't mistake the info for the actual message. PHPBB3-6723
* | | Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympusNathaniel Guse2013-03-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11368: [ticket/11368] Fix background color for PM report rows by using accessing var.
| * | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
|/ / | | | | | | PHPBB3-11368
* | Merge remote-tracking branch 'naderman/ticket/10986' into develop-olympusAndreas Fischer2013-02-241-1/+23
|\ \ | | | | | | | | | | | | * naderman/ticket/10986: [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
| * | [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
|/ / | | | | | | | | | | | | Rather than send invalid message ids with a missing domain part we try to read one from $_SERVER and otherwise use phpbb.generated PHPBB3-10986
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 13:19:41 +0000