mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
25,319 Commits 17 Branches 190 Tags
Commit Graph

25319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
7c26cd25c7 Merge pull request #3434 from nickvergessen/ticket/13647 
[ticket/13647] Move FAQ page to a controller
 2015-03-05 15:25:30 +01:00
Marc Alexander
87ca5ef7e5 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
	phpBB/styles/subsilver2/theme/stylesheet.css
 2015-03-05 14:23:50 +01:00
Marc Alexander
70f1741331 Merge pull request #3454 from RMcGirr83/ticket/13590 
[ticket/13590] Headers of remember me login keys are not centered
 2015-03-05 13:56:01 +01:00
RMcGirr83
c3720739cb [ticket/13590] Headers of remember me login keys are not centered 
Corrected a few other files as well

PHPBB3-13590
 2015-03-04 06:00:27 -05:00
Joas Schilling
7e0d54a331 [ticket/13647] Use the Symfony way for redirecting 
PHPBB3-13647
 2015-02-27 22:58:51 +01:00
Joas Schilling
8ec18b10c3 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/session.php
 2015-02-27 22:47:02 +01:00
Joas Schilling
18de60c0e0 Merge branch '3.0.x' into 3.1.x 2015-02-27 22:44:13 +01:00
Joas Schilling
8abf259273 Merge pull request #3444 from naderman/ticket/13617-ascraeus 
[ticket/13617] Enforce column size limit for session_forum_id
 2015-02-27 22:44:04 +01:00
Joas Schilling
62973faf4b Merge pull request #3443 from naderman/ticket/13617 
[ticket/13617] Enforce column size limit for session_forum_id
 2015-02-27 22:43:32 +01:00
Marc Alexander
5d6f86800f Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2015-02-27 22:10:27 +01:00
Marc Alexander
a7b1b71921 Merge pull request #3451 from RMcGirr83/ticket/13510 
[ticket/13510] Add template even viewtopic_body_pagination_after
 2015-02-27 22:08:51 +01:00
Marc Alexander
f526e81ddf Merge branch '3.1.x' 2015-02-27 12:21:46 +01:00
Marc Alexander
e15b9dc782 Merge pull request #3388 from rxu/ticket/13596 
[ticket/13596] Add display_forums() event to allow modifying forums list data
 2015-02-27 12:20:50 +01:00
Marc Alexander
a11181b5dd Merge branch '3.1.x' 2015-02-27 12:00:27 +01:00
Marc Alexander
0daf148aaa Merge pull request #3384 from brunoais/ticket/13592 
[ticket/13592] Allow changing get_visibility_sql's result
 2015-02-27 12:00:09 +01:00
RMcGirr83
8c73f63529 [ticket/13510] Add template even viewtopic_body_pagination_after 
PHPBB3-13510
 2015-02-26 18:29:02 -05:00
Joas Schilling
e5595ca216 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2015-02-26 22:53:26 +01:00
Joas Schilling
c814ecc143 Merge pull request #3449 from prototech/ticket/13649 
[ticket/13649] Fix incorrect subforum tooltip title when unread.
 2015-02-26 22:53:06 +01:00
Joas Schilling
48d208a3a6 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/functions_mcp.php
 2015-02-26 22:48:52 +01:00
Joas Schilling
4928afedc6 Merge pull request #3447 from brunoais/ticket/13143 
[ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting()
 2015-02-26 22:47:51 +01:00
Joas Schilling
72f7c5e9c2 Merge branch '3.1.x' 2015-02-26 22:40:03 +01:00
Joas Schilling
ea4b993516 Merge pull request #2992 from prototech/ticket/12599 
[ticket/12599] Update documentation style
 2015-02-26 22:34:05 +01:00
Joas Schilling
b75a0d9a11 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
 2015-02-26 22:32:32 +01:00
Joas Schilling
6647d390b0 Merge pull request #3448 from prototech/ticket/13563 
[ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
 2015-02-26 22:32:03 +01:00
Marc Alexander
c9df29d680 Merge pull request #3303 from Nicofuma/ticket/13513 
[ticket/13513] Use paths relative to the phpBB root in the router
 2015-02-26 13:41:51 +01:00
Cesar G
4df853abcc [ticket/12599] Remove empty line at end of code boxes. 
PHPBB3-12599
 2015-02-25 20:08:08 -08:00
Cesar G
a07b29c1df [ticket/12599] Place standalone text in a box. 
PHPBB3-12599
 2015-02-25 20:08:03 -08:00
Cesar G
6e5f33e5fb [ticket/12599] Get the font sizes under control. 
PHPBB3-12599
 2015-02-25 20:02:40 -08:00
Cesar G
62f69224a4 [ticket/12599] Add padding on the sides of the inline code boxes. 
PHPBB3-12599
 2015-02-25 20:02:28 -08:00
Cesar G
5cd3e7627c [ticket/12599] Use the back to top icon instead of text. 
PHPBB3-12599
 2015-02-25 20:02:16 -08:00
Cesar G
14fecb2f02 [ticket/12599] Move images to assets/ and update the phpBB logo. 
PHPBB3-12599
 2015-02-25 20:02:06 -08:00
Cesar G
4565cac049 [ticket/12599] Move documentation stylesheet to assets directory. 
PHPBB3-12599
 2015-02-25 20:01:53 -08:00
Cesar G
e29e0e5018 [ticket/12599] Remove corner images from documentation style. 
PHPBB3-12599
 2015-02-25 20:01:25 -08:00
Cesar G
335d88cdbb [ticket/13649] Fix incorrect subforum tooltip title when unread. 
PHPBB3-13649
 2015-02-25 19:36:28 -08:00
Cesar G
37b919142f [ticket/13563] Remove PM column from subsilver2's memberlist_body.html. 
The PM link was intentionally dropped due to excessive query requirements,
thus the column is without purpose now. See PHPBB3-13229

PHPBB3-13563
 2015-02-25 19:15:11 -08:00
brunoais
c8be24fd5e [ticket/13652] Added $phpbb_dispatcher from global to phpbb_mcp_sorting() 
PHPBB3-13652
 2015-02-25 23:28:42 +00:00
Nils Adermann
106bc1c232 [ticket/13617] Document magic number for forum_id 
PHPBB3-13617
 2015-02-25 17:00:22 +01:00
Nils Adermann
c5a15c0635 [ticket/13617] Use request->variable instead of request_var 
PHPBB3-13617
 2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4 Merge branch 'ticket/13617' into ticket/13617-ascraeus 
* ticket/13617:
  [ticket/13617] Enforce column size limit for session_forum_id

Conflicts:
	phpBB/phpbb/session.php
 2015-02-25 16:25:20 +01:00
Nils Adermann
6f3f6282d1 [ticket/13617] Enforce column size limit for session_forum_id 
PHPBB3-13617
 2015-02-25 16:20:50 +01:00
Joas Schilling
261c3bc1d0 Merge branch '3.1.x' 2015-02-24 21:57:14 +01:00
Joas Schilling
3ac583271f Merge pull request #3381 from rxu/ticket/13591 
[ticket/13591] Add core events to the function obtain_users_online_string()
 2015-02-24 21:56:34 +01:00
Joas Schilling
06d6bcbe00 Merge branch '3.1.x' 2015-02-24 21:53:05 +01:00
Joas Schilling
9f9e392c7d Merge pull request #3436 from RMcGirr83/ticket/13650 
[ticket/13650] Validate ucp profile data changes
 2015-02-24 21:53:01 +01:00
Joas Schilling
17b00812a7 Merge branch '3.1.x' 2015-02-24 20:44:37 +01:00
Joas Schilling
56cbff720d Merge pull request #3439 from RMcGirr83/ticket/13587 
[ticket/13587] SQL syntax errors in get_prune_users()
 2015-02-24 20:44:15 +01:00
RMcGirr83
80e1c233d9 [ticket/13587] SQL syntax errors in get_prune_users() 
PHPBB3-13587
 2015-02-24 13:28:47 -05:00
Richard McGirr
03ded5853b [ticket/13650] Validate ucp profile data changes 
PHPBB3-13650
 2015-02-23 21:19:10 -05:00
Andreas Fischer
b57e00226a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
 2015-02-22 23:44:42 +01:00
Andreas Fischer
525a62f72e Merge pull request #3433 from Nicofuma/ticket/13643 
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000

* Nicofuma/ticket/13643:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
 2015-02-22 23:44:42 +01:00