1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

28418 Commits

Author SHA1 Message Date
Tristan Darricau
e8c6a3aa0a
[prep-release-3.2.0-RC1] Update changelog release-3.2.0-RC1 2016-06-19 18:01:48 +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
7cbb049572
[prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Tristan Darricau
6145f46bd1
[prep-release-3.2.0-RC1] Update schema.json 2016-06-19 17:51:51 +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
1f42da7ba5 Merge branch '3.1.x' into 3.2.x 2016-06-19 17:46:12 +02:00
Marc Alexander
83f737a30a Merge pull request #4328 from Senky/ticket/13865
[ticket/13865] Add id_ary, show_results to core.search_modify_param_before
2016-06-19 17:46:09 +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
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
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md
PHPBB3-14672
2016-06-13 06:26:55 -04:00
Richard McGirr
2a53831124 [ticket/14672] Add template event after topic title
PHPBB3-14672
2016-06-12 10:37:49 -04: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
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
Marc Alexander
a90d8fa8d4 [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
PHPBB3-14665
2016-06-08 08:38:55 +02:00
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager
PHPBB3-14664
2016-06-07 23:40:31 +03:00
Jakub Senko
4cf666f0bc [ticket/14631] Load truncate_string() if needed
PHPBB3-14631
2016-06-07 19:39:15 +02: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
Richard McGirr
08acf2acba [ticket/14630] Rename core event
PHPBB3-14630
2016-06-02 05:18:14 -04: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
Jakub Senko
10d96d4f33 [ticket/14429] Add core.modify_users_online_string_modify
PHPBB3-14429
2016-05-27 13:46:23 +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