mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-22 20:26:25 +02:00
Code Issues Releases Wiki Activity
26,284 Commits 10 Branches 193 Tags
31bd69668033e27a475b57cec59eb5642cad0dfb
Commit Graph

1975 Commits

Author SHA1 Message Date
Joas Schilling
8510faa767 Merge branch '3.1.x' 2015-06-27 11:14:50 +02:00
Joas Schilling
7b93df1522 Merge pull request #3714 from marc1706/ticket/13951 
[ticket/13951] Make sure the page number is an integer
 2015-06-27 11:14:23 +02:00
Marc Alexander
4aba193131 Merge branch '3.1.x' 2015-06-19 10:39:40 +02:00
Raphaël M
c083a4adda [ticket/13949] Replace colon with colon lang key in memberlist search page 
[ticket/13949] Replace colon with colon lang key in memberlist search
page

PHPBB3-13949
 2015-06-19 09:52:33 +02:00
Marc Alexander
783a156bd2 [ticket/13951] Make sure the page number is an integer 
PHPBB3-13951
 2015-06-18 09:22:07 +02:00
Joas Schilling
2a662c5e07 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/phpbb/user.php
 2015-06-14 17:40:18 +02:00
cyberalien
e6407907e2 [ticket/13938] Fix inconsistencies between <link> tags 
PHPBB3-13938
 2015-06-14 07:43:19 +02:00
cyberalien
8eb4ec29ee [ticket/13938] Remove type and / from <link> elements 
PHPBB3-13938
 2015-06-14 07:43:02 +02:00
cyberalien
338abf77e3 [ticket/13938] Change web font code in simple_header 
Apply ticket 13876 to simple_header.html

PHPBB3-13938
 2015-06-14 07:42:37 +02:00
cyberalien
f9c50a8db3 [ticket/13938] Remove link to print.css in simple_header.html 
Remaining fixes for ticket 13873: remove link to print.css and
remove type and media from other links.

PHPBB3-13938
 2015-06-14 07:42:23 +02:00
Tristan Darricau
b30c699900 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/index_body.html
	phpBB/styles/subsilver2/template/login_body.html
	phpBB/styles/subsilver2/template/login_forum.html
	phpBB/styles/subsilver2/template/ucp_login_link.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
	phpBB/styles/subsilver2/template/ucp_register.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2015-06-06 11:44:05 +02:00
Tristan Darricau
593c7ed0e4 Merge pull request #3681 from marc1706/ticket/13200 
[ticket/13200] Disable autocomplete for sensitive input fields
 2015-06-06 11:40:18 +02:00
Marc Alexander
eebab029fd [ticket/13200] Disable autocomplete for sensitive input fields 
PHPBB3-13200
 2015-06-04 19:01:46 +02:00
Joas Schilling
c28a213b1b Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
 2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786 
[ticket/13786] Add events to add MCP post options
 2015-06-04 17:45:21 +02:00
Cesar G
4b46ac78a6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:57:38 +02:00
Cesar G
db3782e491 Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x 
* callumacrae/ticket/13905:
  [ticket/13905] Don't load loading.gif until needed.
 2015-05-31 16:56:44 +02:00
Marc Alexander
7a66d62290 Merge branch '3.1.x' 2015-05-31 14:15:19 +02:00
Callum Macrae
d978564600 [ticket/13905] Don't load loading.gif until needed. 
PHPBB3-13905
 2015-05-31 13:46:30 +02:00
Callum Macrae
27a70f573f [ticket/13898] Fixed all the forum_fn.js violations I understood 
PHPBB3-13898
 2015-05-30 15:03:56 +02:00
Callum Macrae
e3090e04c3 [ticket/13898] js coding standaaards 
PHPBB3-13898
 2015-05-30 14:44:48 +02:00
Marc Alexander
e9601813c1 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-05-30 12:41:24 +02:00
Tristan Darricau
835a2ebcb8 Merge pull request #3625 from s9e/ticket/11742 
[ticket/11742] Remove tabs-to-space conversion in [code]
 2015-05-29 13:03:12 +02:00
Callum Macrae
143578ad09 [ticket/13887] Minor JS refactoring 
PHPBB3-13887
 2015-05-29 12:51:28 +02:00
Callum Macrae
2a83290e7c [ticket/13887] Use correct JSDoc syntax 
PHPBB3-13887
 2015-05-29 12:09:19 +02:00
Marc Alexander
bfba82cd28 Merge branch '3.1.x' 2015-05-28 16:25:28 +02:00
Callum Macrae
44fcdd007f [ticket/13876] set webfont async to true 
PHPBB3-13876
 2015-05-28 16:01:47 +02:00
Callum Macrae
35e5dc46c7 [ticket/13876] Use webfontloader asyncronously. 
This PR adds typekit and Google's webfontloader and calls it
asyncronously, removing the SPOF in the header. Now, if google
goes down, some buttons display with a different font.

https://github.com/typekit/webfontloader

PHPBB3-13876
 2015-05-28 14:55:27 +02:00
javiexin
9951458ebf [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Remove extra template variable around the new event.

PHPBB3-13786
 2015-05-28 14:28:41 +02:00
Marc Alexander
f5037761f0 Merge branch '3.1.x' 2015-05-28 14:18:20 +02:00
Callum Macrae
39cd228e06 [ticket/13873] Removed broken print stylesheet. 
PHPBB3-13873
 2015-05-28 12:46:19 +02:00
Cesar G
30d39687de Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
 2015-05-28 11:17:20 +02:00
Cesar G
080690073a Merge remote-tracking branch 'Wolfsblvt/ticket/13787' into 3.1.x 
* Wolfsblvt/ticket/13787:
  [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
 2015-05-28 11:16:22 +02:00
Joas Schilling
c5b2822cf5 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13808] search_body_form_before

Conflicts:
	phpBB/styles/subsilver2/template/search_body.html
 2015-05-28 11:09:24 +02:00
Joas Schilling
8fda16527e Merge pull request #3600 from dragosvr92/ticket/13808 
[ticket/13808] search_body_form_before
 2015-05-28 11:05:32 +02:00
JoshyPHP
92078dce33 [ticket/11742] Removed tabs-to-space conversion in [code] 
PHPBB3-11742
 2015-05-23 01:55:04 +02:00
Tristan Darricau
d7e2f488a4 Merge branch '3.1.x' 2015-05-19 09:44:36 +02:00
Tristan Darricau
1d2a127144 Merge pull request #3619 from javiexin/ticket/13852 
[ticket/13852] Consistent tab navigation when login in
 2015-05-19 09:43:29 +02:00
javiexin
cb12a065df [ticket/13852] Consistent tab navigation when login in 
Added tabindex attribute to input elements in index_body.html to make
tab navigation consistent with that of login_body.html.

PHPBB3-13852
 2015-05-18 19:38:48 +02:00
Oliver Schramm
c1ab364e28 Merge branch '3.1.x' 2015-05-15 17:54:10 +02:00
Oliver Schramm
1c0c9c1bca Merge pull request #3563 from rxu/ticket/13791 
[ticket/13791] Add more post buttons template events to viewtopic_body.html
 2015-05-15 17:52:44 +02:00
Marc Alexander
11167f6060 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
 2015-05-14 15:57:41 +02:00
Marc Alexander
d004a1c6b8 Merge pull request #3540 from RMcGirr83/ticket/13699 
[ticket/13699] Add event before and after forum title in viewforum
 2015-05-14 15:56:05 +02:00
dragosvr92
345c25c367 [ticket/13808] search_body_form_before 
Extensions may be designed to add secondary search options,
such as Google search in the search_body.html.
There are no events in the searchbody, so this should be merged.

PHPBB3-13808
 2015-05-09 16:41:18 +03:00
Marc Alexander
83e9cdeebc Merge branch '3.1.x' 2015-05-08 11:19:59 +02:00
Marc Alexander
b3b7f8e925 Merge pull request #3530 from VSEphpbb/ticket/13753 
[ticket/13753] Add template events to forum category row headers
 2015-05-08 11:19:53 +02:00
Richard McGirr
c2b4636008 [ticket/13699] Add event before and after forum title in viewforum 
PHPBB3-13699
 2015-05-05 13:37:46 -04:00
rxu
aef5be3d17 [ticket/13791] Add more post buttons template events to viewtopic_body.html 
The purpose is to allow adding custom post buttons outside of original post
buttons conditionals/list in prosilver (for subsilver2 it's not the issue).

PHPBB3-13791
 2015-05-01 10:59:18 +07:00
javiexin
e98a5afd07 [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html

PHPBB3-13786
 2015-04-27 13:21:23 +02:00
Wolfsblvt
55a3d88793 [ticket/13787] Remove duplicate entry of poll_delete in prosilver template 
When options are shown and poll delete is allowed, the option to
delete
polls is shown twice. This is fixed here by moving the if poll
delete
check out of the outer if, wich makes it also more consistent
with the
new event.

PHPBB3-13787
 2015-04-27 02:27:29 +02:00