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

25179 commits

Author SHA1 Message Date
Marc Alexander
97e002cc3d Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/log/log.php
 2016-01-15 11:18:13 +01:00
Marc Alexander
295a424fc7 Merge pull request #4117 from Elsensee/ticket/14403 
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
 2016-01-15 11:15:56 +01:00
Marc Alexander
15157eed61 [ticket/14411] Permanently delete post if delete_permanent is set 
PHPBB3-14411
 2016-01-14 23:15:36 +01:00
Oliver Schramm
d045822cd8 [ticket/14403] Set a default user id and ip in CLI 
PHPBB3-14403
 2016-01-14 20:31:54 +01:00
lavigor
ef09b562db [ticket/13442] UTF-8 symbols for database host 
PHPBB3-13442
 2016-01-14 15:38:14 +03:00
lavigor
b34dbc2e84 [ticket/12441] Correct database size detection in MariaDB 10 
PHPBB3-12441
 2016-01-14 12:29:17 +03:00
Marc Alexander
a94c20faa2 [ticket/11875] Add back new line 
PHPBB3-11875
 2016-01-13 19:36:20 +01:00
Marc Alexander
7cd7bb3c01 [ticket/11875] Change more columns to use UINT and add missings ones 
PHPBB3-11875
 2016-01-13 19:35:04 +01:00
Marc Alexander
31607771e1 [ticket/11875] Add migration file 
PHPBB3-11875
 2016-01-13 17:02:42 +01:00
Marc Alexander
192a5f19f4 Merge pull request #2064 from hjpotter92/ticket/11875 
[ticket/11875] Set default data type from MEDIUMINT (3byte) to INT(10) (4byte)

Conflicts:
	phpBB/includes/db/schema_data.php
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/phpbb/db/tools/tools.php
 2016-01-13 13:21:08 +01:00
Marc Alexander
08647781c0 Merge pull request #4059 from JoshyPHP/ticket/14323 
[ticket/14323] Added support for truncating long URLs
 2016-01-13 12:55:31 +01:00
Marc Alexander
d55a8a8cee Merge branch '3.1.x' 2016-01-13 09:27:35 +01:00
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group 
PHPBB3-14407
 2016-01-13 08:28:30 +01:00
JoshyPHP
e4dae8ed4b [ticket/14405] Force a lookahead check on [URL] BBCodes 
PHPBB3-14405
 2016-01-12 11:54:20 +01:00
Marc Alexander
68d945e931 Merge branch '3.1.x' 2016-01-12 04:31:15 +01:00
Marc Alexander
826d6aac74 Merge pull request #3929 from kilianr/ticket/12618 
[ticket/12618] Allow extension author to use SSL for version-check.
 2016-01-12 04:11:56 +01:00
Kilian
ad34b87824 [ticket/12618] Change ssl:// to tls:// 
PHPBB3-12618
 2016-01-10 19:33:45 +01:00
Oliver Schramm
0cc41b94b1 [ticket/14403] Don't expect user_id and user_ip in phpbb\log 
PHPBB3-14403
 2016-01-10 17:43:10 +01:00
Richard McGirr
469b975f94 [ticket/14289] Change to 3.1.8-RC1 and rename event 
PHPBB3-14289
 2016-01-10 07:17:43 -05:00
Joas Schilling
7f7b09fdeb Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
 2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-01-09 18:42:07 +01:00
Tristan Darricau
1e0340b0cf [ticket/14306] Improves Error display 
PHPBB3-14306
 2016-01-09 18:03:21 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Marc Alexander
d64680983a Merge pull request #4097 from Nicofuma/ticket/14382 
[ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 16:30:11 +01:00
Tristan Darricau
e8a4526f4a [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:42:42 +01:00
Tristan Darricau
3f40a89864 [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:36:43 +01:00
Tristan Darricau
6594ef8b1e [ticket/14306] CS and correctly handle exception loop 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
7f8b6c02c6 [ticket/14306] Update the error message 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
761fa9da52 [ticket/14306] Doesn't try to build a "safe" container in the dev env 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
78349ed80f [ticket/14306] Automatically enable a safe mode when container building fails 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Joas Schilling
85e98a9d70 [prep-release-3.1.7] Add changelog for 3.1.7-pl1 2016-01-09 09:46:32 +01:00
Joas Schilling
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
Joas Schilling
89da4e8bf7 [prep-release-3.1.7] Update version to 3.1.7-pl1 2016-01-09 09:35:03 +01:00
Joas Schilling
c2d59b3352 Merge pull request #24 from phpbb/ticket/security-188 
[ticket/security-188] Check form key in acp_bbcodes
 2016-01-09 09:13:50 +01:00
kasimi
80c32fb7ef [ticket/14343] Added missing $phpbb_dispatcher 
PHPBB3-14343
 2016-01-09 09:13:20 +01:00
Oliver Schramm
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +01:00
Oliver Schramm
1f16421782 Merge pull request #4114 from marc1706/ticket/14396 
[ticket/14396] Use VCHAR_UNI and correct depends_on() version
 2016-01-08 18:22:00 +01:00
Marc Alexander
c6c7730e04 Merge branch '3.1.x' 2016-01-08 17:57:05 +01:00
Oliver Schramm
a7648b0eaa [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after' 
PHPBB3-14397
 2016-01-08 17:04:18 +01:00
Marc Alexander
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version 
PHPBB3-14396
 2016-01-08 16:55:40 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2016-01-08 16:39:33 +01:00
Marc Alexander
2ab7b12419 Merge pull request #4112 from marc1706/ticket/13180 
[ticket/13180] Increase dateformat field size
 2016-01-08 16:39:03 +01:00
Oliver Schramm
b6fee9f536 Merge branch '3.1.x' 2016-01-08 16:06:46 +01:00
Oliver Schramm
ae18f8b27c Merge pull request #3924 from Senky/ticket/14190 
[ticket/14190] Add core.ucp_prefs_view_after event
 2016-01-08 15:51:53 +01:00
LaxSlash
575468931f [ticket/14395] Add event core.viewtopic_add_quickmod_option_after 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. The function is run before any event can be called to
modify ... meaning that any modifications done to this array
will not affect the options displayed to the user on the viewtopic page itself.
This event serves two purposes - one, it is easier to add new quickmod options,
and two, it allows an extenstion developer to check additional permissions and
apply further authentication for the display of the quickmod options.

PHPBB3-14395
 2016-01-08 02:44:58 -05:00
LaxSlash
5f052ec8dc [ticket/14395] Add event core.viewtopic_add_quickmod_option_after 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. The function is run before any event can be called to
modify ... meaning that any modifications done to this array
will not affect the options displayed to the user on the viewtopic page itself.
This event serves two purposes - one, it is easier to add new quickmod options,
and two, it allows an extenstion developer to check additional permissions and
apply further authentication for the display of the quickmod options.

PHPBB3-14395
 2016-01-08 02:17:41 -05:00
LaxSlash
e030f0ca09 [ticket/14395] Add event core.viewtopic_add_quickmod_option_after 
Added an event before the function phpbb_add_quickmod_option is called in
the viewtopic.php file. The function is run before any event can be called to
modify ... meaning that any modifications done to this array
will not affect the options displayed to the user on the viewtopic page itself.
This event serves two purposes - one, it is easier to add new quickmod options,
and two, it allows an extenstion developer to check additional permissions and
apply further authentication for the display of the quickmod options.

PHPBB3-14395
 2016-01-08 01:30:36 -05:00
LaxSlash
8e8fac17ff [ticket/14395] Move call to phpbb_add_quickmod_option 
Moved the call to function phpbb_add_quickmod_option to being under the core
event core.viewtopic_assign_template_vars_before so as to enable the
modification of elements in the  BEFORE they are assigned to the
template, so that removed elements don't show up in a non-functional state.
Allows the user to perform additional permissions checks on the items within the
array.

PHPBB3-14395
 2016-01-07 15:36:10 -05:00
Saeed Hubaishan
a339b9e84f [ticket/13180] Increase dateformat field size 
remove empty line as marc1706 guided

PHPBB3-13180
 2016-01-07 20:03:35 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size 
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
 2016-01-07 17:36:02 +01:00