makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 08:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
26337 commits 18 branches 192 tags 207 MiB
Commit graph

3275 commits

Author SHA1 Message Date
Marc Alexander
39d3a026fe Merge branch '3.1.x' 2015-07-07 10:46:51 +02:00
Tristan Darricau
d54aa190f1 Merge pull request #3623 from s9e/ticket/10620 
[ticket/10620] Quote improvements
 2015-07-07 09:46:36 +02:00
Kailey Truscott
4ac2256683 [ticket/13955] Revert changes made in previous commit 
Revert the javascript function change
Place the families code on it's own line

PHPBB3-13955
 2015-07-06 16:43:57 -04:00
Kailey Truscott
886ca1dbb9 [ticket/13955] Fix javascript to conform to Google and add simple_header 
Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header

PHPBB3-13955
 2015-07-06 01:43:03 -04:00
Kailey Truscott
b346f216c2 [ticket/13955] Fix WebFontConig to load web fonts correctly 
Fix overall_header's WebFontConfig section to load fonts correctly
in all browsers.

PHPBB3-13955
 2015-07-03 23:44:43 -04:00
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
JoshyPHP
9d364aee4a [ticket/10620] Moved quote's date to the upper corner 
PHPBB3-10620
 2015-06-25 22:51:44 +02:00
JoshyPHP
129b3375ae [ticket/10620] Added enhanced quotes in pm history 
PHPBB3-10620
 2015-06-25 03:11:58 +02:00
JoshyPHP
06936bda05 [ticket/10620] Added enhanced quotes in topic review 
Added support for enhanced quotes in topic_review's quote button.
NOTE: the UI doesn't appear to be testable via PhantomJS.

PHPBB3-10620
 2015-06-25 03:11:58 +02:00
JoshyPHP
f02cc27014 [ticket/10620] Implemented quote improvements 
PHPBB3-10620
 2015-06-25 03:11:55 +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
Marc Alexander
1b354ae468 Merge branch '3.1.x' 2015-06-17 16:02:47 +02:00
Marc Alexander
a259d61f57 Merge pull request #3649 from callumacrae/ticket/13879 
[ticket/13879] Replaced px with em where appropriate.
 2015-06-17 16:02:41 +02:00
JoshyPHP
4be0730898 [ticket/13946] Changed [list] margin to match [code] 
PHPBB3-13946
 2015-06-16 17:20:14 +02:00
JoshyPHP
08c7afedfa [ticket/13946] Increase the CSS margin around [code] and [list] 
PHPBB3-13946
 2015-06-14 19:06:36 +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
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +02:00
JoshyPHP
3c0cbda289 [ticket/13902] Increased CSS margin around quotes 
PHPBB3-13902
 2015-06-07 06:57:59 +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
Marc Alexander
518902ef51 Merge pull request #3640 from callumacrae/ticket/13876 
[ticket/13876] Use webfontloader asyncronously.
 2015-05-28 16:25:26 +02:00
Callum Macrae
44fcdd007f [ticket/13876] set webfont async to true 
PHPBB3-13876
 2015-05-28 16:01:47 +02:00
Callum Macrae
8b6c6e794a [ticket/13879] Replaced px with em where appropriate. 
We're using ems basically everywhere else so ¯\_(ツ)_/¯

PHPBB3-13879
 2015-05-28 15:57:31 +02:00
Cesar G
2271f6a9da Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13878] Display background images when printing topic in webkit
 2015-05-28 15:35:04 +02:00
Marc Alexander
3ec3dfcf3a [ticket/13878] Display background images when printing topic in webkit 
PHPBB3-13878
 2015-05-28 14:58:46 +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
Marc Alexander
45d7e18f6b Merge pull request #3637 from callumacrae/ticket/13873 
[ticket/13873] Removed broken print stylesheet.
 2015-05-28 14:18:18 +02:00