aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* 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
* | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-02-241-18/+32
|\ \ | |/ | | | | | | | | | | | | | | * ticket/11358: [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user.
| * [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| | | | | | | | | | | | | | | | Replaced the parameter name 'defaultbylink' to a meaningful name 'set_default_on_all'. Parameter is used for making all users default for selected group in acp_groups.php. PHPBB3-11358
| * [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| | | | | | | | | | | | | | | | | | Changed the action parameter value to recognize whether 'Make default group for every member' is clicked. If so execute a seperate code block under switch statement for $action and add all the users as default for the group. PHPBB3-11358
| * [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| | | | | | | | | | | | | | | | | | Detect whether link is clicked or form is posted for making users default for a group. If form is posted and no users are selected, validation happens and displays an error message. When the link is clicked, all the users will be default users for that group. PHPBB3-11358
| * [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| | | | | | | | | | | | | | | | | | Error was thrown when no users are selected before executing the code chunk which manually adds all the user to make the group default. Removed this code and referred $mark_ary instead of $name_ary which will not have selected user ids. PHPBB3-11358
| * [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
|/ | | | | | | | | | | In group membership management, if you perform the action 'Make group default for member' without selecting any user, a confirm box will be displayed and will show a success message after confirming. Added a new condition to fix this issue in acp_groups.php. It will check weather any users are selected before performing above action. PHPBB3-11358
* Merge branch 'ticket/11355' into develop-olympusNils Adermann2013-02-241-1/+5
|\ | | | | | | | | | | * ticket/11355: [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected.
| * [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| | | | | | | | | | | | | | Earlier PR was referring wrong variable $name_ary. Changed it to $mark_ary which actually contains selected user ids. PHPBB3-11355
| * [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
|/ | | | | | | | | | | In ACP group membership management, if you select 'remove member from group' without selecting any users and submit,it will display a wrong error after confirmbox. Since no users are selected, this should not go even until confirmbox. Added a new condition to check weather any users are selected when the action is 'deleteusers' in acp_groups.php and disply a correct error. PHPBB3-11355
* Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
|\ | | | | | | | | * github-bantu/ticket/11361: [ticket/11361] Make sure that array passed to strtr() has the proper format.
| * [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array which results in an E_NOTICE being thrown for 'Array to string conversion' on PHP 5.4. Ensure that the array passed to strtr() is one-dimensional by filtering out non-string values. PHPBB3-11361
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 02:19:47 +0000