mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00
Code Issues Releases Wiki Activity
26,006 Commits 18 Branches 192 Tags
Commit Graph

2492 Commits

Author SHA1 Message Date
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
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
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
Cesar G
a8ec353a4f Merge branch '3.1.x' 
* 3.1.x:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
 2015-05-28 13:36:31 +02:00
Cesar G
f1e11414e8 Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.x 
* marc1706/ticket/12542:
  [ticket/12542] Use more specific CSS for drag-n-drop
  [ticket/12542] Do not use browser specific css for outline
  [ticket/12542] Properly check if textarea is undefined or null
  [ticket/12542] Use extended CSS for all browsers
  [ticket/12542] Rename javascript method and add doc block
  [ticket/12542] Add different outline colors for body & textarea
  [ticket/12542] Add initial drag-n-drop animation
 2015-05-28 13:36:15 +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
Marc Alexander
abef078ab9 [ticket/12542] Use more specific CSS for drag-n-drop 
Otherwise the CSS gets overwritten by other CSS rules.

PHPBB3-12542
 2015-05-28 11:04:22 +02:00
Marc Alexander
622d5b2643 [ticket/12542] Do not use browser specific css for outline 
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
 2015-05-23 10:51:04 +02:00
JoshyPHP
adbc45b486 [ticket/11742] Removed whitespace collapsing in codebox [ci skip] 
PHPBB3-11742
 2015-05-23 01:55:05 +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
Marc Alexander
818df0ec68 [ticket/12542] Use extended CSS for all browsers 
PHPBB3-12542
 2015-04-29 12:30:35 +02:00
Marc Alexander
ae8129b699 [ticket/12542] Add different outline colors for body & textarea 
PHPBB3-12542
 2015-04-29 00:12:55 +02:00
Marc Alexander
46a789de5c [ticket/12542] Add initial drag-n-drop animation 
PHPBB3-12542
 2015-04-28 16:12:58 +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
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Matt Friedman
96339b7c86 [ticket/13753] Add template events to forum category row headers 
PHPBB3-13753
 2015-04-09 11:04:25 -07:00
Joas Schilling
a11994d424 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-04-06 14:45:20 +02:00
Joas Schilling
02202b1503 Merge pull request #3492 from RMcGirr83/ticket/13710 
[ticket/13710] Allow template events near smilies display
 2015-04-06 14:44:37 +02:00
Joas Schilling
4ce0d88ffd Merge branch '3.1.x' 2015-04-06 14:43:11 +02:00
Joas Schilling
b16a56394b Merge pull request #3488 from Crizz0/ticket/13701 
[ticket/13701] Adds two new events to posting_pm_layout.html

Conflicts:
	phpBB/docs/events.md
 2015-04-06 14:42:59 +02:00
Joas Schilling
370fce1651 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
 2015-04-06 14:27:48 +02:00
Joas Schilling
7d08bf5b3e Merge pull request #3517 from Wolfsblvt/ticket/13739 
[ticket/13739] Add template core event posting_poll_body_options_after
 2015-04-06 14:26:35 +02:00
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing order of if statement and event

PHPBB3-13739
 2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
 2015-04-03 18:56:53 +02:00
Joas Schilling
7541fab408 Merge branch '3.1.x' 2015-04-03 18:56:23 +02:00