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

28423 Commits

Author SHA1 Message Date
Marc Alexander
ff2c9202bc Merge branch '3.2.x' 2016-06-19 17:46:15 +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 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
f1306cf9ff Merge branch '3.2.x' 2016-06-19 17:21:20 +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 from rmcgirr83/ticket_14630 
[ticket/14630] Add event to modify pm message
 2016-06-19 17:17:26 +02:00
Marc Alexander
4296e0a329 Merge branch '3.2.x' 2016-06-13 22:08:19 +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 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
83682fe4cf Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14291] Do not update filesize if displaying thumbnail
 2016-06-11 13:45:58 +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 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
36e78f4aba Merge branch '3.2.x' 2016-06-08 20:47:20 +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 from lavigor/ticket/14661 
[ticket/14661] Fix a typo in twig.php
 2016-06-08 20:47:14 +02:00
Marc Alexander
34d44d58c3 Merge branch '3.2.x' 2016-06-08 20:32:30 +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 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
1bf58c654a Merge branch '3.2.x' 2016-06-04 16:16:22 +02:00
Marc Alexander
82649b37e4 Merge pull request 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
401e78c5b0 Merge branch '3.2.x' 2016-05-31 21:43:21 +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 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
b465df321c Merge branch '3.2.x' 2016-05-28 09:59:55 +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 from lavigor/ticket/14466 
[ticket/14466] Add an event to cron.php
 2016-05-28 09:59:47 +02:00
Marc Alexander
57733f84e5 Merge branch '3.2.x' 2016-05-27 22:14:00 +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 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
51d80174b1 Merge branch '3.2.x' 2016-05-27 21:10:51 +02:00
Marc Alexander
9bea18b5db Merge pull request 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
1d9e8e4485 Merge branch '3.2.x' 
* 3.2.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: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 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
89371294bf Merge branch '3.2.x' 2016-05-26 15:47:25 +02:00
Marc Alexander
e578450077 Merge pull request 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