makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
11820 commits 18 branches 192 tags 206 MiB
Commit graph

11820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
acc7cb5e23 Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep-release-3.0.12 
* 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-08-01 17:39:52 +02:00
Andreas Fischer
0a73d64b97 [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. 2013-08-01 17:28:21 +02:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Joas Schilling
fc89fa2fec Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12 
* bantu/ticket/11753:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
 2013-07-30 14:13:31 +02:00
Joas Schilling
ddea90c802 Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12 
* bantu/ticket/11524:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
 2013-07-30 11:23:55 +02:00
Andreas Fischer
a3de463b30 [ticket/11753] Remove ?> from MySQL Upgrader. 
PHPBB3-11753
 2013-07-30 02:03:20 +02:00
Andreas Fischer
404f288113 [ticket/11753] Update MySQL upgrader schema data. 
PHPBB3-11753
 2013-07-30 02:01:24 +02:00
Andreas Fischer
8a6f3a5800 [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'" 
... on PHP 5.4 or higher.

PHPBB3-11524
 2013-07-30 01:54:11 +02:00
Joas Schilling
6ab4c9a702 Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12 
* bantu/ticket/11752:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:45:39 +02:00
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt 
PHPBB3-11752
 2013-07-30 01:06:10 +02:00
Andreas Fischer
469d9ee171 Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.0.12 
* unknownbliss/ticket/11740:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:07:10 +02:00
MichaelC
c5de4dd51d [ticket/11740] Update FAQ to include Ideas Centre 
PHPBB3-11740
 2013-07-25 13:06:11 +01:00
Andreas Fischer
148df3607b Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-release-3.0.12 
* marc1706/ticket/11720-prep-release:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:32:35 +02:00
Marc Alexander
865bf0db3d [ticket/11720] Add functional test for submitting report as user 
The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
56df3fd8ca [ticket/11720] Do not call $captcha->validate if $captcha is not set 
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Andreas Fischer
9e789c4e9f [prep-release-3.0.12] More changelog items for the 3.0.12 release. 2013-07-13 19:30:09 +02:00
Nils Adermann
2aff3b19df Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release-3.0.12 
* github-marc1706/ticket/11112:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com
 2013-07-13 13:14:37 -04:00
Nils Adermann
9a486539c3 Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3.0.12 
* github-bantu/ticket/11674:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
 2013-07-13 13:12:10 -04:00
Nils Adermann
9d57c9635c Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3.0.12 
* github-bantu/ticket/11670:
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
 2013-07-13 13:09:07 -04:00
Andreas Fischer
598ab05807 [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". 
PHPBB3-11670
 2013-07-13 18:50:49 +02:00
Andreas Fischer
e0aef4b320 [ticket/11674] Do not include vendor folder if there are no dependencies. 
PHPBB3-11674
 2013-07-13 18:32:33 +02:00
Nathaniel Guse
678cccfb04 [ticket/11671] Update composer.lock 
PHPBB3-11671
 2013-07-13 09:14:22 -05:00
Nathaniel Guse
93e4b4450d Merge remote-tracking branch 'remotes/naderman/ticket/11671' into prep-release-3.0.12 
# By Nils Adermann
# Via Nils Adermann
* remotes/naderman/ticket/11671:
  [ticket/11671] Add phing as a dependency and upgrade deps
 2013-07-13 09:10:34 -05:00
Marc Alexander
ee3d4199bb [ticket/11112] Do not change opensource.org link to https 
PHPBB3-11112
 2013-07-12 22:40:55 -04:00
Nils Adermann
97f633bced [ticket/11671] Add phing as a dependency and upgrade deps 
PHPBB3-11671
 2013-07-12 16:47:08 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com 
PHPBB3-11112
 2013-07-12 16:24:27 -04:00
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