mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-01 06:22:45 +02:00
Code Issues Releases Wiki Activity
28,593 Commits 18 Branches 191 Tags
Commit Graph

28593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
8bdbca3f52 Merge branch '3.2.x' 2016-06-26 10:27:26 +02:00
Marc Alexander
963a03b120 Merge pull request #4367 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
Crizzo
63b902c2f9 [ticket/14620] Changes specific update-support to general: <=beta to >=RC1 
PHPBB3-14620
 2016-06-21 20:18:15 +02:00
Kailey Truscott
4653951673 [ticket/14687] Modify viewforum_modify_topicrow event 
Add s_type_switch and s_type_switch_test to event vars.

PHPBB3-14687
 2016-06-20 18:21:05 -04:00
Marc Alexander
155d24107a Merge branch '3.2.x' 
Conflicts:
	phpBB/composer.lock
 2016-06-20 21:24:46 +02: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
Máté Bartus
1dc622e921 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14660] Remove redundant empty line in ucp_profile.php
 2016-06-20 10:14:18 +02:00
Máté Bartus
4efaeabc8c Merge pull request #4362 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
Kailey Truscott
a19bf11f73 [ticket/14685] Add viewforum_get_announcement_topic_ids_data event 
Create a new event to alter the SQL array of announcements.

PHPBB3-14685
 2016-06-19 21:30:03 -04:00
Matt Friedman
19da62f873 [ticket/14684] Add and use $NOTESTS for ext-sniff.sh 
PHPBB3-14684
 2016-06-19 17:38:46 -07:00
Marc Alexander
871a97b4b3 Merge branch '3.2.x' 2016-06-19 22:33:37 +02: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
9e7f5e9d86 Merge branch '3.2.x' 2016-06-19 22:07:44 +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 #4358 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
f9a38cafb2 Merge branch '3.2.x' 
Conflicts:
	phpBB/language/en/install.php
 2016-06-19 18:57:52 +02: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
9b748631ed Merge branch '3.2.x' 2016-06-19 18:38:25 +02: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
f8978f23a6 Merge branch '3.2.x' 2016-06-19 18:25:37 +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
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
a6863249a1 Merge branch '3.2.x' 2016-06-19 18:07:55 +02: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
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
2a0c4a8fa9 Merge branch '3.2.x' 2016-06-19 17:55:37 +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
74f36bc1c9 Merge branch '3.2.x' 2016-06-19 17:49:10 +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
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 #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
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 #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