mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
12,234 Commits 17 Branches 190 Tags
Commit Graph

12234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
cd9711b7c9 [ticket/11769] Allow using 0 as poster name 
PHPBB3-11769
 2013-09-02 11:29:50 +02:00
Joas Schilling
42b9c3c479 [ticket/11769] Allow '0' as username 
PHPBB3-11769
 2013-09-02 01:11:40 +02:00
Joas Schilling
78bfa8c01e Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympus 
* bantu/ticket/11799:
  [ticket/11799] Send anti abuse headers in "new password" emails.
 2013-08-26 16:54:34 +02:00
Joas Schilling
2ce83fce1e [ticket/11769] Allow '0' as username in notification mails 
PHPBB3-11769
 2013-08-23 23:53:33 +02:00
Joas Schilling
d717203af1 [ticket/11769] Fix language issues in the doc blocks 
PHPBB3-11769
 2013-08-23 23:49:11 +02:00
Joas Schilling
2845b153d8 [ticket/11769] Correctly supply the post author's username in posting.php 
Only supply the username, when it is a guest posting or we edit and it was
supplied, otherwise post_data might hold data of the post we quote, in which
case username is the original poster, not the current one.

PHPBB3-11769
 2013-08-23 23:17:52 +02:00
Andreas Fischer
5f81d66c2f [ticket/11799] Send anti abuse headers in "new password" emails. 
PHPBB3-11799
 2013-08-23 03:55:26 +02:00
Andreas Fischer
7893e992ff Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11802] replace $browser with $user->browser
 2013-08-20 00:47:21 +02:00
Andreas Fischer
ba9d303d52 Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12 
* dhruvgoel92/ticket/11802:
  [ticket/11802] replace $browser with $user->browser
 2013-08-20 00:46:33 +02:00
Dhruv
aa3d2ef7a9 [ticket/11802] replace $browser with $user->browser 
PHPBB3-11802
 2013-08-20 04:14:20 +05:30
Andreas Fischer
8c69db6ab2 Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympus 
* Prosk8er/ticket/11801:
  [ticket/11801] removed some whitespace and added missing semi colon's in css
 2013-08-19 20:45:34 +02:00
Prosk8er
f61db86b8d [ticket/11801] removed some whitespace and added missing semi colon's in css 
PHPBB3-11801
 2013-08-19 13:31:30 -04:00
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
Andreas Fischer
afb6800b59 Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympus 
* rechosen/ticket/11794:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
 2013-08-16 18:02:09 +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
Andreas Fischer
b08928ee1c Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3.0.12 
* nickvergessen/ticket/11775:
  [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:40 +02:00
Joas Schilling
c30d4025d2 [ticket/11775] Fix doc blocks syntax 
PHPBB3-11775
 2013-08-15 01:36:38 +02:00
Joas Schilling
4b0adfcff5 [ticket/11775] Remove spaces at line ends 
PHPBB3-11775
 2013-08-15 01:35:02 +02:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code 
PHPBB3-11789
 2013-08-14 19:09:27 +03:00
Joas Schilling
63535b196d [ticket/11775] Split test into multiple steps 
PHPBB3-11775
 2013-08-12 15:38:20 +02:00
Joas Schilling
a9b5e77e68 [ticket/11775] Add functional test for moving the last post 
PHPBB3-11775
 2013-08-09 00:41:28 +02:00
Joas Schilling
a6e69f377b [ticket/11775] Backport moving of the posting functions to 3.0 
PHPBB3-11775
 2013-08-08 23:33:26 +02: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
Joas Schilling
33eb9ad53a Merge remote-tracking branch 's9e/ticket/11762' into develop-olympus 
* s9e/ticket/11762:
  [ticket/11762] Added call to test class's parent::setUp().
  [ticket/11762] Fixed test's filename
  [ticket/11762] Use the === operator to distinguish "0" from ""
 2013-08-03 15:35:34 +02:00
s9e
9db1728b4b [ticket/11762] Added call to test class's parent::setUp(). 
Added call to test class's parent::setUp(). Updated copyright year.

PHPBB3-11762
 2013-08-03 14:06:43 +02:00
s9e
68aa974a20 [ticket/11762] Fixed test's filename 
PHPBB3-11762
 2013-08-03 12:29:23 +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
b7f97cae79 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
 2013-08-01 17:40:05 +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
release-3.0.12-RC2 		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
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