1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

11068 Commits

Author SHA1 Message Date
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
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
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
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
Oleg Pudeyev
aceca2566b [ticket/10767] Clarify what happens at the end of the hook.
If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
2012-04-17 06:05:33 -04:00
Oleg Pudeyev
45b910f9b4 [ticket/10767] Use warning/error language as appropriate.
When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
2012-04-17 06:05:32 -04:00
Oleg Pudeyev
1ce8a1d7ee [ticket/10767] Default to non-fatal behavior.
PHPBB3-10767
2012-04-17 06:05:32 -04:00
Oleg Pudeyev
bdf21e45ca [ticket/10767] Revert unconditional unfatality in commit-msg hook.
Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic."

This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26.

PHPBB3-10093
PHPBB3-10767
2012-04-16 03:05:42 -04:00
Dhruv Goel
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
2012-04-16 01:24:10 +05:30
Andreas Fischer
f1f2ab92b1 Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympus
* bantu/ticket/10788:
  [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
  [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
2012-04-12 14:37:47 +02:00
Andreas Fischer
f394fd250e [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
PHPBB3-10788
2012-04-11 22:08:36 +02:00
Andreas Fischer
534d966957 [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
PHPBB3-10788
2012-04-11 21:39:27 +02:00
Nils Adermann
ef297ec63e Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympus
* github-bantu/ticket/10774:
  [ticket/10774] Correctly specify index name when creating unique index on MySQL.
  [ticket/10774] Add unit tests for UNIQUE index existence and creation.
2012-04-10 01:14:04 +02:00
Andreas Fischer
ef8160e8a2 [ticket/10774] Correctly specify index name when creating unique index on MySQL.
PHPBB3-10774
2012-04-10 00:53:27 +02:00
Andreas Fischer
41ef41ac63 [ticket/10774] Add unit tests for UNIQUE index existence and creation.
PHPBB3-10774
2012-04-10 00:46:24 +02:00
Andreas Fischer
156ae40d6f Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympus
* sadu/ticket/10561:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).
2012-04-08 21:59:06 +02:00
Hari Sankar R
2a48284fc9 [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
Substituted $db->sql_query() with _sql()

PHPBB3-10561
2012-04-09 01:25:17 +05:30
Hari Sankar R
8442b19e59 [ticket/10561] Changed $temp_style_id to $style_id
PHPBB3-10561
2012-04-09 01:04:17 +05:30
Hari Sankar R
9bce716081 [ticket/10561] Added function desc for phpbb_style_is_active()
PHPBB3-10561
2012-04-09 00:57:29 +05:30
Hari Sankar R
4e630ef160 [ticket/10561] Casted $config['default_style'] to int
PHPBB3-10561
2012-04-09 00:33:55 +05:30
Oleg Pudeyev
3ec941937a Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympus
* callumacrae/ticket/10455:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
2012-04-07 22:32:14 -04:00
Oleg Pudeyev
a14d00b8e9 Merge PR #718 branch 'NeoAdonis/ticket/10764' into develop-olympus
* NeoAdonis/ticket/10764:
  [ticket/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
2012-04-07 22:14:48 -04:00
Hari Sankar R
03a35581c4 [ticket/10561] Reverted to phpbb_style_is_active()
Changes made to function name, reverted to old.

PHPBB3-10561
2012-04-07 23:15:12 +05:30
Hari Sankar R
1808a61fe3 [ticket/10561] Added to database_update:database_update_info()
Updates made to database_update.php

PHPBB3-10561
2012-04-07 19:42:42 +05:30
Hari Sankar R
ea5ae09c7d [ticket/10561] Added section in database_update.php
Added section to check for existing users using a
deactivated style, and revert it to default style.

PHPBB3-10561
2012-04-06 14:09:56 +05:30
Adonais Romero González
04bb44ce33 [ticket/10764] FAQ now mentions Area51 instead of SourceForge
The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.

PHPBB3-10764
2012-04-05 20:22:00 -05:00
Adonais Romero González
293f66d4ed [ticket/10764] FAQ now mentions GitHub instead of SourceForge
The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.

PHPBB3-10764
2012-04-05 19:03:08 -05:00
Callum Macrae
be9eb57785 [ticket/10455] Removed NOTE from prosilver overall_header.html.
PHPBB3-10455
2012-04-05 22:22:11 +01:00
Oleg Pudeyev
30093d6e86 Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympus
* Fyorl/ticket/10508:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:12 -04:00
Hari Sankar R
018419b36c [ticket/10561] Moved and renamed the funtion validate_style().
Fixed minor changes as suggested by @bantu.

PHPBB3-10561
2012-04-05 19:31:18 +05:30
Andreas Fischer
444fa29beb Merge remote-tracking branch 'p/ticket/10760' into develop-olympus
* p/ticket/10760:
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  [ticket/10760] Use externally specified PHP_BIN if any.
2012-04-05 03:28:16 +02:00
Oleg Pudeyev
21639d5d54 Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympus
* Fyorl/ticket/10607:
  [ticket/10607] Added 'Powered by' translation string.
2012-04-04 15:22:00 -04:00
Oleg Pudeyev
dc63db1860 [ticket/10760] Fix numbering in php fun facts.
PHPBB3-10760
2012-04-04 11:43:59 -04:00
Oleg Pudeyev
efdd1e623e [ticket/10760] Value must be quoted as it might be two words.
PHPBB3-10760
2012-04-04 11:41:14 -04:00
Oleg Pudeyev
6536a36208 [ticket/10760] PHP is great. This commit is the proof.
PHPBB3-10760
2012-04-04 00:27:06 -04:00