mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity
11,942 Commits 17 Branches 190 Tags
Commit Graph

11942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ef1f3f17ce Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:46:23 +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
Joas Schilling
69feffec8b Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympus 
* Elsensee/ticket/10917-2:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
 2013-07-30 00:46:18 +02:00
Oliver Schramm
dd875f13e8 [ticket/10917] Variable used only once so delete it 
The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.

Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.

PHPBB3-10917
 2013-07-28 13:55:37 +02:00
Oliver Schramm
d8584877a1 [ticket/10917] Revert use of phpbb wrapper 
PHPBB3-10917
 2013-07-27 22:37:44 +02:00
Nathaniel Guse
935001b7a2 Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-olympus 
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/10917:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
 2013-07-25 13:36:29 -05:00
Nathaniel Guse
162ea10b6a Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-olympus 
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
 2013-07-25 13:32:23 -05: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
Oliver Schramm
7304ac9c3c [ticket/11062] If user's language is english there is no further work needed 
PHPBB3-11062
 2013-07-25 13:10:45 +02:00
Oliver Schramm
a9f0577502 [ticket/11062] Load new strings from user's language file if provided 
PHPBB3-11062
 2013-07-25 12:29:25 +02:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper 
PHPBB3-10917
 2013-07-24 19:08:49 +02:00
Oliver Schramm
5af63a7860 [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version 
PHPBB3-10917
 2013-07-24 18:15:03 +02: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. release-3.0.12-RC1 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