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

24465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
ee658bfe7b [ticket/security-180] Always fail when redirecting to an insecure URL 
SECURITY-180
 2015-04-11 17:08:28 +02:00
Marc Alexander
bca1b96b2e [ticket/security-180] Make sure that redirect goes to full URL plus slash 
SECURITY-180
 2015-04-11 16:41:20 +02:00
Cesar G
47514ca2df [ticket/13755] Ignore dots in path when determining file extension. 
PHPBB3-13755
 2015-04-10 16:23:51 -07:00
Marc Alexander
eed355b798 [ticket/security-180] Check if redirect URL contains board URL 
SECURITY-180
 2015-04-10 18:10:32 +02:00
Joas Schilling
a151ad912a [3.1.x] Update development version to 3.1.5-dev 2015-04-10 09:56:20 +02:00
Joas Schilling
fcc7e7d333 Merge branch 'prep-release-3.1.4' into 3.1.x 2015-04-10 09:53:58 +02:00
Joas Schilling
073f3e4470 [prep-release-3.1.4] Add changelog for 3.1.4-RC1 release-3.1.4-RC1 2015-04-09 21:11:08 +02:00
Matt Friedman
ef0838e931 [ticket/13753] Fix event documentation 
PHPBB3-13753
 2015-04-09 12:00:33 -07:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Matt Friedman
96339b7c86 [ticket/13753] Add template events to forum category row headers 
PHPBB3-13753
 2015-04-09 11:04:25 -07:00
rxu
b0f5ef0b1a [ticket/13752] Add viewonline.php core event to allow modifying forum data SQL 
PHPBB3-13752
 2015-04-09 23:20:07 +07:00
Oliver Schramm
17620bba46 Merge pull request #3525 from marc1706/ticket/13749 
[ticket/13749] Add missing slash to base uri in helper route tests
 2015-04-06 23:54:27 +02:00
Marc Alexander
9d181daa71 [ticket/13749] Add missing slash to base uri in helper route tests 
PHPBB3-13749
 2015-04-06 22:59:34 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493 
[ticket/13493] Append page name to base url if it doesn't contain it
 2015-04-06 16:54:35 +02:00
Joas Schilling
02202b1503 Merge pull request #3492 from RMcGirr83/ticket/13710 
[ticket/13710] Allow template events near smilies display
 2015-04-06 14:44:37 +02:00
Joas Schilling
b16a56394b Merge pull request #3488 from Crizz0/ticket/13701 
[ticket/13701] Adds two new events to posting_pm_layout.html

Conflicts:
	phpBB/docs/events.md
 2015-04-06 14:42:59 +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
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
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
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
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
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
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
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
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
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 #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
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
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
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
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
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
335520fc45 Merge pull request #3509 from cyberalien/ticket/13727 
[ticket/13727] Fix JS that resizes breadcrumbs
 2015-04-02 20:01:47 +02:00
Oliver Schramm
bbd0a8985c [ticket/13469] Extract test to new method 
PHPBB3-13469
 2015-04-02 16:36:09 +02:00
Andreas Fischer
5fc92a03b2 Merge pull request #3513 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 #3510 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