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

10931 Commits

Author SHA1 Message Date
Andreas Fischer
78f1e11aeb Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
* cyberalien/ticket/11789:
  [ticket/11789] Remove inline color in memberlist_view
2013-08-18 17:08:14 +02:00
Vjacheslav Trushkin
6f566fdaf0 [ticket/11789] Remove inline color in memberlist_view
PHPBB3-11789
2013-08-18 10:56:16 +03:00
Andreas Fischer
20fb220b4f Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus
* cyberalien/ticket/11789:
  [ticket/11789] Remove colors from HTML code
2013-08-18 03:00:42 +02:00
rechosen
48f6f4559c [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.

PHPBB3-11794
2013-08-16 17:48:36 +02:00
Andreas Fischer
d089f9693a Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:56 +02:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code
PHPBB3-11789
2013-08-14 19:09:27 +03:00
Joas Schilling
91eccc708b [ticket/11775] Fix error when moving the last post to another topic
PHPBB3-11775
2013-08-08 13:42:51 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
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
02b4f1c874 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-08-01 17:30:21 +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
4e1e5865d0 Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympus
* Elsensee/ticket/10037:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:39:06 +02:00
Oliver Schramm
6f883b6791 [ticket/10037] Fix table in subsilver2
Thanks, nickvergessen! ;-)

PHPBB3-10037
2013-07-31 14:04:50 +02:00
Joas Schilling
63a017ec90 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
2013-07-30 14:14:32 +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
d20979c43c Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
2013-07-30 11:25:32 +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
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
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt
PHPBB3-11752
2013-07-30 01:06:10 +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
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
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
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
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
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
Andreas Fischer
598ab05807 [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
PHPBB3-11670
2013-07-13 18:50:49 +02: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
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
b93636d42d [develop-olympus] Increment version number to 3.0.13-dev. 2013-07-12 21:10:05 +02:00