Commit graph

1740 commits

Author SHA1 Message Date
Marc Alexander
562ebe5c12 [feature/avatars] Unify size of avatar_type
Previously it was set to 255 in one file while it was 32 in other files.
As the size of 32 is rather low this was increased to 255.

PHPBB3-10018
2012-11-30 14:36:18 +01:00
Marc Alexander
ce5e2f1677 [feature/avatars] Miscellaneous fixes
PHPBB3-10018
2012-11-25 01:18:27 +01:00
Marc Alexander
7945ffa2a1 [feature/avatars] Use new avatar types in database updater
PHPBB3-10018
2012-11-25 01:02:43 +01:00
Marc Alexander
2b91719906 [feature/avatars] Add allow_avatar_gravatar to schema_data.sql
PHPBB3-10018
2012-11-22 18:38:36 +01:00
Marc Alexander
8d0c667dce [feature/avatars] Fix the docs and small naming fixes
PHPBB3-10018
2012-11-19 00:30:18 +01:00
Marc Alexander
ac7c3d2b8d [feature/avatars] Check for gravatar when checking the avatar module_auth
PHPBB3-10018
2012-11-16 23:04:09 +01:00
Marc Alexander
075e7755c3 [feature/avatars] fix 'user_avatar_type' in database updater
PHPBB3-10018
2012-11-13 20:04:33 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
Nils Adermann
d2a051cdd4 [ticket/11193] Instantiate a single collection_pass for all collections
PHPBB3-11193
2012-11-11 18:39:24 +01:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
844770d223 [ticket/11152] Remove old container processor calls
PHPBB3-11152
2012-11-11 17:43:12 +01:00
Igor Wiedler
3e4d3761fd [ticket/11152] Rename collection to collection_pass
PHPBB3-11152
2012-11-11 14:18:11 +01:00
Igor Wiedler
8851b797fb [ticket/11152] Create separate function for debug-dependent container
PHPBB3-11152
2012-11-10 23:35:52 +01:00
Igor Wiedler
231d743ba9 [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
PHPBB3-11152
2012-11-10 23:34:27 +01:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
2012-11-10 10:45:02 -06:00
Andreas Fischer
f5ed04f8ff Merge remote-tracking branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780:
  [ticket/10780] Make L_COLON available in the installer.
2012-11-10 14:07:03 +01:00
Andreas Fischer
40f3ae1d8f Merge remote-tracking branch 'igorw/ticket/11183' into develop
* igorw/ticket/11183:
  [ticket/11183] Remove $load_extensions and weird dl() calls
2012-11-10 14:02:45 +01:00
Andreas Fischer
3ea5b0abbd [ticket/10780] Make L_COLON available in the installer.
PHPBB3-10780
2012-11-10 12:53:45 +01:00
Igor Wiedler
897e8f2e83 [ticket/11152] Move container functions to a separate function file
PHPBB3-11152
2012-11-10 12:02:56 +01:00
David King
cb2725dd5a [feature/compiled-dic] Fix cron task loading
We cannot use container tags at run time if we are using a cached, compiled
container object (i.e. phpbb_cache_container) so we have to load them
beforehand.

PHPBB3-11152
2012-11-10 11:40:49 +01:00
David King
f9f03435f0 [feature/compiled-dic] Move this to the other PR
PHPBB3-11152
2012-11-10 11:40:10 +01:00
David King
996f63fb34 [feature/compiled-dic] Remove re-creation of class loader in install
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
2f692ef3b9 [feature/compiled-dic] Remove redundant method call
PHPBB3-11152
2012-11-10 11:40:09 +01:00
David King
f48709f5bb [feature/compiled-dic] Compile the DI Container into a cached class
PHPBB3-11152
2012-11-10 11:40:09 +01:00
Igor Wiedler
195014867a [ticket/11183] Remove $load_extensions and weird dl() calls
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Igor Wiedler
7d7dc98b10 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
PHPBB3-11181
2012-11-09 23:16:42 +01:00
Oleg Pudeyev
957508c8b1 Merge PR #1044 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:58:00 -05:00
Oleg Pudeyev
a16b9d17da Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympus
* bantu/ticket/11178:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:57:33 -05:00
Oleg Pudeyev
646d5ef3af Merge PR #1042 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10897] Combine bot updates and bot delete.
  [ticket/10897] Use same code/query for deleting.
  [ticket/10897] Make sure the user we're fetching is a bot.
  [ticket/10897] Do not handle IP address. There is no need.
  [ticket/10897] Update by user_id instead of bot_name.
  [ticket/10897] Move bot delete data to the relevant foreach loop.
  [ticket/10897] Add comment about what's going on.
  [ticket/10897] Remove unnecessary string casting.
  [ticket/10897] Add space after foreach.
  [ticket/10897] Update bots during phpBB update
  [ticket/10897] Bot list updated
2012-11-09 09:22:33 -05:00
Andreas Fischer
ed74c9c487 [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
Take whatever startup.php sets instead.

This especially takes care of E_STRICT messages that are generated because of
PHP4 compatibility.

PHPBB3-11178
2012-11-09 14:30:44 +01:00
Andreas Fischer
60ea1c10ef [ticket/10897] Combine bot updates and bot delete.
PHPBB3-10897
2012-11-09 13:40:48 +01:00
Andreas Fischer
54700f5ba2 [ticket/10897] Use same code/query for deleting.
PHPBB3-10897
2012-11-09 12:53:33 +01:00
Andreas Fischer
520ffdf368 [ticket/10897] Make sure the user we're fetching is a bot.
PHPBB3-10897
2012-11-09 12:47:50 +01:00
Andreas Fischer
c054757f3c [ticket/10897] Do not handle IP address. There is no need.
PHPBB3-10897
2012-11-09 12:46:21 +01:00
Andreas Fischer
63c64694bc [ticket/10897] Update by user_id instead of bot_name.
PHPBB3-10897
2012-11-09 12:41:59 +01:00
Andreas Fischer
935bc33268 [ticket/10897] Move bot delete data to the relevant foreach loop.
PHPBB3-10897
2012-11-09 12:19:58 +01:00
Andreas Fischer
de6d741d96 [ticket/10897] Add comment about what's going on.
PHPBB3-10897
2012-11-09 12:19:18 +01:00
Andreas Fischer
b2183c9b70 [ticket/10897] Remove unnecessary string casting.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Andreas Fischer
07e7c475d5 [ticket/10897] Add space after foreach.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Carlo
53e9bab237 [ticket/10897] Update bots during phpBB update
PHPBB3-10897
2012-11-09 12:10:53 +01:00
Carlo
399662d2af [ticket/10897] Bot list updated
'Baidu [Spider]' updated.
'Bing [Bot]' fixed only identation.
'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails'
user agent.
'NG-Search [Bot]' no longer exists.
'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'.
'OmniExplorer [Bot]' no longer exists.
'Seekport [Bot]' no longer exists.
'Synoo [Bot]' no longer exists.
'Voyager [Bot]' updated.
'W3C [Validator]' corrected (there was a *).
'WiseNut [Bot]' no longer exists.

PHPBB3-10897
2012-11-09 12:05:34 +01:00
Oleg Pudeyev
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
2012-11-06 16:23:33 -05:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context.
PHPBB3-10933
2012-11-02 18:51:35 -04:00
Andreas Fischer
c9ad0c6f25 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php
2012-10-29 15:16:59 -04:00
Oleg Pudeyev
5f5d395c62 [ticket/11158] Require acl_u_sig for ucp signature module.
PHPBB3-11158
2012-10-29 14:58: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
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
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03: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
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