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

25848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
370fce1651 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
 2015-04-06 14:27:48 +02:00
Joas Schilling
7d08bf5b3e Merge pull request #3517 from Wolfsblvt/ticket/13739 
[ticket/13739] Add template core event posting_poll_body_options_after
 2015-04-06 14:26:35 +02:00
Joas Schilling
478fed7ee1 Merge branch '3.1.x' 2015-04-06 14:22:18 +02:00
Joas Schilling
84df225038 Merge pull request #3523 from Nicofuma/ticket/13747 
[ticket/13747] Add assertions to test_validate_path_linux
 2015-04-06 14:21:47 +02:00
Tristan Darricau
8575cc69d1 [ticket/13747] Add assertions to test_validate_path_linux 
PHPBB3-13747
 2015-04-06 13:09:07 +02:00
Oliver Schramm
126886ef27 Merge pull request #3522 from nickvergessen/ticket/13522 
[ticket/13522] Fix globals for 3.2 in Q&A tests
 2015-04-06 13:07:25 +02:00
Joas Schilling
477f7823e5 [ticket/13522] Fix globals for 3.2 in Q&A tests 
PHPBB3-13522
 2015-04-06 12:08:55 +02:00
Tristan Darricau
8523031141 Merge branch '3.1.x' 2015-04-06 11:49:18 +02:00
Tristan Darricau
73a0988f59 Merge pull request #3458 from nickvergessen/ticket/8494 
[ticket/8494] Ignore errors from the database schema preparation
 2015-04-06 11:47:46 +02:00
Joas Schilling
2962d5d7fd Merge branch '3.1.x' 2015-04-06 11:36:04 +02:00
Joas Schilling
90025ae3e7 Merge pull request #3437 from marc1706/ticket/12368 
[ticket/12368] Correctly check if avatars migration is installed
 2015-04-06 11:36:00 +02:00
Joas Schilling
34b768cfaf Merge branch '3.1.x' 2015-04-06 11:31:58 +02:00
Joas Schilling
23db98276f Merge pull request #3409 from Senky/ticket/11424 
[ticket/11424] Quick-Mod Tools race condition results in NO_MODE
 2015-04-06 11:31:53 +02:00
Joas Schilling
96e212ef0c Merge branch '3.1.x' 2015-04-06 11:14:02 +02:00
Joas Schilling
c60497f009 Merge pull request #3402 from brunoais/ticket/13621 
[ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
 2015-04-06 11:13:33 +02:00
Joas Schilling
3af61075a8 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/captcha/plugins/qa.php
 2015-04-06 11:09:20 +02:00
Joas Schilling
009a8cb2d5 Merge pull request #3333 from marc1706/ticket/13522 
[ticket/13522] Remove empty answers from possible answers in Q&A
 2015-04-06 11:04:35 +02:00
Joas Schilling
197369e3f9 Merge branch '3.1.x' 2015-04-06 10:59:46 +02:00
Joas Schilling
9ab27fe129 Merge pull request #3284 from Elsensee/ticket/13469 
[ticket/13469] Fall back to soft_delete if no permissions for delete
 2015-04-06 10:59:33 +02:00
Tristan Darricau
3a6a61a8dd Merge pull request #3461 from s9e/ticket/11768 
[3.2][ticket/11768] Integrate s9e\TextFormatter
 2015-04-05 23:32:38 +02:00
Tristan Darricau
5ac13c7ddc Merge branch '3.1.x' 2015-04-05 23:22:41 +02:00
Tristan Darricau
d49f70fbc7 Merge pull request #3520 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
Tristan Darricau
30cf75a011 Merge pull request #3430 from MateBartus/ticket/12466 
[ticket/12466] Move classes from acp_database.php to their own files
 2015-04-05 20:13:38 +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
c900dcdc2a Merge branch '3.1.x' 2015-04-04 11:04:31 +02:00
Marc Alexander
558d604d83 Merge pull request #3518 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
2ebab2ed5f Merge branch '3.1.x' 2015-04-04 11:02:06 +02:00
Marc Alexander
55907c1724 Merge pull request #3519 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
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing order of if statement and event

PHPBB3-13739
 2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
 2015-04-03 18:56:53 +02:00
Joas Schilling
7541fab408 Merge branch '3.1.x' 2015-04-03 18:56:23 +02:00
Joas Schilling
71177c38dc Merge pull request #3515 from cyberalien/ticket/13741 
Ticket/13741 Remove outdated comments and references in css files
 2015-04-03 18:56:15 +02:00
Joas Schilling
6889248cdf Merge branch '3.1.x' 2015-04-03 18:42:25 +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 #3512 from bantu/ticket/13738 
[ticket/13738] Use new branch names in sami-all.conf.php.
 2015-04-03 18:41:41 +02:00
Wolfsblvt
d5021aeda4 [ticket/13739] Add template core event posting_poll_body_options_after 
Template event added for the poll options while posting a topic
so that you may add additional options for polls.

PHPBB3-13739
 2015-04-03 17:02:43 +02:00
Marc Alexander
ca1ac36c20 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
 2015-04-03 16:50:20 +02:00
Marc Alexander
55f6329c1d Merge pull request #3467 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
f86c5d905b Merge branch '3.1.x' 2015-04-02 21:22:15 +02:00
Marc Alexander
418aabb46e Merge pull request #3508 from cyberalien/ticket/13726 
[ticket/13726] Fix function that calculates responsive breadcrumbs width
 2015-04-02 21:22:12 +02:00
Marc Alexander
8546ed0fbc Merge branch '3.1.x' 2015-04-02 20:03:02 +02:00
Marc Alexander
335520fc45 Merge pull request #3509 from cyberalien/ticket/13727 
[ticket/13727] Fix JS that resizes breadcrumbs
 2015-04-02 20:01:47 +02:00
JoshyPHP
4e80565fe7 [ticket/11768] Updated s9e\TextFormatter 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
b24e0f4f69 [ticket/11768] Stylistic change. No functional change intended 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00
JoshyPHP
1d90daf969 [ticket/11768] Added some default template parameters 
PHPBB3-11768
 2015-04-02 19:16:04 +02:00