Oliver Schramm
6f883b6791
[ticket/10037] Fix table in subsilver2
...
Thanks, nickvergessen! ;-)
PHPBB3-10037
2013-07-31 14:04:50 +02:00
Oliver Schramm
866e475f96
[ticket/10037] Apply attached patch with a few changes
...
PHPBB3-10037
2013-07-25 15:47:55 +02:00
Andreas Fischer
76a7d544cf
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:07:53 +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
c0795cc4da
Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympus
...
* EXreaction/ticket/11726:
[ticket/11726] Don't run lint tests on Travis on postgres
2013-07-23 00:32:58 +02:00
Nathan Guse
43538fdca1
[ticket/11726] Don't run lint tests on Travis on postgres
...
PHPBB3-11726
2013-07-22 12:23:53 -05:00
Andreas Fischer
90e532430c
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[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:50:49 +02: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
Nils Adermann
8d8a0602d6
Merge pull request #1567 from bantu/ticket/11704
...
[ticket/11704] phing build script does not include vendor folder, even if there are dependencies
2013-07-14 10:55:32 -07:00
Andreas Fischer
da1ee75140
[ticket/11704] Use the correct directory for dependency checking.
...
PHPBB3-11704
2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b
[ticket/11704] Correctly escape "
...
PHPBB3-11704
2013-07-14 19:48:41 +02:00
Nils Adermann
b0905cc1d2
Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-olympus
...
* github-exreaction/ticket/11686:
[ticket/11686] Not checking for phpBB Debug errors on functional tests
2013-07-13 17:06:00 -04:00
Andreas Fischer
f14967fbff
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
2013-07-13 19:30:45 +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
0341555314
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[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:48 -04: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
4b8126585d
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11674] Do not include vendor folder if there are no dependencies.
2013-07-13 13:12:19 -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
1c9604286d
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
2013-07-13 13:09:33 -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
Nathaniel Guse
6bfa2fc055
[ticket/11686] Not checking for phpBB Debug errors on functional tests
...
PHPBB3-11686
2013-07-13 12:06:05 -05: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
b1b37ddde2
Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into develop-olympus
...
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11668-travis:
[ticket/11668] Move lint test to the end for travis
2013-07-13 10:21:58 -05:00
Nathaniel Guse
2b69715e21
Merge branch 'prep-release-3.0.12' into develop-olympus
...
# By Nathaniel Guse (1) and Nils Adermann (1)
* prep-release-3.0.12:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
2013-07-13 09:15:09 -05: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
Igor Wiedler
3375f41ef1
[ticket/11668] Move lint test to the end for travis
...
PHPBB3-11668
2013-07-12 16:16:01 -04:00
Andreas Fischer
036a4188f3
[develop-olympus] Add changelog for 3.0.12 release.
2013-07-12 21:10:05 +02:00
Andreas Fischer
b93636d42d
[develop-olympus] Increment version number to 3.0.13-dev.
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
