mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
13,345 Commits 17 Branches 190 Tags
Commit Graph

13345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dhruv Goel
041b7be77e [ticket/10308] fixes indentation 
indentation is fixed and user_posts variable is compared as a boolean
variable.

PHPBB3-10308
 2012-05-11 01:50:36 +05:30
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
Dhruv Goel
cf556f92c9 [ticket/10308] fixes language variable name 
Language variable has be renamed for better understanding

PHPBB3-10308
 2012-05-10 22:54:29 +05:30
Dhruv Goel
23ea588880 [ticket/10308] makes variable boolean 
makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
 2012-05-10 22:53:43 +05:30
Dhruv Goel
164054f067 [ticket/10308] fixes sql query, limit it to 1 
instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
 2012-05-10 22:53:04 +05:30
Dhruv Goel
cf303c3478 [ticket/10308] fixes user deletion if no posts 
introduces a hidden input field with retain posts as the mode in case
user has no posts.

PHPBB3-10308
 2012-05-10 22:51:22 +05:30
Dhruv Goel
faf232219e [ticket/10308] renames language key to USER_NO_POSTS_DELETE 
language key renamed to make its usability more clearer.

PHPBB3-10308
 2012-05-10 22:51:08 +05:30
Dhruv Goel
59177a86c4 [ticket/10308] fix language and user's total posts 
language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
 2012-05-10 22:50:13 +05:30
Dhruv Goel
8f7e85604b [ticket/10308] fixes language entity. 
Language key has been changed and has been made more specific to
avoid conflicts

PHPBB3-10308
 2012-05-10 22:49:24 +05:30
Dhruv Goel
239e6016a3 [ticket/10308] Displays message to user if there are no posts. 
While deletng the user, if the user has no posts in addition to the
options being disabled an added message is displayed.

PHPBB3-10308
 2012-05-10 22:48:32 +05:30
Dhruv Goel
643970dce4 [ticket/10308] disable retain/ delete posts option when deleting a user 
When deleting a user, it asks whether the posts by user should be retained
or deleted. The selection should be disable if the user has no posts.

PHPBB3-10308
 2012-05-10 22:47:41 +05:30
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
Andreas Fischer
1264e39aa9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10819] Remove support for older browsers
  [ticket/10819] Forgot this causes vertical scrollbars on IE
  [ticket/10819] Improve side-by-side diff styling
 2012-05-06 00:43:12 +02:00
Andreas Fischer
9d542aec1e Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympus 
* Noxwizard/ticket/10819:
  [ticket/10819] Remove support for older browsers
  [ticket/10819] Forgot this causes vertical scrollbars on IE
  [ticket/10819] Improve side-by-side diff styling
 2012-05-06 00:43:01 +02:00
Andreas Fischer
9d827f491f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10849] Added missing helptext for listitem
 2012-05-05 22:50:08 +02:00