1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

10906 Commits

Author SHA1 Message Date
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
Dhruv
aa3d2ef7a9 [ticket/11802] replace $browser with $user->browser
PHPBB3-11802
2013-08-20 04:14:20 +05:30
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
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
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
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
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
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt
PHPBB3-11752
2013-07-30 01:06: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
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
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
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
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
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
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
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
Andreas Fischer
f4b7cbd976 [ticket/11662] Typos: occured -> occurred
PHPBB3-11662
2013-07-12 17:10:18 +02: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
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
Nathaniel Guse
406c48c655 Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:08:24 -05:00
Nathaniel Guse
ece01f0a1f Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
2013-07-11 10:09:53 -05:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement
PHPBB3-8319
2013-07-10 17:13:02 +02:00
Andreas Fischer
9e845d4641 [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
PHPBB3-11619
2013-07-03 15:31:40 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
2013-07-02 16:52:15 -07:00
Dhruv
045e04fb6f [ticket/11566] Subsilver template error displayed after table headers
PHPBB3-11561
2013-07-01 21:54:47 +05:30
Dhruv
d4645575fd [ticket/11566] Remove extra pair of brackets from conditional statement
PHPBB3-11566
2013-07-01 21:54:34 +05:30
Dhruv
ea8a4abe66 [ticket/11566] Add captcha to report post template in subsilver
PHPBB3-11566
2013-07-01 21:49:05 +05:30
Dhruv
4ad1d9aa65 [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
PHPBB3-11566
2013-07-01 21:49:04 +05:30
Dhruv
88b5180aa1 [ticket/11566] Rename var to $visual_confirmation_response
PHPBB3-11566
2013-07-01 21:49:02 +05:30
Dhruv
c4fbed251d [ticket/11566] add captcha reset and hidden fields
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
2013-07-01 21:48:57 +05:30
Dhruv
2c240f8a7b [ticket/11566] display error instead of trigger_error
When the error report is empty display error
in the template instead of trigger_error

PHPBB3-11566
2013-07-01 21:48:56 +05:30
Dhruv
7c9a1cbca9 [ticket/11566] add error in template
Check if error exists, then display it
in the report post template.

PHPBB3-11566
2013-07-01 21:48:54 +05:30
Dhruv
eafd0ae29f [ticket/11566] add error functionality
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
2013-07-01 21:48:53 +05:30
Dhruv
7a2e3b4354 [ticket/11566] add interface for captcha
Add basic captcha template while reporting post
when the user is not a registered user.

PHPBB3-11566
2013-07-01 21:48:51 +05:30
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Dhruv
116888f567 Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticket/10776
# By Callum Macrae
# Via Callum Macrae
* 'ticket/10776' of git://github.com/callumacrae/phpbb3:
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-20 21:39:13 +05:30