1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00

13200 Commits

Author SHA1 Message Date
Oleg Pudeyev
d0e63a4f37 Merge PR #808 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
2012-05-21 22:17:10 -04:00
Oleg Pudeyev
d0b9864563 Merge PR #808 branch 'bantu/ticket/10898' into develop-olympus
* bantu/ticket/10898:
  [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
2012-05-21 22:15:17 -04:00
Oleg Pudeyev
3bd302c126 Merge PR #743 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10094] Purge acm_file cache before phpBB installation.
2012-05-21 22:13:35 -04:00
Oleg Pudeyev
1c7b568771 Merge PR #743 branch 'bantu/ticket/10094' into develop-olympus
* bantu/ticket/10094:
  [ticket/10094] Purge acm_file cache before phpBB installation.
2012-05-21 22:13:32 -04:00
Andreas Fischer
70be7e109f [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
PHPBB3-10898
2012-05-18 11:15:53 +02:00
Andreas Fischer
f3d33bf9d7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
  [ticket/10605] Put end of array on its own line because start of array is too.
  [ticket/10605] Add parameter documentation to phpbb_delete_user_pms
  [ticket/10605] Fix left join usage.
  [ticket/10605] Add a section for updating from 3.0.10 to schema updates.
  [ticket/10605] Fix syntax error in database updater.
  [ticket/10605] Reset user´s pm count to 0 when deleting his PMs
  [ticket/10605] Split query to be able to use indexes
  [ticket/10605] Rename $delete_rows to $delete_ids.
  [ticket/10605] Break long comment into multiple lines 80 chars short.
  [ticket/10605] Remove unnecessary $delete_ids array.
  [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
  [ticket/10605] Remove unused variable declarations.
  [ticket/10605] Turn $undelivered_user into a real array of counters.
  [ticket/10605] Use unset() instead of checking user_id over and over again.
  [ticket/10605] Prefix function with phpbb_ and use true instead of 1
  [ticket/10605] Delete orphan private messages on update
  [ticket/10605] Check for orphan privmsgs when deleting a user
2012-05-14 00:40:20 +02:00
Andreas Fischer
86fa185a1b Merge branch 'ticket/10605' into develop-olympus
* ticket/10605:
  [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
  [ticket/10605] Put end of array on its own line because start of array is too.
  [ticket/10605] Add parameter documentation to phpbb_delete_user_pms
  [ticket/10605] Fix left join usage.
  [ticket/10605] Add a section for updating from 3.0.10 to schema updates.
  [ticket/10605] Fix syntax error in database updater.
  [ticket/10605] Reset user´s pm count to 0 when deleting his PMs
  [ticket/10605] Split query to be able to use indexes
  [ticket/10605] Rename $delete_rows to $delete_ids.
  [ticket/10605] Break long comment into multiple lines 80 chars short.
  [ticket/10605] Remove unnecessary $delete_ids array.
  [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
  [ticket/10605] Remove unused variable declarations.
  [ticket/10605] Turn $undelivered_user into a real array of counters.
  [ticket/10605] Use unset() instead of checking user_id over and over again.
  [ticket/10605] Prefix function with phpbb_ and use true instead of 1
  [ticket/10605] Delete orphan private messages on update
  [ticket/10605] Check for orphan privmsgs when deleting a user

Conflicts:
	phpBB/install/database_update.php
2012-05-14 00:38:54 +02:00
Andreas Fischer
95e1d4e9db [ticket/10605] Use database updater function _sql() instead of $db->sql_query()
PHPBB3-10605
2012-05-14 00:36:18 +02:00
Andreas Fischer
f71a9d369c [ticket/10605] Put end of array on its own line because start of array is too.
PHPBB3-10605
2012-05-14 00:34:42 +02:00
Nils Adermann
9b96c1fb78 Merge remote-tracking branch 'github-hardolaf/ticket/10893' into develop
* github-hardolaf/ticket/10893:
  [ticket/10893] Update the usage of Composer
2012-05-14 00:01:34 +02:00
Andreas Fischer
2715fc5bdf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10891] Allow specifying test_config.php path via environment.
2012-05-13 20:09:00 +02:00
Andreas Fischer
92d17cbff3 Merge remote-tracking branch 'p/ticket/10891' into develop-olympus
* p/ticket/10891:
  [ticket/10891] Allow specifying test_config.php path via environment.

Conflicts:
	tests/RUNNING_TESTS.txt
2012-05-13 20:08:49 +02:00
Andreas Fischer
8f41533421 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10892] Update wiki link to mediawiki.
  [ticket/10892] Add empty lines for consistency.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
2012-05-13 20:03:43 +02:00
Andreas Fischer
f81e8e9901 Merge remote-tracking branch 'p/ticket/10892' into develop-olympus
* p/ticket/10892:
  [ticket/10892] Update wiki link to mediawiki.
  [ticket/10892] Add empty lines for consistency.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
  [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
2012-05-13 20:03:15 +02:00
Joseph Warner
47c6b32d87 [ticket/10893] Update the usage of Composer
Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php'
as per the change in the way that composer works as noted
https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ

PHPBB3-10893
2012-05-13 13:05:20 -04:00
Oleg Pudeyev
725db1ba29 [ticket/10891] Allow specifying test_config.php path via environment.
PHPBB3-10891
2012-05-11 22:26:54 -04:00
Oleg Pudeyev
2592fbf8e9 [ticket/10892] Update wiki link to mediawiki.
PHPBB3-10892
2012-05-11 22:15:24 -04:00
Oleg Pudeyev
44b509b2b2 [ticket/10892] Add empty lines for consistency.
Some headings had empty lines after them, some did not.

Add missing empty lines.

PHPBB3-10892
2012-05-11 22:15:24 -04:00
Oleg Pudeyev
07fb16edb5 [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.
PHPBB3-10892
2012-05-11 22:15:18 -04:00
Patrick Webster
3a60414592 [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
PHPBB3-10892
2012-05-11 22:15:10 -04:00
Andreas Fischer
1fd2795cf0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10492] Skip functional tests on PHP 5.2 on travis
2012-05-11 15:47:46 +02:00
Andreas Fischer
8861e26034 Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympus
* naderman/ticket/10492:
  [ticket/10492] Skip functional tests on PHP 5.2 on travis
2012-05-11 15:47:37 +02:00
Nils Adermann
1960629240 [ticket/10492] Skip functional tests on PHP 5.2 on travis
PHPBB3-10492
2012-05-11 15:35:57 +02:00
Nils Adermann
f0a4840ccc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
2012-05-11 15:03:25 +02:00
Nils Adermann
b0e273b95f Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympus
* github-bantu/ticket/10889:
  [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
2012-05-11 15:01:52 +02:00
Andreas Fischer
e5afe39987 [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
PHPBB3-10889
2012-05-11 11:22:49 +02:00
Andreas Fischer
553582230e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10887] Add spaces.
  [ticket/10887] Split auto increment test from db tools test.
2012-05-11 11:12:27 +02:00
Andreas Fischer
e6791e376d Merge remote-tracking branch 'p/ticket/10887' into develop-olympus
* p/ticket/10887:
  [ticket/10887] Add spaces.
  [ticket/10887] Split auto increment test from db tools test.
2012-05-11 11:09:28 +02:00
Oleg Pudeyev
b5b65c214d [ticket/10887] Add spaces.
PHPBB3-10887
2012-05-11 05:06:46 -04:00
Oleg Pudeyev
03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
2012-05-11 02:37:25 -04:00
Oleg Pudeyev
1fcb269616 Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus
* Senky/ticket/10835:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP
2012-05-11 02:32:58 -04:00
Senky
74e9245df3 [ticket/10835] changing "e-mail" to "email"
PHPBB3-10835
2012-05-11 08:09:56 +02:00
Oleg Pudeyev
1019226dfa [ticket/10887] Split auto increment test from db tools test.
Auto increment test does not need any particular columns
and should not depend, in particular, on correct handling
of binary data.

This commit moves auto increment test into its own file and
gives it its own table with a simple schema.

PHPBB3-10887
2012-05-10 23:50:42 -04:00
Oleg Pudeyev
61eb0151f0 Merge PR #725 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9896] Links changed
2012-05-10 15:58:55 -04:00
Oleg Pudeyev
4b3d807293 Merge PR #725 branch 'Senky/ticket/9896' into develop-olympus
* Senky/ticket/9896:
  [ticket/9896] Links changed
2012-05-10 15:57:24 -04:00
Senky
8393b8e755 [ticket/9896] Links changed
Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/

PHPBB3-9896
2012-05-10 21:40:39 +02:00
Oleg Pudeyev
c136bedf07 Merge PR #799 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10881] Replace old (and unify) file headers in develop files.
2012-05-10 14:43:14 -04:00
Oleg Pudeyev
12bf9b42fa Merge PR #799 branch 'bantu/ticket/10881' into develop-olympus
* bantu/ticket/10881:
  [ticket/10881] Replace old (and unify) file headers in develop files.
2012-05-10 14:40:15 -04:00
Andreas Fischer
226743d10b [ticket/10881] Replace old (and unify) file headers in develop files.
This especially also fixes the problem of the copyright symbol being
represented using 0xA9, which is neither ASCII nor the appropriate UTF8
byte sequence for the copyright symbol.

PHPBB3-10881
2012-05-10 11:53:54 +02:00
Andreas Fischer
1d0607cbb3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10843] Backport changes to install language.
  [ticket/10834] Backport general development language changes to 3.0.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
2012-05-09 13:30:09 +02:00
Andreas Fischer
0488d70062 Merge remote-tracking branch 'p/ticket/10834' into develop-olympus
* p/ticket/10834:
  [ticket/10843] Backport changes to install language.
  [ticket/10834] Backport general development language changes to 3.0.
2012-05-09 13:25:07 +02:00
Andreas Fischer
1a9b30b871 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior

Conflicts:
	tests/dbal/select_test.php
2012-05-09 12:55:58 +02:00
Andreas Fischer
12dbcc7f1e Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympus
* Noxwizard/ticket/10858:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior
2012-05-09 12:50:13 +02:00
Patrick Webster
09d49fb7b2 [ticket/10858] Move generic row seeking to DBAL
Removed from: firebird, mssql_odbc, and mssqlnative

PHPBB3-10858
2012-05-08 19:41:22 -05:00
Patrick Webster
afbaa6979b [ticket/10858] Tests for row seeking with fetchfield()
PHPBB3-10858
2012-05-08 18:45:51 -05:00
Patrick Webster
e52d23848a [ticket/10858] Fix MSSQL Native's row seeking behavior
The result_mssqlnative class remains in case someone wants to use it

PHPBB3-10858
2012-05-08 18:44:43 -05:00
Senky
8d15f1b02e [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
PHPBB3-10835
2012-05-07 08:18:50 +02:00
Andreas Fischer
30579ecb09 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10860] Fixing js error in updater
2012-05-06 18:39:32 +02:00
Andreas Fischer
c0718fae96 Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympus
* cyberalien/ticket/10860:
  [ticket/10860] Fixing js error in updater
2012-05-06 18:39:23 +02:00
Vjacheslav Trushkin
a960bd6790 [ticket/10860] Fixing js error in updater
Fixing javascript error in side-by-side diff styling in updater:
resizing inner block instead of outer block and increasing
height by inner/outer block difference.

PHPBB3-10860
2012-05-06 19:37:49 +03:00