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

25509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Marc Alexander
bd22b8319b Merge branch '3.1.x' 2015-03-06 14:30:14 +01:00
Marc Alexander
3d7def4196 Merge pull request #3450 from brunoais/ticket/13142 
[ticket/13142] Before query to get the total number of reports
 2015-03-06 14:30:11 +01:00
Marc Alexander
2eb7c21ae0 Merge branch '3.1.x' 2015-03-06 13:50:44 +01:00
Marc Alexander
d087d85618 Merge pull request #3426 from kinerity/ticket/13637 
[ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
 2015-03-06 13:50:18 +01:00
Marc Alexander
f2a048e5ae Merge branch '3.1.x' 2015-03-06 13:45:12 +01:00
Marc Alexander
d5a79ad555 Merge pull request #3405 from brunoais/ticket/13625 
[ticket/13625] Adding multiple variables to core.viewforum_get_topic_data
 2015-03-06 13:42:26 +01:00
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events 
for acp users profile

PHPBB3-13675
 2015-03-06 07:26:35 -05:00
Cesar G
3ae0bb23b6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
 2015-03-05 15:08:22 -08:00
Cesar G
f3ab7aae9e Merge remote-tracking branch 'marc1706/ticket/13666' into 3.1.x 
* marc1706/ticket/13666:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
 2015-03-05 15:08:04 -08:00
brunoais
52b83bd5e9 [ticket/13625] Added forum_id to allow more flexibility and possibilities. 
PHPBB3-13625
 2015-03-05 22:52:03 +00:00
Marc Alexander
bbfbb3f1fa [ticket/13666] Remove data-clicked attribute from all of form's submit buttons 
PHPBB3-13666
 2015-03-05 22:26:13 +01:00
Nicofuma
54753e926d [ticket/13132] Enable twig expressions tests 
PHPBB3-13132
 2015-03-05 21:53:48 +01:00
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context 
PHPBB3-13132
 2015-03-05 21:38:59 +01:00
Kailey Truscott
0f13635fb8 [ticket/13637] Update msg_id docblock 
Change topic_id to post_id

PHPBB3-13637
 2015-03-05 13:28:19 -05:00
Andreas Fischer
70990bc86f Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
 2015-03-05 19:06:28 +01:00
Andreas Fischer
323167bb94 Merge pull request #3466 from marc1706/ticket/13670 
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP/

* marc1706/ticket/13670:
  [ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
 2015-03-05 19:06:28 +01:00
Cesar G
c6b2039540 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
 2015-03-05 08:42:08 -08:00
Cesar G
c0104d0243 Merge remote-tracking branch 'cyberalien/ticket/13667' into 3.1.x 
* cyberalien/ticket/13667:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
 2015-03-05 08:41:33 -08:00