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 #3506 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 #3505 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
9e66a10bac
Merge branch '3.1.x'
2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e
Merge pull request #3398 from marc1706/ticket/13612
...
[ticket/13612] Run meta refresh until extension is fully enabled
2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2
Merge branch '3.1.x'
2015-03-24 23:20:03 +01:00
Nicofuma
4a08d74571
Merge pull request #3501 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
673435a0fc
Merge branch '3.1.x'
2015-03-24 22:37:01 +01:00
Nicofuma
285e35992a
Merge pull request #3410 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
b67b0056e8
Merge branch '3.1.x'
2015-03-24 11:00:29 +01:00
Marc Alexander
3d0153de60
Merge pull request #3499 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
8a6e3f208a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13719] Remove superfluous $search_options in acp_search.
2015-03-23 09:43:43 -07: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
Cesar G
8423ae1201
Merge remote-tracking branch 's9e/ticket/13718'
...
* s9e/ticket/13718:
[ticket/13718] Added missing global declaration
2015-03-23 08:49:43 -07:00
brunoais
754b5d6349
[ticket/13719] Remove superfluous $search_options in acp_search.
...
PHPBB3-13719
2015-03-23 12:58:05 +00:00
JoshyPHP
fd230cd9c5
[ticket/13718] Added missing global declaration
...
PHPBB3-13718
2015-03-23 01:51:04 +01:00
Oliver Schramm
eca0128d0a
[ticket/13469] Add tests
...
PHPBB3-13469
2015-03-22 21:30:05 +01: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
RMcGirr83
d4ca81f23f
[ticket/13710] Allow template events near smilies display
...
PHPBB3-13710
2015-03-19 07:25:45 -04:00
Cesar G
9a9a665a0a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
2015-03-18 19:39:13 -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
038b27abba
Merge branch '3.1.x'
2015-03-16 14:43:22 +01:00
Marc Alexander
ee70b364c7
Merge pull request #3490 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
cf8e431334
Merge branch '3.1.x'
2015-03-15 16:59:58 +08:00
Dhruv
faf267c419
Merge branch 'ticket/13702' into 3.1.x
2015-03-15 16:59:21 +08:00
Dhruv
24f26478c4
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/search/fulltext_native.php
2015-03-14 23:44:58 +08:00
Dhruv Goel
f0619b481f
Merge pull request #3476 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
Crizzo
0a52d732e4
[ticket/13701] Adds two new events to posting_pm_layout.html
...
These events wrap the includes of posting_pm_header.html to add some
content before and after it.
PHPBB3-13701
2015-03-13 23:37:07 +01:00
Marc Alexander
a2454285bd
Merge branch '3.1.x'
2015-03-11 13:49:44 +01:00
Marc Alexander
e132e9ba76
Merge pull request #3428 from prototech/ticket/13463
...
[ticket/13463] Correctly position notification mark read icon in RTL.
2015-03-11 13:49:42 +01:00
brunoais
94da39cd88
[ticket/13660] Fix @since version.
...
PHPBB3-13660
2015-03-10 15:42:07 +00:00
Marc Alexander
72d9cf3a95
Merge branch '3.1.x'
2015-03-10 15:23:29 +01:00
Marc Alexander
5b9fe33b1b
Merge pull request #3477 from n-aleha/ticket/13679
...
[ticket/13679] Add template event overall_header_searchbox_before
2015-03-10 15:23:27 +01:00
Marc Alexander
6f3ca35ae7
Merge branch '3.1.x'
2015-03-10 15:20:28 +01:00
Marc Alexander
3cb1907e76
Merge pull request #3445 from RMcGirr83/ticket/13650
...
[ticket/13650] Move core event
2015-03-10 15:20:26 +01:00
n-aleha
aeafb90208
[ticket/13679] Add template event overall_header_searchbox_before
...
PHPBB3-13679
2015-03-08 21:54:01 +02:00
Marc Alexander
3a4e1ce215
Merge branch '3.1.x'
2015-03-07 21:23:59 +01:00
Marc Alexander
2348580255
Merge pull request #3452 from RobertHeim/ticket/13658
...
[ticket/13658] add event before and after topics are deleted
2015-03-07 21:23:57 +01:00
brunoais
9b030fd174
[ticket/13674] Missing space after "if"
...
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1
[ticket/13674] Change MySQL native total search results calculation
...
This changes how the native FULLTEXT search calculates the total
match number for MySQL.
This should improve performance as there is one less query being made
and it is being searched using the technique mentioned in the manual
PHPBB3-13674
2015-03-06 22:23:45 +00:00
Marc Alexander
85c860c581
Merge pull request #3471 from Nicofuma/ticket/13132
...
[ticket/13132] Twig: Add the loops content to the root context
2015-03-06 21:34:19 +01:00
Dragos-Valentin Radulescu
4ccba99047
[ticket/13602] Adding event overall_header_navbar_before
...
PHPBB3-13602
2015-03-06 19:41:02 +02:00
Marc Alexander
5e7560845b
Merge branch '3.1.x'
2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96
Merge pull request #3473 from RMcGirr83/ticket/13675
...
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
