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

26695 commits

Author SHA1 Message Date
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
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
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
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
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
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
576eaa0cff [feature/sql-bool-builder] Adding the IS operator to predicted operators 
PHPBB3-13652
 2015-03-17 20:31:26 +00:00
Marc Alexander
038b27abba Merge branch '3.1.x' 2015-03-16 14:43:22 +01: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
brunoais
b54adaaabe [feature/sql-bool-builder] Removed non-necessary spaces 
PHPBB3-13652
 2015-03-16 11:13:50 +00:00
brunoais
5c77e43819 [feature/sql-bool-builder] First working version 
PHPBB3-13652
 2015-03-16 11:13:49 +00: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
brunoais
cfdaf2d63f [ticket/13694] Allow modifying the Postgres native author search query 
PHPBB3-13694
 2015-03-12 22:14:20 +00:00
brunoais
29ccbd8098 [ticket/13693] Allow modifying the MySQL author search query 
PHPBB3-13693
 2015-03-12 12:23:53 +00:00
brunoais
1a001fc233 [ticket/13691] Allow changing query to search for posts by author in native 
PHPBB3-13691
 2015-03-12 12:23:29 +00:00
brunoais
d5dd9c929d [ticket/13689] Allow modifying the query for postgres native fulltext search 
PHPBB3-13689
 2015-03-12 12:22:45 +00:00
brunoais
3bda9a3c11 [ticket/13686] Allow modify query used for counting in fulltext_native 
PHPBB3-13686
 2015-03-12 12:22:07 +00:00
brunoais
c3a0e09ddb [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-03-12 12:21:15 +00: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