makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 206 MiB
Commit graph

10537 commits

Author SHA1 Message Date
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
Marc Alexander
6a73188e6a Merge branch '3.1.x' into 3.2.x 2016-06-13 22:08:17 +02:00
Tobi Schäfer
cff2895599 [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
PHPBB3-14626
 2016-06-13 21:11:54 +02:00
Tobi Schäfer
516670225d [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
https://tracker.phpbb.com/browse/PHPBB3-14626

PHPBB3-14626
 2016-06-13 21:10:13 +02:00
Tobi Schäfer
256730c76a [ticket/14626] Event core.make_jumpbox_modify_tpl_ary 
PHPBB3-14626
 2016-06-13 21:10:13 +02:00
Jakub Senko
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick 
PHPBB3-14654
 2016-06-11 21:32:16 +02:00
Andreas Fischer
cddf80c2e6 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:48 +02:00
Richard McGirr
08acf2acba [ticket/14630] Rename core event 
PHPBB3-14630
 2016-06-02 05:18:14 -04:00
Marc Alexander
72248cab45 [ticket/14291] Do not update filesize if displaying thumbnail 
PHPBB3-14291
 2016-05-30 20:05:45 +02:00
Jakub Senko
10d96d4f33 [ticket/14429] Add core.modify_users_online_string_modify 
PHPBB3-14429
 2016-05-27 13:46:23 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event 
PHPBB3-14649
 2016-05-26 06:26:14 -04:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary 
PHPBB3-13978
 2016-05-24 18:07:11 +02:00
Richard McGirr
06507f9fa6 [ticket/14630] Change event name and fix capitalization 
PHPBB3-14630
 2016-05-16 17:57:26 -04:00
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt 
PHPBB3-14624
 2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-05-15 23:57:16 +02:00
Richard McGirr
c7bbcd7b84 [ticket/14630] Add event to modify pm message 
https://tracker.phpbb.com/browse/PHPBB3-14630

PHPBB3-14630
 2016-05-06 06:31:35 -04:00
Richard McGirr
c0f3463819 [ticket/14624] Remove whitespace 
PHPBB3-14624
 2016-05-05 06:42:28 -04:00
Richard McGirr
c3b30144e3 [ticket/14624] Fix typo and phpBB version 
PHPBB3-14624
 2016-05-05 06:10:56 -04:00
Richard McGirr
aa3c5286cd [ticket/14624] Move event so it actually works 
PHPBB3-14624
 2016-05-05 06:09:11 -04:00
Richard McGirr
8e1102b1da [ticket/14624] Add event to ucp_profile in signature section 
PHPBB3-14624
 2016-05-05 05:26:19 -04:00
Richard McGirr
c938077172 [ticket/13716] Fix verboseness 
PHPBB3-13716
 2016-04-12 05:17:02 -04:00
Joas Schilling
58dfff38fa [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
RMcGirr83
920219dc56 [ticket/13716] Remove extraneous blank line 
PHPBB3-13716
 2016-04-05 14:55:42 -04:00
Richard McGirr
04f320cb01 [ticket/13716] Check phpBB version against config version 
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
 2016-04-05 07:09:12 -04:00
Tristan Darricau
6d2acb5ba3 [ticket/13616] Fix UI tests 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
663e3bc642 [ticket/13616] Updates direct call to twig environment constructor 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
JoshyPHP
2505aaa9d6 [ticket/14426] Fixed undefined offset error 
PHPBB3-14426
 2016-04-03 10:27:23 +02:00
Tristan Darricau
9dad16c5a6 Merge pull request #4271 from kasimi/ticket/14562-3.2.x 
[ticket/14562] Language fallback for extension permissions (3.2.x)

* kasimi/ticket/14562-3.2.x:
  [ticket/14562] Language fallback for extension permissions (3.2.x)
 2016-04-02 13:11:43 +02:00
Tristan Darricau
a895640245 Revert "[ticket/14562] Language fallback for extension permissions" 
This reverts commit 621b958b1c.
 2016-04-02 13:10:55 +02:00
Tristan Darricau
bd91925fe7 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14562] Language fallback for extension permissions
 2016-04-02 13:10:34 +02:00
Tristan Darricau
ccdf8e7ee1 Merge pull request #4270 from kasimi/ticket/14562 
[ticket/14562] Language fallback for extension permissions

* kasimi/ticket/14562:
  [ticket/14562] Language fallback for extension permissions
 2016-04-02 13:02:14 +02:00