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
Nicofuma
54753e926d
[ticket/13132] Enable twig expressions tests
...
PHPBB3-13132
2015-03-05 21:53:48 +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
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
Andreas Fischer
70990bc86f
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
2015-03-05 19:06:28 +01:00
Andreas Fischer
323167bb94
Merge pull request #3466 from marc1706/ticket/13670
...
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP/
* marc1706/ticket/13670:
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
2015-03-05 19:06:28 +01: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
Andreas Fischer
3166d9126c
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13657] Run travis builds on PHP 7.0
2015-03-05 15:42:49 +01:00
Andreas Fischer
149a2dd91a
Merge pull request #3465 from marc1706/ticket/13657
...
[ticket/13657] Run travis builds on PHP 7.0
* marc1706/ticket/13657:
[ticket/13657] Run travis builds on PHP 7.0
2015-03-05 15:42:47 +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
33738fa3db
[ticket/13670] Modify variable-variable syntax in common avatar test for PHP7
...
PHPBB3-13670
2015-03-05 15:10:37 +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
Marc Alexander
160ff3471d
[ticket/13657] Run travis builds on PHP 7.0
...
PHPBB3-13657
2015-03-05 11:26:53 +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
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
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
Robert Heim
2ad87c662f
[ticket/13658] renamed events and added table_ary parameter
...
- added suffix '_query' to event names
- added table_ary to before event
PHPBB3-13658
2015-02-27 21:04:08 +01:00
RobertHeim
71828ee8df
[ticket/13658] add event before and after topics are deleted
...
PHPBB3-13658
2015-02-27 18:01:26 +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
brunoais
df9331084b
[ticket/13142] Removed surperfulous space
...
PHPBB3-13142
2015-02-27 10:42:27 +00:00
