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

28383 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
Marc Alexander
963a03b120 Merge pull request from rxu/ticket/14690 
[ticket/14690] Create email queue cache file in the current env cache folder
 2016-06-26 10:27:22 +02: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
Marc Alexander
597e7163c0 Merge pull request from VSEphpbb/ticket/14547 
[ticket/14547] Add Vagrant support to phpBB
 2016-06-20 21:22:34 +02:00
Máté Bartus
4efaeabc8c Merge pull request from rxu/ticket/14660-fix-empty-line 
[ticket/14660] Remove redundant empty line in ucp_profile.php
 2016-06-20 10:12:11 +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 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
Marc Alexander
9595946508 Merge pull request from rxu/ticket/14683 
[ticket/14683] Fix typos in email templates.
 2016-06-19 22:07:38 +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 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 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 from rmcgirr83/ticket_13716 
[ticket/13716] Check phpBB version against config version
 2016-06-19 18:17:33 +02:00
rxu
6a48cad4a2 [ticket/14660] Add test case. 
PHPBB3-14660
 2016-06-19 23:09:36 +07: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 from rmcgirr83/ticket_14672 
[ticket/14672] Add template event after topic title
 2016-06-19 18:04:22 +02:00
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 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 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 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 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
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
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 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 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 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 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