mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
28,698 Commits 17 Branches 190 Tags
Commit Graph

28698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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 #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
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
Crizzo
25ae8876b6 [ticket/14620] Adds section update from 3.0/3.1 to 3.2 
PHPBB3-14620
 2016-06-08 22:06:01 +02:00
Crizzo
797565dfa7 [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date 
PHPBB3-14620
 2016-06-08 21:45:52 +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
Crizzo
800b7be873 [ticket/14620] Updates section 4.i. Full package to 3.2.0 
PHPBB3-14620
 2016-06-08 20:29:17 +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