1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

11794 Commits

Author SHA1 Message Date
Andreas Fischer
036a4188f3 [develop-olympus] Add changelog for 3.0.12 release. 2013-07-12 21:10:05 +02:00
Andreas Fischer
f1dd35387c [develop-olympus] Bump version numbers for 3.0.12-RC1 release. 2013-07-12 21:10:05 +02:00
Andreas Fischer
6f14c8375e [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
Nathaniel Guse
72b06c711a Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympus
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11668:
  [ticket/11668] Run lint test at the end of the test suite
2013-07-12 14:04:31 -05:00
Igor Wiedler
a1a5a636b1 [ticket/11668] Run lint test at the end of the test suite
The lint test is very slow. Running it at the end should speed up the development cycle.

PHPBB3-11668
2013-07-12 14:42:26 -04:00
Andreas Fischer
67c10ca622 Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into develop-olympus
* marc1706/ticket/11548-develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
2013-07-12 19:53:45 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
2013-07-12 13:40:30 -04:00
Nathaniel Guse
16aeaed7bd Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11662:
  [ticket/11662] Typos: occured -> occurred
2013-07-12 10:33:45 -05:00
Andreas Fischer
f4b7cbd976 [ticket/11662] Typos: occured -> occurred
PHPBB3-11662
2013-07-12 17:10:18 +02:00
Andreas Fischer
a7edbf9258 Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus
* marc1706/ticket/11548:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error
2013-07-11 23:38:49 +02:00
Marc Alexander
2667c3a527 [ticket/11548] Use new static methods for request and submit
PHPBB3-11548
2013-07-11 17:34:34 -04:00
Marc Alexander
dc4687501a Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548 2013-07-11 17:30:32 -04:00
Vjacheslav Trushkin
94e5bfaada [ticket/10772] Updating tests
PHPBB3-10772
2013-07-11 22:46:26 +02:00
Vjacheslav Trushkin
335d48775f [ticket/10772] Remove 3.1 code
PHPBB3-10772
2013-07-11 22:46:19 +02:00
Marc Alexander
599f83395f [ticket/11548] Run array_map on complete error array and not just colour_error
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.

PHPBB3-11548
2013-07-11 16:15:27 -04:00
Nathaniel Guse
406c48c655 Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:08:24 -05:00
Nathaniel Guse
900525a0e4 Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympus
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11644:
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
2013-07-11 12:25:25 -05:00
Igor Wiedler
20d59c49e2 [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
PHPBB3-11644
2013-07-11 13:00:21 -04:00
Nathaniel Guse
ece01f0a1f Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
2013-07-11 10:09:53 -05:00
Andreas Fischer
13c087d4f1 Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympus
* EXreaction/ticket/11630:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
2013-07-11 00:50:05 +02:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement
PHPBB3-8319
2013-07-10 17:13:02 +02:00
Matthew Fonda
300867ab1a [ticket/11630] Improvements to the PHP lint pre-commit hook
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.

Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.

PHPBB3-11630
2013-07-06 12:16:59 -05:00
Nathan Guse
7c84a12f39 Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11619:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:01 -05:00
Andreas Fischer
9e845d4641 [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
PHPBB3-11619
2013-07-03 15:31:40 +02:00
Andreas Fischer
950a3a7d95 [ticket/11619] Some tests for get_remote_file().
PHPBB3-11619
2013-07-03 15:31:24 +02:00
Andreas Fischer
44de24f1b8 Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympus
* VSEphpbb/ticket/11617:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:22 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
2013-07-02 16:52:15 -07:00
Joas Schilling
d4531c9cea Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-olympus
* remotes/dhruvgoel92/ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
2013-07-02 13:07:14 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus
* dhruvgoel92/ticket/10838:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line
PHPBB3-10838
2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references
PHPBB3-10838
2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data
PHPBB3-10838
2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
2013-07-02 00:47:32 +05:30
Dhruv
045e04fb6f [ticket/11566] Subsilver template error displayed after table headers
PHPBB3-11561
2013-07-01 21:54:47 +05:30
Dhruv
d4645575fd [ticket/11566] Remove extra pair of brackets from conditional statement
PHPBB3-11566
2013-07-01 21:54:34 +05:30
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default
PHPBB3-11566
2013-07-01 21:49:06 +05:30
Dhruv
ea8a4abe66 [ticket/11566] Add captcha to report post template in subsilver
PHPBB3-11566
2013-07-01 21:49:05 +05:30
Dhruv
4ad1d9aa65 [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
PHPBB3-11566
2013-07-01 21:49:04 +05:30
Dhruv
88b5180aa1 [ticket/11566] Rename var to $visual_confirmation_response
PHPBB3-11566
2013-07-01 21:49:02 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
2013-07-01 21:49:01 +05:30
Dhruv
1abc3d91d0 [ticket/11566] Use language variable instead of hardcode
Add language variable in tests

PHPBB3-11566
2013-07-01 21:49:00 +05:30
Dhruv
43053c541a [ticket/11566] add tests for reporting post
Functional test for reporting post and check if captcha validation
is required for guests and not for registerted users

PHPBB3-11566
2013-07-01 21:48:59 +05:30
Dhruv
c4fbed251d [ticket/11566] add captcha reset and hidden fields
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
2013-07-01 21:48:57 +05:30
Dhruv
2c240f8a7b [ticket/11566] display error instead of trigger_error
When the error report is empty display error
in the template instead of trigger_error

PHPBB3-11566
2013-07-01 21:48:56 +05:30
Dhruv
7c9a1cbca9 [ticket/11566] add error in template
Check if error exists, then display it
in the report post template.

PHPBB3-11566
2013-07-01 21:48:54 +05:30
Dhruv
eafd0ae29f [ticket/11566] add error functionality
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
2013-07-01 21:48:53 +05:30
Dhruv
7a2e3b4354 [ticket/11566] add interface for captcha
Add basic captcha template while reporting post
when the user is not a registered user.

PHPBB3-11566
2013-07-01 21:48:51 +05:30
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
2013-06-26 19:51:52 -04:00