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

14410 Commits

Author SHA1 Message Date
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
2012-10-16 14:39:32 +02:00
Andreas Fischer
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable
PHPBB3-11139
2012-10-15 14:32:49 -03:00
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Oleg Pudeyev
f1a692a5f4 Merge PR #956 branch 'dhruvgoel92/ticket/11051' into develop
* dhruvgoel92/ticket/11051:
  [ticket/11051] fix spaces
  [ticket/11051] add common_words variable
  [ticket/11051] remove unnecessary comment
  [ticket/11051] add get_word_len() in sphinx search
  [ticket/11051] use get_word_length in search backend
  [ticket/11051] use get_common_words in search backend
  [ticket/11051] function instead of accessing property in search
  [ticket/11051] add public functions for public properties
2012-10-10 00:39:29 -04:00
Oleg Pudeyev
59281f1b0a Merge PR #973 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -04:00
Oleg Pudeyev
39258c9452 Merge PR #990 branch 'bantu/ticket/11100' into develop
* bantu/ticket/11100:
  [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
2012-10-10 00:18:25 -04:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04:00
Oleg Pudeyev
74e41e79d1 Merge PR #1008 branch 'EXreaction/ticket/11140' into develop
* EXreaction/ticket/11140:
  [ticket/11140] Fix an error from an incorrect variable name
2012-10-09 23:46:58 -04:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
Oleg Pudeyev
3fa0ab7073 Merge PR #1004 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 19:41:25 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 17:42:23 -04:00
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window
PHPBB3-11139
2012-10-09 00:31:59 -03:00
Dhruv
305abfde96 [ticket/11051] fix spaces
PHPBB3-11051
2012-10-08 10:58:04 +05:30
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Andreas Fischer
281afb8bd6 Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus
* mvinny/ticket/11135:
  [ticket/11135] Full replacement of credit link to https
2012-10-06 06:12:45 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Dhruv
be884b7e29 [ticket/11051] add common_words variable
PHPBB3-11051
2012-10-04 23:32:50 +05:30
Dhruv
67939192ae [ticket/11051] remove unnecessary comment
PHPBB3-11051
2012-10-04 23:17:18 +05:30
Dhruv
52b25aaf20 [ticket/11051] add get_word_len() in sphinx search
get_word_len() for sphinx search backend returns false always and
triggers proper error.

PHPBB3-11051
2012-10-04 01:51:57 +05:30
Andreas Fischer
fca0811943 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php
2012-10-02 17:03:06 +02:00
Andreas Fischer
8428b53087 Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus
* Senky/ticket/11112:
  [ticket/11112] updating links to phpbb.com to use SSL
2012-10-02 17:01:21 +02:00
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning".
PHPBB3-11131
2012-10-02 14:58:20 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
Nathan Guse
51862f151d [ticket/8796] Prevent setting post_time greater than time() in markread
PHPBB3-8796
2012-09-30 10:29:43 -05:00
Andreas Fischer
0daab4e0ef Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
2012-09-29 00:26:43 +02:00
Andreas Fischer
27bef015d6 Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympus
* nickvergessen/ticket/11122:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
2012-09-29 00:25:00 +02:00
Joas Schilling
f7a6169184 [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
PHPBB3-11122
2012-09-27 13:22:43 +02:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
480e3daede [ticket/11021] Remove unnecessary line spacing in functions.php
PHPBB3-11021
2012-09-15 10:46:03 -05:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Andreas Fischer
f1fb555ea3 Merge remote-tracking branch 'imkingdavid/ticket/11086' into develop
* imkingdavid/ticket/11086:
  [ticket/11086] Move DI processing below $request definition
  [ticket/11086] Fix database_update.php to use Dependency Injection Container
2012-09-14 13:34:23 +02:00
Andreas Fischer
d221f2901a Merge remote-tracking branch 'igorw/ticket/11101' into develop
* igorw/ticket/11101:
  [ticket/11101] Delay execution of container processors
2012-09-14 13:34:21 +02:00
Andreas Fischer
635a58a7e2 Merge remote-tracking branch 'bantu/ticket/11109' into develop
* bantu/ticket/11109:
  [ticket/11109] Re-add file conflict checks to compress class
2012-09-14 01:27:48 +02:00
Fyorl
b24ee89cfc [ticket/11109] Re-add file conflict checks to compress class
PHPBB3-11109
2012-09-14 01:26:33 +02:00
Andreas Fischer
91423880da Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
2012-09-14 00:49:48 +02:00
Andreas Fischer
888aa47b0e Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus
* Fyorl/ticket/11045:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
2012-09-14 00:46:04 +02:00
David King
298fa894e7 [ticket/11086] Move DI processing below $request definition
As per PR #991 (ticket/11101).

PHPBB3-11086
2012-09-13 16:56:09 -04:00
David King
503989979a [ticket/11086] Fix database_update.php to use Dependency Injection Container
PHPBB3-11086
2012-09-13 16:44:26 -04:00
Fyorl
ce7cffcf9e [ticket/11045] Removed file conflict tests for compress class
PHPBB3-11045
2012-09-11 09:42:29 +01:00
Andreas Fischer
238fab3bb9 [ticket/8713] Update untrimmed_variable() doc block.
PHPBB3-8713
2012-09-09 21:53:17 +02:00
Andreas Fischer
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
David King
8a91598b14 Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop 2012-09-08 15:58:25 -04:00
Andreas Fischer
1e05fd4c62 [ticket/8713] Trim password in auth_db to keep compatibility.
PHPBB3-8713
2012-09-08 15:01:29 +02:00
Andreas Fischer
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
Igor Wiedler
d543f0ffb1 [ticket/11101] Delay execution of container processors
Also fix the name of the ext processor service.

PHPBB3-11101
2012-09-08 14:41:41 +02:00