Commit graph

25339 commits

Author SHA1 Message Date
Marc Alexander
85c860c581 Merge pull request #3471 from Nicofuma/ticket/13132
[ticket/13132] Twig: Add the loops content to the root context
2015-03-06 21:34:19 +01:00
Dragos-Valentin Radulescu
4ccba99047 [ticket/13602] Adding event overall_header_navbar_before
PHPBB3-13602
2015-03-06 19:41:02 +02:00
Marc Alexander
5e7560845b Merge branch '3.1.x' 2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96 Merge pull request #3473 from RMcGirr83/ticket/13675
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
Marc Alexander
bd22b8319b Merge branch '3.1.x' 2015-03-06 14:30:14 +01:00
Marc Alexander
3d7def4196 Merge pull request #3450 from brunoais/ticket/13142
[ticket/13142] Before query to get the total number of reports
2015-03-06 14:30:11 +01:00
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
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events
for acp users profile

PHPBB3-13675
2015-03-06 07:26:35 -05: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
Tristan Darricau
cf39cfc593 [ticket/13132] Twig: Add loops content to the root context
PHPBB3-13132
2015-03-05 21:38:59 +01:00
brunoais
4cdcb6d5d3 [ticket/13672] Allow changing the data from the user-submitted report
PHPBB3-13672
2015-03-05 18:31:11 +00: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
brunoais
8a6d55520d [ticket/13668] Allow changing the query to obtain the user-submitted report.
PHPBB3-13668
2015-03-05 16:21:23 +00:00
brunoais
fa474c4378 [ticket/13668] Convert the mcp report_details query to a built query
PHPBB3-13668
2015-03-05 16:19:36 +00: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
brunoais
134a5e0391 [ticket/13661] Brackets in their own line
I didn't even notice that I used my own coding guidelines there...
Thanks to MGaetan89 for pointing it out.

PHPBB3-13661
2015-03-02 12:06:24 +00:00
brunoais
c7cc8a098e [ticket/13661] Re-Fixed $log_type -> $log_time
Thanks to goof for pointing it out...

PHPBB3-13661
2015-03-01 21:17:06 +00:00
brunoais
21cc1fda85 [ticket/13664] Added alias to table to make modding easier.
PHPBB3-13664
2015-03-01 20:57:06 +00:00
brunoais
d53b584c9a [ticket/13661] Wrong event @since version
PHPBB3-13661
2015-03-01 20:44:30 +00:00
brunoais
5fa6871ebf [ticket/13664] Add event to allow changing number of unapproved posts listed
PHPBB3-13664
2015-03-01 20:26:12 +00:00
brunoais
772bbdfeae [ticket/13661] Removed superfluous whitespace
PHPBB3-13661
2015-03-01 19:58:57 +00:00
brunoais
5ad69bbecf [ticket/13664] From string query in mcp_front unapproved posts to built query
PHPBB3-13664
2015-03-01 19:55:43 +00:00
brunoais
d0a1650a04 [ticket/13661] bugfix: The conditional is the log_time, not log_type
I mistakenly made the log_type the conditional instead of log_time.
Thankfully, the automated tests helped finding this mistake.

PHPBB3-13661
2015-03-01 18:41:20 +00:00
Joas Schilling
fb71e6dde6 [ticket/8494] Ignore errors from the database schema preparation
This allows installing phpBB twice in the same database with a different
prefix

PHPBB3-8494
2015-03-01 17:37:26 +01:00
brunoais
c887eedaa5 [ticket/13661] Fixed the "FROM" in the built query.
I was doing it wrong by giving a string to the FROM clause in the built query.

PHPBB3-13661
2015-03-01 14:07:32 +00:00
brunoais
d66a53a531 [ticket/13661] Add event to allow editing the queries used to get the logs
PHPBB3-13661
2015-03-01 11:56:38 +00:00
brunoais
dbc09bf0d4 [ticket/13661] Transform queries to get logs and log count into built queries
PHPBB3-13661
2015-02-28 20:34:25 +00:00
brunoais
8b23272c33 [ticket/13660] Allow changing the query for total reports in mcp_front
PHPBB3-13660
2015-02-28 08:57:43 +00:00
brunoais
c37d5f9b7c [ticket/13142] Default $total to -1 before the event for more flexibility
PHPBB3-13142
2015-02-27 22:51:32 +00: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