mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-10 19:03:24 +02:00
Code Issues Releases Wiki Activity
28,530 Commits 18 Branches 192 Tags
Commit Graph

28530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
1c20bc33a5 Merge branch '3.2.x' 2016-07-16 21:25:53 +02:00
Marc Alexander
019e85d064 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_move.html
 2016-07-16 21:25:17 +02:00
Marc Alexander
b54aa81cdd Merge pull request #4337 from Senky/ticket/14506 
Add mcp_move_before template event
 2016-07-16 21:24:33 +02:00
Marc Alexander
305efd648b Merge branch '3.2.x' 2016-07-16 19:49:31 +02:00
Marc Alexander
b14c088ce7 Merge branch '3.1.x' into 3.2.x 2016-07-16 19:49:28 +02:00
Marc Alexander
6f109dd1ef Merge pull request #4374 from TheKigen/ticket/14616 
[ticket/14616] Fixed auto-prune failing on large forums
 2016-07-16 19:49:25 +02:00
Marc Alexander
4e840fee16 Merge branch '3.2.x' 
Conflicts:
	phpBB/composer.lock
 2016-07-14 20:23:27 +02:00
Marc Alexander
ebdef04f5d Merge pull request #4380 from JoshyPHP/ticket/14706 
[ticket/14706] Updated [list] BBCode to automatically create a list item
 2016-07-14 20:18:24 +02:00
Marc Alexander
96406f9b2e Merge branch '3.2.x' 2016-07-14 20:14:30 +02:00
Marc Alexander
d47a22dda0 Merge pull request #4381 from wesleyfok/ticket/14709 
[ticket/14709] add post_id to mod log
 2016-07-14 20:14:28 +02:00
Marc Alexander
c880d73fe8 Merge branch '3.2.x' 2016-07-14 20:11:54 +02:00
Marc Alexander
61bca182f6 Merge branch '3.1.x' into 3.2.x 2016-07-14 20:11:51 +02:00
Marc Alexander
38082c41e3 Merge pull request #4347 from Senky/ticket/14631 
[ticket/14631] Load truncate_string() if needed
 2016-07-14 20:11:48 +02:00
Wesley Fok
d53f75f668 [ticket/14709] add post_id to mod log 
Add the missing post_id value to the moderator log entry created upon
deleting one or more posts in the MCP topic view.

PHPBB3-14709
 2016-07-13 12:00:06 -04:00
Andreas Fischer
c2860cbabb Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
 2016-07-10 20:06:48 +02:00
Andreas Fischer
c1cb59c237 Merge pull request #4349 from marc1706/ticket/14665 
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration

* marc1706/ticket/14665:
  [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
 2016-07-10 20:06:43 +02:00
Andreas Fischer
a4f575c322 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14689] Build API docs for 3.2.x
 2016-07-08 14:12:52 +02:00
Andreas Fischer
7f50c798e6 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14689] Build API docs for 3.2.x
 2016-07-08 14:12:43 +02:00
Andreas Fischer
927cc2ebad Merge pull request #4379 from marc1706/ticket/14689 
[ticket/14689] Build API docs for 3.2.x

* marc1706/ticket/14689:
  [ticket/14689] Build API docs for 3.2.x
 2016-07-08 14:12:34 +02:00
JoshyPHP
24da2db987 [ticket/14706] Updated [list] BBCode to automatically create a list item 
Fixes issues with missing list items. Produces valid HTML.

PHPBB3-14706
 2016-07-08 07:49:10 +02:00
Marc Alexander
2ec4855cba [ticket/14689] Build API docs for 3.2.x 
PHPBB3-14689
 2016-07-07 19:25:26 +02:00
Marc Alexander
113738fce9 Merge branch '3.2.x' 2016-07-07 19:20:42 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-07 19:19:40 +02:00
Marc Alexander
55b854906d Merge pull request #4342 from Senky/ticket/14654 
[ticket/14654] Change Imagemagick to ImageMagick
 2016-07-07 19:15:33 +02:00
Max Krivanek
1c52968df6 [ticket/14616] Switch prune limit to sql_query_limit instead of sql_and 
PHPBB3-14616
 2016-07-06 23:00:35 -05:00
Marc Alexander
cd45922186 Merge branch '3.2.x' 2016-07-06 19:30:26 +02:00
Marc Alexander
24b80d6bd7 Merge pull request #4375 from bantu/ticket/14692 
[ticket/14692] Remove duplicate subexpression in questionnaire.php
 2016-07-06 19:30:22 +02:00
Marc Alexander
fc8a7013d6 Merge branch '3.2.x' 2016-07-06 19:24:08 +02:00
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
Marc Alexander
cddb884be6 Merge pull request #4354 from Stanzilla/smtp_explain 
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
 2016-07-06 19:23:54 +02:00
Marc Alexander
983d9a629b Merge branch '3.2.x' 2016-07-06 19:19:21 +02:00
Marc Alexander
51181c6ea1 Merge pull request #4376 from Sumanai/ticket/14671 
[ticket/14671] Remove schema.json file
 2016-07-06 19:19:17 +02:00
Sumanai
95520d2ff2 [ticket/14671] Remove schema.json file 
PHPBB3-14671
 2016-07-02 20:15:01 +04:00
kilida
8829772631 [ticket/14692] Remove duplicate subexpression in questionnaire.php 
Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')`
was repeated.

PHPBB3-14692
 2016-07-02 10:35:27 +02:00
Max Krivanek
c4b93c9c1c [ticket/14616] Added comma expected by test scripts. 
PHPBB3-14616
 2016-07-01 04:09:42 -05:00
Max Krivanek
65a4f0d631 [ticket/14616] Added prune_limit to event core.prune_sql 
PHPBB3-14616
 2016-06-28 20:47:46 -05:00
Marc Alexander
46aa5e65e4 Merge branch '3.2.x' 2016-06-28 21:10:18 +02:00
Marc Alexander
1298591dff Merge pull request #4360 from VSEphpbb/ticket/14684 
[ticket/14684] Add and use $NOTESTS for ext-sniff.sh
 2016-06-28 21:09:30 +02:00
Marc Alexander
c9716a8b63 Merge branch '3.2.x' 2016-06-27 22:06:08 +02:00
Marc Alexander
7404155a1e Merge pull request #4372 from lavigor/ticket/14696 
[ticket/14696] Fix email template test for '0' username
 2016-06-27 22:05:51 +02:00
Tristan Darricau
fe9df5b76b
[Release 3.2.0-RC1] Restore versions in master 
This reverts commit 37cf178c0c9ed787fd9db8bb33086b72950b8eee.
 2016-06-27 21:59:53 +02:00
Tristan Darricau
926d55bc02
Merge branch '3.2.x' 
* 3.2.x:
  [Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev
 2016-06-27 21:58:43 +02:00
Tristan Darricau
37cf178c0c
[Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev 2016-06-27 21:58:31 +02:00
Tristan Darricau
f9d251943b
Merge branch '3.2.x' 
* 3.2.x:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:56:21 +02:00
Tristan Darricau
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x 
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:54:41 +02:00
Max Krivanek
9170261885 [ticket/14616] Removed misplaced tab. 
PHPBB3-14616
 2016-06-27 04:42:01 -05:00
Max Krivanek
f75a01182f [ticket/14616] Fixed auto-prune failing on large forums 
PHPBB3-14616
 2016-06-27 04:20:12 -05:00
lavigor
27f16a195e [ticket/14696] Be perfect 
PHPBB3-14696
 2016-06-26 16:05:08 +03:00
lavigor
471a773bcf [ticket/14696] Fix email template test for '0' username 
PHPBB3-14696
 2016-06-26 14:29:45 +03:00
Marc Alexander
8bdbca3f52 Merge branch '3.2.x' 2016-06-26 10:27:26 +02:00