1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 14:04:57 +02:00

21579 Commits

Author SHA1 Message Date
Marc Alexander
2eb7c21ae0 Merge branch '3.1.x' 2015-03-06 13:50:44 +01:00
Marc Alexander
d087d85618 Merge pull request #3426 from kinerity/ticket/13637
[ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
2015-03-06 13:50:18 +01:00
Marc Alexander
f2a048e5ae Merge branch '3.1.x' 2015-03-06 13:45:12 +01:00
Marc Alexander
d5a79ad555 Merge pull request #3405 from brunoais/ticket/13625
[ticket/13625] Adding multiple variables to core.viewforum_get_topic_data
2015-03-06 13:42:26 +01:00
Cesar G
3ae0bb23b6 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
2015-03-05 15:08:22 -08:00
Cesar G
f3ab7aae9e Merge remote-tracking branch 'marc1706/ticket/13666' into 3.1.x
* marc1706/ticket/13666:
  [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
2015-03-05 15:08:04 -08:00
brunoais
52b83bd5e9 [ticket/13625] Added forum_id to allow more flexibility and possibilities.
PHPBB3-13625
2015-03-05 22:52:03 +00:00
Marc Alexander
bbfbb3f1fa [ticket/13666] Remove data-clicked attribute from all of form's submit buttons
PHPBB3-13666
2015-03-05 22:26:13 +01:00
Kailey Truscott
0f13635fb8 [ticket/13637] Update msg_id docblock
Change topic_id to post_id

PHPBB3-13637
2015-03-05 13:28:19 -05:00
Cesar G
c6b2039540 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:42:08 -08:00
Cesar G
c0104d0243 Merge remote-tracking branch 'cyberalien/ticket/13667' into 3.1.x
* cyberalien/ticket/13667:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:41:33 -08:00
Marc Alexander
a33c99b3fd Merge branch '3.1.x' 2015-03-05 16:02:48 +01:00
Marc Alexander
d0ab101c32 Merge pull request #3453 from RMcGirr83/ticket/13477
[ticket/13477] Update file cache driver for extension paths
2015-03-05 16:02:46 +01:00
Marc Alexander
f85d49aada Merge branch '3.1.x' 2015-03-05 15:47:04 +01:00
Marc Alexander
8f09ff210f Merge pull request #3413 from kasimi/ticket/13540
[ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
2015-03-05 15:46:33 +01:00
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
4618a3e2f8 [ticket/13477] rename function and fix doc blocks
PHPBB3-13477
2015-03-04 14:20:27 -05: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
cyberalien
5d8bea9060 [ticket/13667] Fix buttons alignment in Chrome for Windows
PHPBB3-13667
2015-03-03 16:47:30 +02:00
RMcGirr83
5cd4941c55 [ticket/13477] Update file cache driver for filenames
Replace slashes on file name

PHPBB3-13477
2015-03-03 09:31:30 -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
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
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
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