mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00
Code Issues Releases Wiki Activity
28,687 Commits 18 Branches 192 Tags
Commit Graph

10268 Commits

Author SHA1 Message Date
Marc Alexander
8783ede6e0 Merge branch '3.2.x' 2016-08-21 09:51:28 +02:00
Marc Alexander
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
Jakub Senko
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label 
PHPBB3-12925
 2016-08-15 18:27:33 +02:00
Marc Alexander
5acb831f19 Merge pull request #4282 from CHItA/ticket/14584 
[ticket/14548] Move deprecated globals and functions
 2016-08-07 21:02:17 +02:00
Marc Alexander
da15d435bf Merge branch '3.2.x' 2016-08-01 20:42:16 +02:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users 
PHPBB3-14721
 2016-08-01 00:26:47 +02:00
Máté Bartus
e9f28ea22c [ticket/14584] Change all to be removed tags to 4.0 
PHPBB3-14584
 2016-07-29 17:48:26 +02:00
Máté Bartus
54e5d41359 [ticket/14548] Move deprecated globals and functions 
PHPBB3-14584
 2016-07-29 17:48:00 +02:00
Marc Alexander
8760a1fd51 Merge branch '3.2.x' 2016-07-17 15:54:19 +02:00
Marc Alexander
d3f017c149 Merge branch '3.1.x' into 3.2.x 2016-07-17 15:54:15 +02:00
rxu
a840d70bbf [ticket/14713] Add core event to the admin function get_forum_list() 
PHPBB3-14713
 2016-07-17 12:40:21 +07: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
96406f9b2e Merge branch '3.2.x' 2016-07-14 20:14:30 +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
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
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
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
37cf178c0c
[Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev 2016-06-27 21:58:31 +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
rxu
1a0e40489f [ticket/14690] Create email queue cache file in the current env cache folder 
PHPBB3-14690
 2016-06-23 01:20:45 +07:00
rxu
fa878f2818 [ticket/14660] Remove redundant empty line in ucp_profile.php 
PHPBB3-14660
 2016-06-20 14:28:22 +07:00
Marc Alexander
09c602425c Merge pull request #4357 from rxu/ticket/14660 
[ticket/14660] Fix parsing board email messages through template engine.
 2016-06-19 22:33:29 +02:00
Marc Alexander
cc628f06b2 Merge pull request #4356 from markshawtoronto/ticket/14680 
[ticket/14680] Fix wrong function name being checked in mcp_queue.
 2016-06-19 18:38:23 +02:00
Marc Alexander
a460aec68c Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/language/en/install.php
 2016-06-19 18:25:16 +02:00
Marc Alexander
c60dbede3e Merge pull request #4281 from rmcgirr83/ticket_13716 
[ticket/13716] Check phpBB version against config version
 2016-06-19 18:17:33 +02:00
Marc Alexander
70b04016eb Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-06-19 17:54:55 +02:00
Marc Alexander
804236bce4 Merge pull request #4331 from Senky/ticket/13978 
[ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
 2016-06-19 17:53:23 +02:00
Tristan Darricau
2eb8a97f47
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 2016-06-19 17:51:51 +02:00
Marc Alexander
63d3b240a4 Merge branch '3.1.x' into 3.2.x 2016-06-19 17:49:07 +02:00
Marc Alexander
cf8c13b04c Merge pull request #4329 from Senky/ticket/14429 
[ticket/14429] Add core.obtain_users_online_string_before_modify
 2016-06-19 17:49:01 +02:00
Marc Alexander
79d6d53296 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_pm_compose.php
 2016-06-19 17:20:45 +02:00
Marc Alexander
6764bea40c Merge pull request #4316 from rmcgirr83/ticket_14630 
[ticket/14630] Add event to modify pm message
 2016-06-19 17:17:26 +02:00
rxu
9551475fce [ticket/14660] Fix parsing board email messages through template engine. 
PHPBB3-14660
 2016-06-18 00:39:33 +07:00
Mark Shaw
4d50a1daa5 [ticket/14680] Fix wrong function name being checked in mcp_queue. 
PHPBB3-14680
 2016-06-17 11:50:32 -04:00
Benjamin Staneck
3708770eb9 [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option 
This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
 2016-06-17 08:46:02 +02:00