Commit graph

11219 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
5ccbe06911 Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into develop-olympus
* galaxyAbstractor/ticket/10849:
  [ticket/10849] Added missing helptext for listitem
2012-05-05 22:47:58 +02:00
Oleg Pudeyev
c34ee343ba [ticket/10843] Backport changes to install language.
PHPBB3-10688
PHPBB3-10843
2012-05-05 16:08:37 -04:00
Oleg Pudeyev
58842b5ca8 [ticket/10834] Backport general development language changes to 3.0.
PHPBB3-10688
PHPBB3-10834
2012-05-05 16:05:55 -04:00
Andreas Fischer
8cb0e30afc Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympus
* Senky/ticket/10846:
  [ticket/10846] fixing SQL query bug in acp_main.php
2012-05-01 13:38:11 +02:00
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP
PHPBB3-10835
2012-05-01 09:52:48 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php
PHPBB3-10846
2012-04-30 22:01:53 +02:00
galaxyAbstractor
8d45901657 [ticket/10849] Added missing helptext for listitem
Added the missing helptext for list item in subsilver2.

PHPBB3-10849
2012-04-27 22:19:41 +02:00
Oleg Pudeyev
3a67604900 Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympus
* galaxyAbstractor/ticket/10836:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
2012-04-26 22:08:42 -04:00
galaxyAbstractor
1a8db76a20 [ticket/10836] Check if avatar directory is writable after install
Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
2012-04-25 11:49:06 +02:00
David King
b82c77b38f [task/functional] Make sure missing language values are handled properly
PHPBB3-10758
2012-04-24 14:10:50 -04:00
David King
8cf0b79a47 [task/functional] Increase code coverage for functional tests
PHPBB3-10758
2012-04-23 17:16:16 -04:00
galaxyAbstractor
a21b367b21 [ticket/10836] Enable avatars by default at install
Enables avatars and local avatar upload by default.

PHPBB3-10836
2012-04-21 14:16:55 +02:00
Nils Adermann
cdf7ff1797 Merge remote-tracking branch 'github-noxwizard/ticket/10492' into develop-olympus
* github-noxwizard/ticket/10492:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer
2012-04-21 12:31:43 +02:00
Patrick Webster
6293bbf099 [ticket/10492] Fix line endings
PHPBB3-10492
2012-04-21 05:24:57 -05:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests
PHPBB3-10492
2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer
PHPBB3-10492
2012-04-20 23:50:49 -05:00
Nils Adermann
29a6aec9ad Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympus
* github-dhruv/ticket/10815:
  [ticket/10815] enables feed feature by default for a fresh install
2012-04-20 20:13:00 +02:00
Dhruv Goel
4788705a9a [ticket/10815] enables feed feature by default for a fresh install
PHPBB3-10815
2012-04-20 23:30:01 +05:30
Andreas Fischer
31fbc40a09 Merge remote-tracking branch 'p/ticket/10767' into develop-olympus
* p/ticket/10767:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
2012-04-20 14:54:55 +02:00
Andreas Fischer
bc0453c93a Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into develop-olympus
* galaxyAbstractor/ticket/10812:
  [ticket/10812] Disabled register_globals check in PHP 5.4
2012-04-20 14:39:16 +02:00
galaxyAbstractor
edf60bcd55 [ticket/10812] Disabled register_globals check in PHP 5.4
Disabled the check for register_globals if PHP version is 5.4+

PHPBB3-10812
2012-04-20 14:19:38 +02:00
Oleg Pudeyev
6e77ca7c99 Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympus
* nickvergessen/ticket/9089:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
2012-04-19 21:02:48 -04:00
Nils Adermann
57547c7e20 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympus
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
2012-04-20 01:11:00 +02:00
Dhruv Goel
90fc8fe59f [ticket/10797] language key rank moved to common
Language key RANK moved from memberlist to common.
Removed from mcp language.

PHPBB3-10797
2012-04-20 04:30:42 +05:30