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

11396 commits

Author SHA1 Message Date
Marc Alexander
80768b526b Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/user_loader.php
 2015-06-16 12:35:51 +02:00
Marc Alexander
dc9245dd7a Merge pull request #3653 from callumacrae/ticket/13882 
[ticket/13882] Lazy load the notification avatars.
 2015-06-16 12:33:17 +02:00
Andreas Fischer
2eceaaddf6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10711] Duplicate key error on forum_tracks_table
 2015-06-13 16:27:44 +02:00
Andreas Fischer
89f7fc63e8 Merge pull request #3703 from javiexin/ticket/10711 
[ticket/10711] Duplicate key error on forum_tracks_table

* javiexin/ticket/10711:
  [ticket/10711] Duplicate key error on forum_tracks_table
 2015-06-13 16:27:44 +02:00
javiexin
7b026eff79 [ticket/10711] Duplicate key error on forum_tracks_table 
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).

The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.

PHPBB3-10711
 2015-06-13 01:08:18 +02:00
Joas Schilling
9238d28353 [3.1.x] Update dev version to 3.1.6-RC1 2015-06-11 23:25:43 +02:00
Joas Schilling
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
Joas Schilling
a3883a6f23 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-06-11 21:00:04 +02:00
Joas Schilling
4276962e78 [3.1.x] Increase dev version to 3.1.6-dev 2015-06-11 20:57:26 +02:00
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly 
PHPBB3-13823
 2015-06-09 23:11:26 +02:00
Andreas Fischer
9713f52fc6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:56 +02:00
Andreas Fischer
d8343f2108 Merge pull request #3685 from Nicofuma/ticket/13923 
[ticket/13923] Update startup.php

* Nicofuma/ticket/13923:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:49 +02:00
Andreas Fischer
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
 2015-06-09 21:27:23 +02:00
Andreas Fischer
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
 2015-06-09 21:27:07 +02:00
Tristan Darricau
b5573bb92d [ticket/13923] CS 
PHPBB3-13923
 2015-06-09 21:22:52 +02:00
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +02:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
 2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685 
[ticket/13685] Allow modifying the query for mysql native fulltext search
 2015-06-09 14:27:13 +02:00
brunoais
6e8da5a424 [ticket/13685] This should take care of the rest 
PHPBB3-13685
 2015-06-08 18:09:48 +01:00
Marc Alexander
d3e55a8290 Merge branch '3.1.x' 
Conflicts:
	phpBB/posting.php
 2015-06-08 17:59:49 +02:00
Oliver Schramm
c2d254ea41 Merge branch 'ticket/13833-30x' into ticket/13833 
Conflicts:
        phpBB/posting.php

PHPBB3-13833
 2015-06-08 17:19:11 +02:00
Oliver Schramm
2c6369c5d9 [ticket/13833] Prevent flooding if type=submit doesn't exist 
PHPBB3-13833
 2015-06-08 17:01:52 +02:00
Marc Alexander
2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master 
Conflicts:
	phpBB/includes/acp/acp_database.php
 2015-06-08 15:39:47 +02:00
Marc Alexander
f9389995e7 [ticket/13930] Add missing spaces to code 
PHPBB3-13930
 2015-06-08 13:54:50 +02:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01:00
Tristan Darricau
9777abaed4 Merge branch '3.1.x' 2015-06-07 18:02:47 +02:00
Joas Schilling
17b94b8f9c [ticket/13823] Remove the unnecessary brackets 
This changes the line with non-whitespace changes, so the packaging script
should correctly detect them as changed and put the file into the update.

PHPBB3-13823
 2015-06-07 17:54:38 +02:00
Marc Alexander
77bc8ee68b Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
 2015-06-07 14:59:33 +02:00
Marc Alexander
bac02a348e Merge pull request #22 from phpbb/ticket/sec-184 
[ticket/sec-184] Do not output passwords to HTML
 2015-06-07 14:57:06 +02:00
Tristan Darricau
1f772234f7 Merge branch '3.1.x' 2015-06-06 18:12:54 +02:00
Tristan Darricau
99d3995548 Merge pull request #23 from phpbb/ticket/13913 
[ticket/13913] Correctly check the forum_password and read permissions
 2015-06-06 18:12:36 +02:00
AJ Quick
c78ee4e201 [ticket/13923] Update startup.php 
While suppressing the output from the 'set_magic_quotes_runtime(0)'
is sufficient with normal phpBB installs, using this file in association
with the oauth plugin will cause an error on some versions of PHP.
This fixes a potential bug where set_magic_quotes_runtime is depreciated
in newer versions of PHP.

PHPBB3-13923
 2015-06-06 13:05:34 +02:00
Tristan Darricau
e60b7f6cf2 Merge branch '3.1.x' 2015-06-06 12:02:15 +02:00
Tristan Darricau
774582876c Merge pull request #3671 from marc1706/ticket/9563 
[ticket/9563] Do not show empty categories on index
 2015-06-06 12:02:04 +02:00
Marc Alexander
c8ccae7a7c Merge branch '3.1.x' 2015-06-05 10:05:50 +02:00
CHItA
2b0acdcea4 [ticket/13841] Fix tests on 3.1 and master branch 
PHPBB3-13841
 2015-06-05 07:33:40 +02:00
javiexin
9057f72fc7 [ticket/13911] Add events to configure options for profile fields 
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number and event name.

PHPBB3-13911
 2015-06-04 19:13:23 +02:00
Joas Schilling
3ce3183e61 Merge branch '3.1.x' 2015-06-04 18:03:35 +02:00
Joas Schilling
7a55bcc0f3 Merge pull request #3611 from Alf007/ticket/13841 
Ticket/13841
 2015-06-04 18:03:19 +02:00
Joas Schilling
c28a213b1b Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
 2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786 
[ticket/13786] Add events to add MCP post options
 2015-06-04 17:45:21 +02:00
Joas Schilling
f3f82bd377 Merge branch '3.1.x' 2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7 Merge pull request #3502 from marc1706/ticket/13564 
[ticket/13564] Unlink user accounts upon deleting user
 2015-06-04 17:30:09 +02:00
Joas Schilling
e8f9458a21 [ticket/13913] Correctly check the forum_password and read permissions 
We need to check them on the forum the post is in, rather than the forum row
we are displaying.

PHPBB3-13913
 2015-06-04 16:48:58 +02:00
Joas Schilling
78b0c938a2 [ticket/sec-184] Do not output LDAP password to HTML 
SECURITY-184
 2015-06-04 14:29:03 +02:00
Joas Schilling
9c84b3b5fb [ticket/sec-184] Do not output Jabber password to HTML 
SECURITY-184
 2015-06-04 14:13:07 +02:00
Joas Schilling
6ca3a30576 [ticket/sec-184] Do not output config passwords to the HTML page 
SECURITY-184
 2015-06-04 14:06:35 +02:00
javiexin
b627a097bb [ticket/13911] Add events to configure options for profile fields 
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fix bamboo formatting errors.

PHPBB3-13911
 2015-06-02 18:30:10 +02:00
javiexin
0f6d16920b [ticket/13911] Add events to configure options for profile fields 
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields.

PHPBB3-13911
 2015-06-02 13:18:33 +02:00
MateBartus
4044b5df89 [ticket/13777] Reorder get_module_infos() method's arguments 
PHPBB3-13777
 2015-05-31 16:03:11 +02:00