mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-17 22:20:11 +01:00
Code Issues Releases Wiki Activity
28,379 Commits 18 Branches 191 Tags
Commit Graph

24064 Commits

Author SHA1 Message Date
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
Marc Alexander
597e7163c0 Merge pull request #4233 from VSEphpbb/ticket/14547 
[ticket/14547] Add Vagrant support to phpBB
 2016-06-20 21:22:34 +02: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
219977ccf3 Merge branch '3.1.x' into 3.2.x 2016-06-19 22:07:42 +02:00
rxu
773a701d62 [ticket/14683] Fix typos in email templates. 
PHPBB3-14683
 2016-06-20 00:15:37 +07:00
Marc Alexander
9639f6ad63 Merge pull request #4326 from Crizz0/ticket/14640 
[ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2
 2016-06-19 18:56:04 +02:00
Matt Friedman
d5e342db3a [ticket/14547] Fix Docs and increase PHP memory limit 
PHPBB3-14547
 2016-06-19 09:40:51 -07: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
rxu
abe93918b4 [ticket/14660] Fix typos in email templates. 
PHPBB3-14660
 2016-06-19 23:08:06 +07:00
Marc Alexander
450e5b36b8 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2016-06-19 18:07:29 +02:00
Marc Alexander
aaa99b4719 Merge pull request #4351 from rmcgirr83/ticket_14672 
[ticket/14672] Add template event after topic title
 2016-06-19 18:04:22 +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
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
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
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
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
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
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
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
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
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
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too 
PHPBB3-11446
 2016-05-27 12:59:30 +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