mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 20:17:36 +02:00
Code Issues Releases Wiki Activity
24,310 Commits 18 Branches 192 Tags
d49f70fbc7
Commit Graph

24310 Commits

Author SHA1 Message Date
Tristan Darricau
d49f70fbc7 Merge pull request from rxu/ticket/13743 
[ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
 2015-04-05 23:14:05 +02:00
rxu
3521e74939 [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php 
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.

PHPBB3-13743
 2015-04-05 18:48:43 +07:00
Marc Alexander
558d604d83 Merge pull request from marc1706/ticket/13703 
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
 2015-04-04 11:04:29 +02:00
Marc Alexander
55907c1724 Merge pull request from marc1706/ticket/13742 
[ticket/13742] Use correct avatar path for local avatar
 2015-04-04 11:02:03 +02:00
Kevin Roy
ddff81c21f [ticket/13742] Use correct avatar path for local avatar 
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.

PHPBB3-13742
 2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06 [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH 
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.

PHPBB3-13703
 2015-04-03 23:04:52 +02:00
Joas Schilling
71177c38dc Merge pull request from cyberalien/ticket/13741 
Ticket/13741 Remove outdated comments and references in css files
 2015-04-03 18:56:15 +02:00
Joas Schilling
81c92a7de9 Merge branch '3.0.x' into 3.1.x 2015-04-03 18:42:06 +02:00
Joas Schilling
35d2467c94 Merge pull request from bantu/ticket/13738 
[ticket/13738] Use new branch names in sami-all.conf.php.
 2015-04-03 18:41:41 +02:00
Marc Alexander
55f6329c1d Merge pull request from dragosvr92/patch-5 
[ticket/13602] Adding a new event overall_header_navbar_before
 2015-04-03 16:48:26 +02:00
cyberalien
e120e6ac97 [ticket/13741] Remove outdated references to tweaks.css 
PHPBB3-13741
 2015-04-03 11:14:20 +03:00
cyberalien
9f54d2b590 [ticket/13741] Remove reference to unused body font-size declaration 
Remove reference to font-size declaration that is no longer used in prosilver

PHPBB3-13741
 2015-04-03 11:04:47 +03:00
cyberalien
6c308d81bd [ticket/13741] Remove reference to oudated rollover code that no longer exists 
Rollover code referenced in that comment has been removed in 3.1

PHPBB3-13741
 2015-04-03 11:03:47 +03:00
Marc Alexander
418aabb46e Merge pull request from cyberalien/ticket/13726 
[ticket/13726] Fix function that calculates responsive breadcrumbs width
 2015-04-02 21:22:12 +02:00
Marc Alexander
335520fc45 Merge pull request from cyberalien/ticket/13727 
[ticket/13727] Fix JS that resizes breadcrumbs
 2015-04-02 20:01:47 +02:00
Andreas Fischer
5fc92a03b2 Merge pull request from bantu/ticket/13736 
[ticket/13736] Missing four colon in Contact us page

* bantu/ticket/13736:
  [ticket/13736] Missing four colon in Contact us page
 2015-04-02 13:31:31 +02:00
Raphaël M
40c79f2a26 [ticket/13736] Missing four colon in Contact us page 
Replacing of four ```:``` with four {L_COLON} in Contact us page.

PHPBB3-13736
 2015-04-02 12:48:31 +02:00
Andreas Fischer
d6d9ff51b2 [ticket/13738] Use new branch names in sami-all.conf.php. 
PHPBB3-13738
 2015-04-02 12:30:39 +02:00
Marc Alexander
42d831f472 Merge pull request from Nicofuma/ticket/13732 
[ticket/13732] Update composer to be php7 compliant
 2015-04-01 15:51:26 +02:00
Tristan Darricau
be472cc7bb [ticket/13732] Update composer to be php7 compliant 
Updated to Composer version 1.0-dev
(f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42

PHPBB3-13732
 2015-03-30 21:48:28 +02:00
Nicofuma
1a484f08bb Merge branch '3.0.x' into 3.1.x 2015-03-29 19:50:38 +02:00
Nicofuma
d9f4964d91 Merge pull request from marc1706/ticket/13568-asc 
[ticket/13568] Validate imagick path as readable absolute path

closes
2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5 Merge pull request from marc1706/ticket/13568 
[ticket/13568] Validate imagick path as readable absolute path

closes
2015-03-29 19:41:13 +02:00
cyberalien
0b52eb2298 [ticket/13727] Fix JS that resizes breadcrumbs 
PHPBB3-13727
 2015-03-28 19:59:38 +02:00
cyberalien
90b82d1a5f [ticket/13726] Fix function that calculates responsive breadcrumbs width 
Do not calculate width of hidden elements.
Set minimum width to make sure breadcrumbs are always shown.

PHPBB3-13726
 2015-03-28 11:36:15 +02:00
Andreas Fischer
499088b62f Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:37 +01:00
Andreas Fischer
1efbb5b3bb Merge pull request from prototech/ticket/13555 
[ticket/13555] Render poll options separately when previewing.

* prototech/ticket/13555:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:36 +01:00
Oliver Schramm
9d75f3fca8 Merge branch '3.0.x' into 3.1.x 2015-03-25 21:49:11 +01:00
Oliver Schramm
407b9d3c6b Merge pull request from Nicofuma/ticket/13723-31x 
[ticket/13723-Ascraeus] Add Elsensee to authors list
 2015-03-25 21:48:05 +01:00
Oliver Schramm
84d77d6cd5 Merge pull request from Nicofuma/ticket/13723 
[ticket/13723] Add Elsensee to authors list
 2015-03-25 21:44:09 +01:00
Nicofuma
7f2b932a1b [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x 
Conflicts:
	phpBB/docs/AUTHORS

PHPBB3-13723
 2015-03-25 21:40:12 +01:00
Nicofuma
44540b6112 [ticket/13723] Add Elsensee to authors list 
PHPBB3-13723
 2015-03-25 21:31:50 +01:00
Nicofuma
50b3c2b49e Merge pull request from marc1706/ticket/13612 
[ticket/13612] Run meta refresh until extension is fully enabled
 2015-03-24 23:32:29 +01:00
Nicofuma
4a08d74571 Merge pull request from prototech/ticket/13698 
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
 2015-03-24 23:19:46 +01:00
Nicofuma
285e35992a Merge pull request from Senky/ticket/13467 
[ticket/13467] Add a CONTRIBUTING file to the project on Github
 2015-03-24 22:35:34 +01:00
Marc Alexander
3d0153de60 Merge pull request from Elsensee/ticket/13721 
[ticket/13271] Fix URL Rewriting on IIS7
 2015-03-24 11:00:26 +01:00
Cesar G
0bc2f9f242 [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message. 
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.

PHPBB3-13698
 2015-03-23 17:52:17 -07:00
Oliver Schramm
476b762542 [ticket/13271] Fix URL Rewriting on IIS7 
PHPBB3-13271
 2015-03-23 18:23:12 +01:00
Cesar G
a32f4869de Merge remote-tracking branch 'brunoais/ticket/13719' into 3.1.x 
* brunoais/ticket/13719:
  [ticket/13719] Remove superfluous $search_options in acp_search.
 2015-03-23 09:43:27 -07:00
brunoais
754b5d6349 [ticket/13719] Remove superfluous $search_options in acp_search. 
PHPBB3-13719
 2015-03-23 12:58:05 +00:00
JoshyPHP
1df97c205d [ticket/13555] Render poll options separately when previewing. 
This prevents an option from being split into two when a line break is present
inside of it.

PHPBB3-13555
 2015-03-19 15:32:31 -07:00
Cesar G
4276f49efa Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.x 
* Senky/ticket/9457:
  [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
 2015-03-18 19:37:29 -07:00
Marc Alexander
ee70b364c7 Merge pull request from prototech/ticket/13550 
[ticket/13550] Improve checks for Plupload temp directory writability
 2015-03-16 14:43:19 +01:00
Cesar G
7f7d8d9101 [ticket/13550] Check that the Plupload temp directory is writable before moving 
This prevents a PHP warning from being issued that results in an invalid JSON
response being returned to the user.

PHPBB3-13550
 2015-03-15 16:06:35 -07:00
Dhruv
faf267c419 Merge branch 'ticket/13702' into 3.1.x 2015-03-15 16:59:21 +08:00
Dhruv Goel
f0619b481f Merge pull request from brunoais/ticket/13674 
[ticket/13674] Change MySQL native total search results calculation
 2015-03-14 23:28:31 +08:00
cyberalien
7e8274c345 [ticket/13702] Add initial-scale to viewport in page header 
PHPBB3-13702
 2015-03-14 10:00:28 +02:00
Marc Alexander
e132e9ba76 Merge pull request from prototech/ticket/13463 
[ticket/13463] Correctly position notification mark read icon in RTL.
 2015-03-11 13:49:42 +01:00
Marc Alexander
5b9fe33b1b Merge pull request from n-aleha/ticket/13679 
[ticket/13679] Add template event overall_header_searchbox_before
 2015-03-10 15:23:27 +01:00
Marc Alexander
3cb1907e76 Merge pull request from RMcGirr83/ticket/13650 
[ticket/13650] Move core event
 2015-03-10 15:20:26 +01:00