1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 13:47:55 +02:00

10881 Commits

Author SHA1 Message Date
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
Andreas Fischer
e47e36266d Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympus
* dhruvgoel92/ticket/11094:
  [ticket/11094] Add textbox for jabber while memberlist search
2013-06-20 01:16:21 +02:00
Dhruv
50828e6d39 [ticket/11094] Add textbox for jabber while memberlist search
PHPBB3-11094
2013-06-15 18:41:43 +05:30
Dhruv
de150cb4ad [ticket/10820] fix if condition to check for IE
PHPBB3-10820
2013-06-14 00:29:06 +05:30
Dhruv
48f764437f [ticket/10820] Add additional check for IE in condition
PHPBB3-10820
2013-06-13 21:47:37 +05:30
Dhruv
e0b9cdf708 [ticket/10820] Fix function docblock
PHPBB3-10820
2013-06-12 20:22:48 +05:30
Dhruv
11cd9f901e [ticket/10820] Inject IE version in function
PHPBB3-10820
2013-06-12 20:22:47 +05:30
Dhruv
6b5780b753 [ticket/10820] fix regex
Extract IE version from user agent string and then compare it with 7

PHPBB3-10820
2013-06-12 20:22:46 +05:30
Dhruv
8f733cc658 [ticket/10820] remove unnecessary parentheses
PHPBB3-10820
2013-06-12 20:22:45 +05:30
Dhruv
5ebebbd719 [ticket/10820] fix docblock
PHPBB3-10820
2013-06-12 20:22:44 +05:30
Dhruv
ea7ece5d25 [ticket/10820] add param and return to function
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
2013-06-12 20:22:43 +05:30
Dhruv
687b04bcfc [ticket/10820] simplify regex and escape dot
PHPBB3-10820
2013-06-12 20:22:42 +05:30
Dhruv
364828de24 [ticket/10820] Use singular return
PHPBB3-10820
2013-06-12 20:22:40 +05:30
Dhruv
07c62dd64f [ticket/10820] remove unnecessary condition checks
PHPBB3-10820
2013-06-12 20:22:39 +05:30
Dhruv
8759147674 [ticket/10820] add function docblock
PHPBB3-10820
2013-06-12 20:22:38 +05:30
Dhruv
9236f12577 [ticket/10820] fix IE check function
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
2013-06-12 20:22:37 +05:30
Dhruv
80d164b121 [ticket/10820] proper usage of global and local variable browser
PHPBB3-10820
2013-06-12 20:22:36 +05:30
riadhchtara
fbebc2874f [ticket/10820] Image downloader recognize new version of ie
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
2013-06-12 20:22:35 +05:30
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Andreas Fischer
55f7281f61 [ticket/11588] Also use version.phpbb.com in install_update.php.
PHPBB3-11588
2013-06-06 13:00:53 +02:00
Dhruv
ad8386a64a Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
2013-06-05 01:41:26 +05:30
Andreas Fischer
a3d1593804 Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus
* erangamapa/ticket/11145:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:21 +02:00
Andreas Fischer
1cd6bb88a6 Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympus
* nickvergessen/ticket/10840:
  [ticket/10840] Add check_form_key to acp_groups.php
2013-06-03 15:36:04 +02:00
Andreas Fischer
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
PHPBB3-11583
2013-06-03 15:16:57 +02:00
Joas Schilling
6206d4aa4e [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
The explanation now states that links are prefixed with the board URL.

PHPBB3-8319
2013-06-03 12:37:58 +02:00
Joas Schilling
24bfaa1327 [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed the
second_pass_replace value, so that needs updating for existing ones.

PHPBB3-8319
2013-06-03 12:37:57 +02:00