1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

1807 Commits

Author SHA1 Message Date
Nicofuma
62e13e945c [ticket/13838] Fix coding style
PHPBB3-13838
2015-05-14 15:43:44 +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
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
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
429b99922e [prep-release-3.1.4] Add migration 2015-05-03 17:12:12 +02:00
Andreas Fischer
cfeb2bec80 Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
2015-05-03 16:43:32 +02:00
Andreas Fischer
dde72c58b0 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
  [prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
  [prep-release-3.0.14] Bump version numbers for 3.0.14 release.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Joas Schilling
34141b576e [ticket/13807] Fix minor coding flaws
PHPBB3-13807
2015-05-02 16:55:35 +02:00
Joas Schilling
96d97ae2d2 [ticket/13807] Add an option to generate a diff for the release highlights
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
bdad879508 [ticket/13807] Allow filtering template events
PHPBB3-13807
2015-05-02 14:35:26 +02:00
Joas Schilling
e0180991bf [ticket/13807] Allow filtering events by phpBB version
PHPBB3-13807
2015-05-02 14:35:18 +02:00
Joas Schilling
9cd0295dd8 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-04-29 17:15:56 +02:00
Joas Schilling
1ad09d9c8b [prep-release-3.1.4] Increase version number to 3.1.4-RC2 2015-04-29 09:59:40 +02:00
Andreas Fischer
62abead26d Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
PHPBB3-13772
2015-04-21 10:00:30 +01:00
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
2015-04-11 23:08:45 +02:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493
[ticket/13493] Append page name to base url if it doesn't contain it
2015-04-06 16:54:35 +02:00
Joas Schilling
90025ae3e7 Merge pull request #3437 from marc1706/ticket/12368
[ticket/12368] Correctly check if avatars migration is installed
2015-04-06 11:36:00 +02:00
Joas Schilling
c60497f009 Merge pull request #3402 from brunoais/ticket/13621
[ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
2015-04-06 11:13:33 +02:00
Joas Schilling
009a8cb2d5 Merge pull request #3333 from marc1706/ticket/13522
[ticket/13522] Remove empty answers from possible answers in Q&A
2015-04-06 11:04:35 +02:00
Marc Alexander
558d604d83 Merge pull request #3518 from marc1706/ticket/13703
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
2015-04-04 11:04:29 +02:00
Kevin Roy
ddff81c21f [ticket/13742] Use correct avatar path for local avatar
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.

PHPBB3-13742
2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06 [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.

PHPBB3-13703
2015-04-03 23:04:52 +02:00
Marc Alexander
9eab4ba740 [ticket/12368] Fix comment in docblock
PHPBB3-12368
2015-03-26 11:01:22 +01:00
Cesar G
7f7d8d9101 [ticket/13550] Check that the Plupload temp directory is writable before moving
This prevents a PHP warning from being issued that results in an invalid JSON
response being returned to the user.

PHPBB3-13550
2015-03-15 16:06:35 -07:00
brunoais
9b030fd174 [ticket/13674] Missing space after "if"
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1 [ticket/13674] Change MySQL native total search results calculation
This changes how the native FULLTEXT search calculates the total
match number for MySQL.
This should improve performance as there is one less query being made
and it is being searched using the technique mentioned in the manual

PHPBB3-13674
2015-03-06 22:23:45 +00: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
RMcGirr83
4618a3e2f8 [ticket/13477] rename function and fix doc blocks
PHPBB3-13477
2015-03-04 14:20:27 -05: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
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
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
Nils Adermann
106bc1c232 [ticket/13617] Document magic number for forum_id
PHPBB3-13617
2015-02-25 17:00:22 +01:00
Nils Adermann
c5a15c0635 [ticket/13617] Use request->variable instead of request_var
PHPBB3-13617
2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4 Merge branch 'ticket/13617' into ticket/13617-ascraeus
* ticket/13617:
  [ticket/13617] Enforce column size limit for session_forum_id

Conflicts:
	phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Marc Alexander
b650f45d55 [ticket/12368] Correctly check if avatars migration is installed
Try to set the avatar type to string value to check if new avatar
types are supported.

PHPBB3-12368
2015-02-24 11:43:33 +01:00
Andreas Fischer
525a62f72e Merge pull request #3433 from Nicofuma/ticket/13643
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000

* Nicofuma/ticket/13643:
  [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Nicofuma
ffc5a73a0c [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)

PHPBB3-13643
2015-02-22 21:53:05 +01:00
Andreas Fischer
d152bbc727 Merge pull request #3427 from prototech/ticket/13551
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN

* prototech/ticket/13551:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Nicofuma
9b5493372d [ticket/13644] Always type hint dispatch_interface
PHPBB3-13644
2015-02-22 17:01:37 +01:00
Marc Alexander
8e737e483e [ticket/13522] Remove unneeded variables and correctly output input on error
PHPBB3-13522
2015-02-21 17:46:37 +01:00
Marc Alexander
d15e5372ca [ticket/13522] Use acp_get_question_input() for retrieving input data
PHPBB3-13522
2015-02-21 17:45:17 +01:00
Marc Alexander
12fe882741 [ticket/13522] Trim array elements before processing further
PHPBB3-13522
2015-02-21 17:43:15 +01:00
Joas Schilling
379eae1a92 Merge pull request #3418 from brunoais/ticket/13631
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Cesar G
71d3ddc623 [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
PHPBB3-13551
2015-02-19 18:38:35 -08:00
brunoais
f0850f1915 [ticket/13631] Better, more explicit comment explanation
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723 [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...

PHPBB3-13631
2015-02-18 10:33:49 +00:00