mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
28,334 Commits 17 Branches 190 Tags
Commit Graph

28334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Shaw
4d50a1daa5 [ticket/14680] Fix wrong function name being checked in mcp_queue. 
PHPBB3-14680
 2016-06-17 11:50:32 -04:00
Marc Alexander
6a73188e6a Merge branch '3.1.x' into 3.2.x 2016-06-13 22:08:17 +02:00
Marc Alexander
8d3716ab91 Merge pull request #4352 from marc1706/ticket/14626 
[ticket/14626] Event core.make_jumpbox_modify_tpl_ary
 2016-06-13 22:08:14 +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
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
Andreas Fischer
d316927225 Merge pull request #4345 from marc1706/ticket/14291 
[ticket/14291] Do not update filesize if displaying thumbnail

* marc1706/ticket/14291:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:27 +02:00
Marc Alexander
ef1e163180 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:47:17 +02:00
Marc Alexander
cf2b96def7 Merge pull request #4346 from lavigor/ticket/14661 
[ticket/14661] Fix a typo in twig.php
 2016-06-08 20:47:14 +02:00
Marc Alexander
a9beed3ad0 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:32:28 +02:00
Marc Alexander
9d88238f89 Merge pull request #4348 from lavigor/ticket/14664 
[ticket/14664] Fix PHPDoc comment in cron manager
 2016-06-08 20:32:25 +02:00
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager 
PHPBB3-14664
 2016-06-07 23:40:31 +03:00
lavigor
ff8b5058e0 [ticket/14661] Fix a typo in twig.php 
PHPBB3-14661
 2016-06-05 13:40:40 +03:00
Marc Alexander
82649b37e4 Merge pull request #4302 from cyberalien/ticket/14612 
[ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
 2016-06-04 16:15:48 +02:00
Marc Alexander
4fdbd6217d Merge branch '3.1.x' into 3.2.x 2016-05-31 21:43:19 +02:00
Marc Alexander
b63c61d099 Merge pull request #4343 from Senky/ticket/14643 
[ticket/14643] Offer latest backup to restore by default
 2016-05-31 21:43:16 +02: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
73073ac8c3 [ticket/14643] Offer latest backup to restore by default 
PHPBB3-14643
 2016-05-29 17:28:33 +02:00
Marc Alexander
50227dbc75 Merge branch '3.1.x' into 3.2.x 2016-05-28 09:59:50 +02:00
Marc Alexander
0a512b2695 Merge pull request #4173 from lavigor/ticket/14466 
[ticket/14466] Add an event to cron.php
 2016-05-28 09:59:47 +02:00
Marc Alexander
80db259ab9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/phpbb/notification/manager.php
 2016-05-27 22:13:35 +02:00
Marc Alexander
e30518461c Merge pull request #4332 from Senky/ticket/11446 
[ticket/11446] Use sql_in_set properly in phpbb_notification_manager
 2016-05-27 21:16:32 +02:00
Marc Alexander
9bea18b5db Merge pull request #4333 from markshawtoronto/ticket/14648 
[ticket/14648] Fix bug where default notifications stop working if another setting is set.
 2016-05-27 20:29:26 +02:00
Máté Bartus
be5ea21706 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14650] Semi-colon instead of slash to make Matt happy
  [ticket/14650] Move CONTRIBUTING.md and add pull request template
 2016-05-27 13:28:47 +02:00
Máté Bartus
191b80a750 Merge pull request #4335 from marc1706/ticket/14650 
[ticket/14650] Move CONTRIBUTING.md and add pull request template
 2016-05-27 13:27:26 +02:00
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too 
PHPBB3-11446
 2016-05-27 12:59:30 +02:00
Marc Alexander
dcf90a8d8b [ticket/14650] Semi-colon instead of slash to make Matt happy 
PHPBB3-14650
 2016-05-26 18:46:34 +02:00
Marc Alexander
a8fb33218c [ticket/14650] Move CONTRIBUTING.md and add pull request template 
PHPBB3-14650
 2016-05-26 18:34:55 +02:00
Marc Alexander
e578450077 Merge pull request #4334 from rmcgirr83/ticket_14649 
[ticket/14649] Add preview variable back to ucp_profile for event
 2016-05-26 15:47:20 +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
Mark Shaw
548357e14c [ticket/14648] Remove whitespace at the end of a line 
PHPBB3-14648
 2016-05-25 18:28:07 -04:00
Mark Shaw
2576993564 [ticket/14648] Fix bug where default notifications stop working if another setting is set. 
When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work.

PHPBB3-14648
 2016-05-25 14:30:04 -04:00
Marc Alexander
3e88ea9c06 Merge pull request #4325 from DavidIQ/ticket/14591 
[ticket/14591] Use the correct delimiter for MSSQL
 2016-05-24 21:47:31 +02:00
Jakub Senko
7e6371ea8e [ticket/11446] Use sql_in_set properly in phpbb_notification_manager 
PHPBB3-11446
 2016-05-23 18:13:17 +02:00
Máté Bartus
283a039647 Merge pull request #4327 from paul999/ticket/14645 
[ticket/14645] Language pack not reconised when using a symlink
 2016-05-22 21:43:34 +02:00
Paul Sohier
1a68504174
[ticket/14645] Language pack not reconised when using a symlink 
Symfony finder does not follow symlinks by default.
With this change it does, so a user is able to have the language pack outside
the phpBB directory, and linked with a symlink into phpBB/language/

PHPBB3-14645
 2016-05-21 19:50:12 +02:00
David Colón
3bafbc81ef [ticket/14591] Use the correct delimiter for MSSQL 
PHPBB3-14591
 2016-05-18 14:53:52 -04:00
Marc Alexander
90cefcf0f4 Merge pull request #4315 from Nicofuma/ticket/14628 
[ticket/14628] Supports translatable error messages in the CLI installer
 2016-05-16 14:05:24 +02:00
Máté Bartus
7a28b7514a Merge pull request #4320 from marc1706/ticket/14624 
[ticket/14624] Remove no longer existing event argumemt
 2016-05-16 12:06:38 +02: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
Marc Alexander
e7262e2d39 Merge pull request #4314 from rmcgirr83/ticket_14624 
[ticket/14624] Add event to ucp_profile in signature section
 2016-05-15 23:52:37 +02:00
Tristan Darricau
40a00bd4e5
Merge pull request #4319 from derekheld/ticket/14595 
[ticket/14595] Installer will now ask for a SMTP port as part of email setup.

* derekheld/ticket/14595:
  [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595
  [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595
 2016-05-15 10:17:01 +02:00
Derek Held
9c34594bc3 [ticket/14595] Added smtp_port where places where smtp_host exists. 
PHPBB3-14595
 2016-05-14 09:19:26 -07:00
Derek Held
bf37cdf878 [ticket/14595] Added SMTP port to getConfigTreeBuilder 
PHPBB3-14595
 2016-05-14 07:57:55 -07:00
Marc Alexander
961ffee684 Merge branch '3.1.x' into 3.2.x 2016-05-12 19:16:03 +02:00
Marc Alexander
734972cc3d Merge pull request #4317 from rmcgirr83/ticket_14610 
[ticket/14610] Don't log an error if the Q&A captcha has been solved
 2016-05-12 19:15:58 +02:00
Richard McGirr
03348087d8 [ticket/14610] Implement lavigor method 
PHPBB3-14610
 2016-05-09 17:28:55 -04:00
Richard McGirr
f57f09f814 [ticket/14610] Remove whitespace 
PHPBB3-14610
 2016-05-08 09:24:11 -04:00