makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 12:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
30449 commits 18 branches 192 tags 207 MiB
Commit graph

30449 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
499088b62f Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:37 +01:00
Andreas Fischer
1efbb5b3bb Merge pull request #3493 from prototech/ticket/13555 
[ticket/13555] Render poll options separately when previewing.

* prototech/ticket/13555:
  [ticket/13555] Render poll options separately when previewing.
 2015-03-26 11:15:36 +01:00
Marc Alexander
9eab4ba740 [ticket/12368] Fix comment in docblock 
PHPBB3-12368
 2015-03-26 11:01:22 +01:00
Oliver Schramm
784ccdf0b0 Merge branch '3.1.x' 2015-03-25 22:03:15 +01:00
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
2e7a60d986 [ticket/13564] Try to unlink user account for every auth provider 
PHPBB3-13564
 2015-03-24 17:09:52 +01:00
Marc Alexander
4d7cb7ca73 [ticket/13564] Use user_id from link_data for unlinking account in oauth 
PHPBB3-13564
 2015-03-24 17:08:55 +01:00
Marc Alexander
ca883f1196 [ticket/13564] Allow to specify user id for retrieving auth link data 
PHPBB3-13564
 2015-03-24 17:08:55 +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
brunoais
fe132f19e8 [feature/sql-bool-builder] Improved tests output to show the SQL error. 
PHPBB3-13652
 2015-03-17 20:33:10 +00:00
brunoais
576eaa0cff [feature/sql-bool-builder] Adding the IS operator to predicted operators 
PHPBB3-13652
 2015-03-17 20:31:26 +00:00
brunoais
bc6ea5796d [feature/sql-bool-builder] test_single_not_like 
PHPBB3-13652
 2015-03-16 23:16:49 +00:00
brunoais
c342531872 [feature/sql-bool-builder] test_single_like 
PHPBB3-13652
 2015-03-16 23:16:48 +00:00
brunoais
d60d596f25 [feature/sql-bool-builder] test_single_not_in 
PHPBB3-13652
 2015-03-16 23:16:47 +00:00
brunoais
1754f1832d [feature/sql-bool-builder] test_single_in 
PHPBB3-13652
 2015-03-16 23:16:47 +00:00
brunoais
5f63d685f6 [feature/sql-bool-builder] test_and_of_or_of_and 
PHPBB3-13652
 2015-03-16 23:16:46 +00:00
brunoais
e6eab35a64 [feature/sql-bool-builder] test_triple_and_with_in 
PHPBB3-13652
 2015-03-16 23:16:43 +00:00
brunoais
5d3b22c21e [feature/sql-bool-builder] test_double_and_with_not_of_and 
PHPBB3-13652
 2015-03-16 23:16:01 +00:00
brunoais
d10a0ca1ca [feature/sql-bool-builder] test_triple_and_with_is_null 
PHPBB3-13652
 2015-03-16 23:15:58 +00: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
brunoais
5bc03c9610 [feature/sql-bool-builder] Prepare testing class 
PHPBB3-13652
 2015-03-16 11:14:34 +00:00
brunoais
298d86009e [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations 
PHPBB3-13652
 2015-03-16 11:14:33 +00:00
brunoais
5d70f612be [feature/sql-bool-builder] Explain better the code in the first 
Explain what that if and check is for in the first method that is called.

PHPBB3-13652
 2015-03-16 11:14:32 +00:00
brunoais
51737be616 [feature/sql-bool-builder] Also use parenthesis for the NOT operator 
Be on the safe side, also use parenthesis for the NOT operator

PHPBB3-13652
 2015-03-16 11:14:32 +00:00
brunoais
5c1850e10e [feature/sql-bool-builder] AS keyword must be lowercase; 
AS keyword must be lowercase; expected "as" but found "AS"

PHPBB3-13652
 2015-03-16 11:14:31 +00:00
brunoais
46de946904 [feature/sql-bool-builder] Added code to use this feature for the WHERE clause 
PHPBB3-13652
 2015-03-16 11:14:25 +00:00