1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

21076 Commits

Author SHA1 Message Date
Cesar G
30f256102f [ticket/13858] Make Plupload uploader available in the global namespace.
PHPBB3-13858
2015-05-28 12:25:43 +02:00
Joas Schilling
b00b504343 [ticket/13872] Allow template events to have a changed version
PHPBB3-13872
2015-05-28 12:23:24 +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
Marc Alexander
abef078ab9 [ticket/12542] Use more specific CSS for drag-n-drop
Otherwise the CSS gets overwritten by other CSS rules.

PHPBB3-12542
2015-05-28 11:04:22 +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
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
622d5b2643 [ticket/12542] Do not use browser specific css for outline
Also, the CSS selector for the drag'n'drop was simplified to only use the
class.

PHPBB3-12542
2015-05-23 10:51:04 +02: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
Marc Alexander
b7a89187b5 [ticket/12542] Properly check if textarea is undefined or null
PHPBB3-12542
2015-05-20 15:47:26 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02: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
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
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
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
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation
PHPBB3-13672
2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation
PHPBB3-13668
2015-05-08 10:41:42 +01: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
9833eb4f13 [ticket/13672] BUMP version to 3.1.5-dev
PHPBB3-13672
2015-05-06 23:00:26 +01:00
brunoais
9e06beb48d [ticket/13668] BUMP version to 3.1.5-dev
PHPBB3-13668
2015-05-06 22:56:22 +01:00
brunoais
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev
PHPBB3-13664
2015-05-06 22:55:30 +01:00
brunoais
684a050916 [ticket/13661] BUMP version to 3.1.5-dev
PHPBB3-13661
2015-05-06 22:53:43 +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
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
javiexin
6e0d12094a [ticket/13795] Modify core event in posting to include poll data
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.

PHPBB3-13795
2015-05-04 20:34:54 +02:00
Matt Friedman
c7a0b4479d [ticket/13771] Only handle valid JQHXR response objects
PHPBB3-13771
2015-05-04 10:27:11 -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
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
Joas Schilling
199d823f7a [prep-release-3.1.4] Update version to 3.1.4 2015-05-03 17:07:35 +02:00