rxu
|
615e5c1076
|
[ticket/13745] Add viewtopic.php core events to allow manipulating poll data
PHPBB3-13745
|
2015-04-15 14:12:49 +07:00 |
|
Dhruv
|
2c0b1252c8
|
Merge branch '3.1.x'
|
2015-04-14 09:10:47 +05:30 |
|
Dhruv Goel
|
ba1e3fd661
|
Merge pull request #3533 from Elsensee/ticket/13756
[ticket/13756] Fix resize after upload with plupload
|
2015-04-14 09:09:14 +05:30 |
|
Oliver Schramm
|
366dfce846
|
[ticket/13756] Add test for generate_resize_string()
PHPBB3-13756
|
2015-04-12 14:20:07 +02:00 |
|
Oliver Schramm
|
70c74df009
|
[ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
|
2015-04-11 23:08:45 +02:00 |
|
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
|
bf107ba1af
|
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
2015-04-10 10:06:07 +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
|
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
|
afc3730cca
|
Merge branch '3.1.x'
|
2015-04-06 23:54:40 +02: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
|
201f5cb3fb
|
Merge branch '3.1.x'
|
2015-04-06 16:54:54 +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
|
a11994d424
|
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
|
2015-04-06 14:45:20 +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
|
4ce0d88ffd
|
Merge branch '3.1.x'
|
2015-04-06 14:43:11 +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
|
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 |
|