aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11615] Rename init_test to creation_test for clarityAndy Chase2013-06-261-0/+0
| | | | PHPBB3-11615
* 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
* | Merge remote-tracking branch 'github-exreaction/ticket/10896' into ↵Nils Adermann2013-02-244-3/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-exreaction/ticket/10896: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP
| * | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-043-3/+2
| | | | | | | | | | | | PHPBB3-10896
| * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-043-2/+10
| | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
* | | Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympusNils Adermann2013-02-241-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/11122: [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS.
| * | | [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11122
| * | | [ticket/11122] Add EXreaction to docs/AUTHORS.Andreas Fischer2013-02-241-0/+1
| | |/ | |/| | | | | | | PHPBB3-11122
* | | Merge remote-tracking branch 'github-bantu/ticket/7262' into develop-olympusNils Adermann2013-02-241-2/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | * github-bantu/ticket/7262: [ticket/7262] Add note about set_config() not updating is_dynamic. [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). [ticket/7262] Backport set_config() and set_config_count() docs from develop.
| * | [ticket/7262] Add note about set_config() not updating is_dynamic.Andreas Fischer2013-02-241-0/+3
| | | | | | | | | | | | PHPBB3-7262
| * | [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().Andreas Fischer2013-02-241-4/+6
| | | | | | | | | | | | | | | | | | | | | The logic is the other way around here in comparison to develop's phpbb_config_db class, so add examples to make things more clear. PHPBB3-7262
| * | [ticket/7262] Backport set_config() and set_config_count() docs from develop.Andreas Fischer2013-02-241-2/+16
|/ / | | | | | | PHPBB3-7262
* | Merge branch 'ticket/erangamapa/11196' into develop-olympusAndreas Fischer2013-02-121-1/+1
|\ \ | |/ |/| | | | | * ticket/erangamapa/11196: [ticket/11196] Changed 401 response message in session.php.
| * [ticket/11196] Changed 401 response message in session.php.erangamapa2013-02-121-1/+1
|/ | | | | | | In session.php 401 response message was "Not Authorized". I changed it to "Unauthorized". PHPBB3-11196
* Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
|\ | | | | | | | | * Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
| * [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | | | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
|\ \ | | | | | | | | | | | | * dhruvgoel92/ticket/11233: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| * | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | PHPBB3-10050
| * | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | PHPBB3-10050
* | | Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympusOleg Pudeyev2013-01-271-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11343: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
|/ / | | | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* | Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11337: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm.
| * | [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| | | | | | | | | | | | PHPBB3-11337
| * | [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| | | | | | | | | | | | | | | | | | | | | There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19, which is what 5.3 is currently aliased to. PHPBB3-11337
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 09:49:49 +0000