Marc Alexander
16deefa7f8
Merge pull request #3635 from nickvergessen/ticket/13808
...
[ticket/13808] Fix version
2015-05-28 12:40:29 +02:00
Joas Schilling
0daa999fd0
[ticket/13808] Fix version
...
PHPBB3-13808
2015-05-28 12:34:21 +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
8fda16527e
Merge pull request #3600 from dragosvr92/ticket/13808
...
[ticket/13808] search_body_form_before
2015-05-28 11:05:32 +02:00
Joas Schilling
7580798a5a
Merge pull request #3435 from rxu/ticket/13648
...
[ticket/13648] Allow extensions using custom bbcode validation methods
2015-05-28 10:49:33 +02:00
Marc Alexander
cc134d5fed
Merge pull request #3631 from rxu/ticket/13868
...
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
2015-05-28 10:42:40 +02:00
rxu
33239183ae
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
...
PHPBB3-13868
2015-05-27 02:15:12 +07:00
Marc Alexander
5ca77df084
Merge pull request #3624 from VSEphpbb/ticket/13861
...
[ticket/13861] Fix undefined variables in style update migration
2015-05-22 11:49:07 +02:00
Matt Friedman
67502c0d22
[ticket/13861] Fix undefined variables in style update migration
...
PHPBB3-13861
2015-05-21 15:23:17 -07: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
Nicofuma
309a6b9313
Merge pull request #3601 from nickvergessen/ticket/13827
...
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
2015-05-17 20:01:18 +02:00
Joas Schilling
e52bc2d022
Merge pull request #3606 from Nicofuma/ticket/13838
...
[ticket/13838] Check braces for control structures
2015-05-16 13:39:45 +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
dcb36d572d
Merge pull request #3607 from Nicofuma/ticket/13830
...
[ticket/13830] Fix unsused used statements and catch blocks
2015-05-14 18:14:26 +02:00
Joas Schilling
502214bf06
[ticket/13827] Use JsonResponse instead of our hacky json_response with exit()
...
PHPBB3-13827
2015-05-14 17:13:47 +02:00
Nicofuma
3bc2b54128
[ticket/13830] Fix unsused used statements and catch blocks
...
PHPBB3-13830
2015-05-14 16:02:05 +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
Nicofuma
62e13e945c
[ticket/13838] Fix coding style
...
PHPBB3-13838
2015-05-14 15:43:44 +02:00
Nicofuma
e4b30c474b
[ticket/13838] Check braces for control structures
...
PHPBB3-13838
2015-05-14 15:40:52 +02:00
Marc Alexander
4527789e50
Merge pull request #3605 from Nicofuma/ticket/13830
...
[ticket/13830] Check class used in catch statements
2015-05-14 12:53:29 +02:00
Nicofuma
084aa56777
[ticket/13830] Check class used in catch statements
...
PHPBB3-13830
2015-05-10 21:13:36 +02:00
Joas Schilling
66279e1a57
[ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
...
PHPBB3-13827
2015-05-09 20:48:14 +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
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
Marc Alexander
7f5f5c216b
Merge pull request #3529 from rxu/ticket/13752
...
[ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
2015-05-08 11:16:40 +02:00
Marc Alexander
d741ab57a8
Merge pull request #3526 from rxu/ticket/13750
...
[ticket/13750] Add core event to allow modifying navlinks text
2015-05-08 11:14:17 +02:00
Marc Alexander
7a478b27dd
Merge pull request #3459 from brunoais/ticket/13664
...
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
2015-05-08 11:07:50 +02:00
Marc Alexander
4fc6e7dbc7
Merge pull request #3598 from VSEphpbb/ticket/13822
...
[ticket/13822] Correctly display softdelete and post detail perms
2015-05-08 10:59:40 +02:00
Matt Friedman
350786c969
[ticket/13822] Correctly display softdelete and post detail perms
...
PHPBB3-13822
2015-05-07 21:10:16 -07:00
Marc Alexander
1e28748c0c
Merge pull request #3455 from brunoais/ticket/13660
...
[ticket/13660] Allow changing the query for total reports in mcp_front
2015-05-08 00:17:10 +02:00
rxu
aa1b427e45
[ticket/13648] Allow extensions using custom bbcode validation methods
...
PHPBB3-13648
2015-05-07 22:01:10 +07:00
rxu
a67db63a18
[ticket/13750] Add core event to allow modifying navlinks text
...
Add generate_forum_nav() core event in includes/functions_display.php
to allow modifying navlinks text. Use case example: extension(s) implementing
multilanguage boards including translated forum names and so on.
PHPBB3-13750
2015-05-07 21:57:27 +07:00
brunoais
603726371c
[ticket/13660] BUMP version to 3.1.5-RC1
...
PHPBB3-13660
2015-05-06 23:08:07 +01:00
brunoais
70cbe67105
[ticket/13664] BUMP version to 3.1.5-dev
...
PHPBB3-13664
2015-05-06 22:55:30 +01:00
Marc Alexander
a8c033f655
Merge pull request #3521 from rxu/ticket/13745
...
[ticket/13745] Add viewtopic.php core event to allow manipulating poll data
2015-05-06 21:47:07 +02:00
Nicofuma
5e99c09abe
Merge pull request #3583 from nickvergessen/ticket/13807
...
Ticket/13807 Allow building changesets for the event list
2015-05-06 01:13:33 +02:00
Andreas Fischer
65b40f15f5
Merge pull request #3595 from marc1706/ticket/13819
...
[ticket/13819] Add missing sql_freeresult() to files in includes/
* marc1706/ticket/13819:
[ticket/13819] Add missing sql_freeresult() to files in includes/
2015-05-06 00:46:57 +02:00
Marc Alexander
de90dd25b2
[ticket/13819] Add missing sql_freeresult() to files in includes/
...
PHPBB3-13819
2015-05-05 23:55:13 +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
Joas Schilling
740be0507e
[ticket/13807] Add version to the usage output
...
PHPBB3-13807
2015-05-05 18:35:57 +02:00
Nicofuma
ab3e4b8abc
Merge pull request #3564 from VSEphpbb/ticket/13516
...
[ticket/13516] Do not search ICC profiles in extension vendors
2015-05-04 22:52:28 +02:00
Matt Friedman
5a107d9dc1
[ticket/13516] Update image search script
...
PHPBB3-13516
2015-05-04 10:33:14 -07:00
Tristan Darricau
0e7448e2b3
Merge pull request #3562 from VSEphpbb/ticket/11521
...
[ticket/11521] Add missing lang strings for migration exceptions
2015-05-04 10:56:41 +02:00
Nicofuma
1b75411e81
Merge pull request #3588 from nickvergessen/ticket/13809-asc
...
[ticket/13809] Perform the lint test prior to normal tests
2015-05-03 22:43:57 +02:00
Joas Schilling
923fdb0aa0
[ticket/13809] Test each file individually
...
PHPBB3-13809
2015-05-03 20:08:02 +02:00
Joas Schilling
b73b9f1dec
[ticket/13809] Perform the lint test prior to normal tests
...
PHPBB3-13809
2015-05-03 20:07:51 +02:00
Joas Schilling
f42a737419
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-05-03 18:44:01 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Joas Schilling
429b99922e
[prep-release-3.1.4] Add migration
2015-05-03 17:12:12 +02:00
