Commit graph

11160 commits

Author SHA1 Message Date
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on()
PHPBB3-11879
2013-10-02 11:12:41 +03:00
Andreas Fischer
02f9d179e5 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 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
2013-09-28 15:02:44 +02:00
Andreas Fischer
446ea9928d [prep-release-3.0.12] Update changelog for 3.0.12 release. 2013-09-28 03:20:51 +02:00
Joas Schilling
cba28c39ad [ticket/11873] Do not hash very large passwords in order to safe resources.
PHPBB3-11873
2013-09-28 03:12:50 +02:00
Andreas Fischer
9a5415fe6d Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-09-27 01:32:09 +02:00
Andreas Fischer
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
2013-09-25 13:35:08 +02:00
Andreas Fischer
6c3f3ec893 [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
PHPBB3-11860
2013-09-23 14:10:21 +02:00
Vjacheslav Trushkin
3cd445d055 [ticket/11811] Remove outline on :focus
PHPBB3-11811
2013-09-13 23:41:07 +03:00
David King
424080c45a Merge pull request #1701 from EXreaction/ticket/11831
Update fabpot/goutte
2013-09-12 20:42:05 -07:00
Nathan Guse
4d14bdbf13 Merge pull request #1698 from rechosen/ticket/11829
[ticket/11829] Use report_closed to determine status in MCP report_details
2013-09-12 12:53:06 -07:00
Andreas Fischer
c1557cf78d Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
2013-09-10 02:53:19 +02:00
Andreas Fischer
38afdd792f [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
A wrong fix version was assigned to PHPBB3-11288.
2013-09-10 02:17:41 +02:00
Nathan
b7eca27f2a [ticket/11831] Update fabpot/goutte to 1.0.*
PHPBB3-11831
2013-09-06 12:28:46 -05:00
Andreas Fischer
fcb9476615 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-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-09-05 00:37:40 +02:00
rechosen
77845e366e [ticket/11829] Use report_closed to determine status in MCP report_details
Instead of using post_reported of the post or message_reported of the pm, use
report_closed of the report itself to reliably determine whether this
particular report is closed or not in the report_details view of the MCP.
This fixes a bug where the report_details view would not show that the report
shown was closed and display a "Close report" button that had no effect.

PHPBB3-11829
2013-09-04 13:37:39 +02:00
Andreas Fischer
50818a342b [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. 2013-09-02 23:42:45 +02:00
Andreas Fischer
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02:00
Andreas Fischer
68555d2d51 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
2013-09-02 12:30:10 +02:00
Andreas Fischer
48825975d1 [ticket/11821] Fix comma usage next to "You are receiving this notification".
This is a partial backport of 31502cdd6c.

PHPBB3-11821
2013-09-02 11:41:31 +02:00
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
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
Dhruv
aa3d2ef7a9 [ticket/11802] replace $browser with $user->browser
PHPBB3-11802
2013-08-20 04:14:20 +05:30
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
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