1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

11591 Commits

Author SHA1 Message Date
Marc Alexander
1fae7720e4 [ticket/11538] Fix incorrect regex and test for duplicate # in color string
PHPBB3-11538
2013-05-14 21:27:25 +02:00
Marc Alexander
a547ba3f9d [ticket/11538] Use regex for testing color value and improve tests
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
2013-05-14 19:44:55 +02:00
Marc Alexander
b7b0b0ccc3 [ticket/11538] Make sure group color can't exceed maximum of 6 characters
In order to prevent future issues with this, a basic set of functional
tests for the UCP groups manage page have been added.

PHPBB3-11538
2013-05-14 13:43:53 +02:00
Nils Adermann
45e014d35d Merge pull request #1403 from bantu/ticket/11105
[ticket/11105] Add mandatory space to content part of meta http-equiv=re...
2013-05-12 14:05:53 -07:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.
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
2013-05-12 22:57:40 +02:00
Nils Adermann
b347986923 Merge pull request #1396 from bantu/ticket/11324
[ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
2013-05-09 11:14:52 -07:00
Andreas Fischer
d1415676c5 [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
PHPBB3-11324
2013-05-09 20:10:25 +02:00
Andreas Fischer
f9325bfdeb Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympus
* naderman/ticket/11529:
  [ticket/11529] Format markdown code correctly
  [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
2013-05-09 20:08:20 +02:00
Nils Adermann
ab3b0df244 [ticket/11529] Format markdown code correctly
PHPBB3-11529
2013-05-09 20:06:12 +02:00
Nils Adermann
1c9d36615a [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
PHPBB3-11529
2013-05-09 19:59:34 +02:00
Nils Adermann
3fb536d7b7 Merge pull request #1387 from bantu/ticket/11513
[ticket/11513] Install PHPUnit via Composer
2013-05-09 10:30:20 -07:00
Andreas Fischer
c31123e8a4 [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
b5b1e88915 [ticket/11513] Use PHPUnit from composer in .travis.yml.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
585f0bc827 [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
PHPBB3-11513
2013-05-09 18:42:35 +02:00
Nils Adermann
4e3c5aefa8 Merge pull request #1393 from bantu/ticket/11526
[ticket/11526] Increase composer minimum-stability from beta to stable
2013-05-09 08:30:16 -07:00
Nils Adermann
176ac6e691 Merge pull request #1392 from bantu/ticket/11527
[ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
2013-05-09 08:28:39 -07:00
Andreas Fischer
5ea75ddf09 [ticket/11526] Update all dependencies / regenerate composer.lock.
PHPBB3-11526
2013-05-09 02:48:38 +02:00
Andreas Fischer
b3d16f21a8 [ticket/11526] Increase composer minimum stability in olympus to stable.
PHPBB3-11526
2013-05-09 02:48:31 +02:00
Andreas Fischer
d26da01fa0 Merge branch 'ticket/11527' into ticket/11526
* ticket/11527:
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
2013-05-09 02:48:11 +02:00
Andreas Fischer
051c2ec251 [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
PHPBB3-11527
2013-05-09 02:38:27 +02:00
Andreas Fischer
841f1e4922 Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus
* MGaetan89/ticket/11144:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable
2013-05-06 21:56:20 +02:00
Gaëtan Muller
eefcdfa54a [ticket/11144] Add missing {FORUM_NAME} variable
Replace spaces with tabs

PHPBB3-11144
2013-05-06 21:50:45 +02:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
2013-05-06 21:31:16 +02:00
Andreas Fischer
92e0613324 Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympus
* hjpotter92/ticket/11517:
  [ticket/11517] Fix list numbering
2013-05-02 23:12:39 +02:00
hjpotter92
6d4a75b3cb [ticket/11517] Fix list numbering
PHPBB3-11517
2013-05-02 06:29:32 +05:30
Nils Adermann
a33cc92fc8 Merge pull request #1358 from MGaetan89/ticket/9975
[ticket/9975] Translate missing style error message
2013-04-24 10:01:30 -07:00
Gaëtan Muller
802fbbb444 [ticket/9975] Translate missing style error message
The error message about missing style data was not
translated

PHPBB3-9975
2013-04-21 17:38:49 +02:00
Andreas Fischer
453f98f6d3 Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympus
* dhruvgoel92/ticket/11493:
  [ticket/11493] add checks for Notice and Warning
  [ticket/11493] add check for phpBB Debug in functional tests
2013-04-15 13:15:03 -04:00
Dhruv
14071e6085 [ticket/11493] add checks for Notice and Warning
PHPBB3-11493
2013-04-15 22:02:21 +05:30
Dhruv
82a630cd64 [ticket/11493] add check for phpBB Debug in functional tests
PHPBB3-11493
2013-04-15 20:41:05 +05:30
Nils Adermann
0ce94fde77 Merge branch 'ticket/11358' into develop-olympus
* ticket/11358:
  [ticket/11358] Removed all trailing white spaces.
  [ticket/11358] Fixed the code according to coding guidlines.
2013-04-12 14:03:24 +02:00
erangamapa
7d8bbcd596 [ticket/11358] Removed all trailing white spaces.
Removed all trailing white spaces with new lines.

PHPBB3-11358
2013-04-12 14:03:06 +02:00
erangamapa
00b45fa4dc [ticket/11358] Fixed the code according to coding guidlines.
Added proper indentation and new line after break in switch
statement.

PHPBB3-11358
2013-04-12 14:02:51 +02:00
Nathaniel Guse
fb371d6bbe Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/6723:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:48:56 -06:00
Nathaniel Guse
d5617f046c Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11368:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:43:49 -06:00
Marc Alexander
acabe6f5ca [ticket/6723] Show info that message has been deleted before delivery
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
2013-03-03 00:32:31 +01:00
Andreas Fischer
5b2d272137 [ticket/11368] Fix background color for PM report rows by using accessing var.
PHPBB3-11368
2013-02-26 22:17:24 +01:00
Andreas Fischer
8586ce8906 Merge remote-tracking branch 'naderman/ticket/10986' into develop-olympus
* naderman/ticket/10986:
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
2013-02-24 20:54:46 +01:00
Nils Adermann
4615698807 [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
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
2013-02-24 19:07:24 +01:00
Nils Adermann
fe219e4bbe Merge branch 'ticket/11358' into develop-olympus
* 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.
2013-02-24 18:17:32 +01:00
erangamapa
1b39d6d65e [ticket/11358] Changed the name of post parameter.
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
2013-02-24 18:12:50 +01:00
erangamapa
c0a39537e3 [ticket/11358] Changed the action parameter value to represent the link.
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
2013-02-24 18:12:45 +01:00
erangamapa
538b09ba61 [ticket/11358] Enabled link making all users default for a group.
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
2013-02-24 18:12:40 +01:00
erangamapa
880786d686 [ticket/11358] Removed redundant code and referred proper variable.
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
2013-02-24 18:12:35 +01:00
erangamapa
373c9a3f4e [ticket/11358] Success message even without selecting a user.
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
2013-02-24 18:12:28 +01:00
Nils Adermann
65118218c7 Merge branch 'ticket/11355' into develop-olympus
* ticket/11355:
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
2013-02-24 18:05:22 +01:00
erangamapa
ab530a999e [ticket/11355] Referred proper variable when validating selection.
Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
2013-02-24 18:04:54 +01:00
erangamapa
f8e184c54e [ticket/11355] Wrong error message when no user is selected.
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
2013-02-24 18:04:46 +01:00