Commit graph

1761 commits

Author SHA1 Message Date
Marc Alexander
1aae72961a Merge branch 'develop' into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2012-12-09 21:02:31 +01:00
Joas Schilling
c23d2457e9 [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
PHPBB3-10679
2012-12-07 12:50:21 +01:00
Joas Schilling
2f490293e4 [ticket/10679] Use module_auth to limit access to the module
PHPBB3-10679
2012-12-06 16:33:12 +01:00
Joas Schilling
4103c99a86 [ticket/10679] Add new permission for changing profile field information
The setting is copied from "Can use signature"

PHPBB3-10679
2012-12-06 15:10:29 +01:00
Oleg Pudeyev
21caf6db6f Merge PR #545 branch 'brunoais/ticket/10601' into develop
* brunoais/ticket/10601:
  [ticket/10601] The ORDER BY is only taking space there
  [ticket/10601] New approach in the update algorithm
  [ticket/10601] Comment to help understanding the code
  [ticket/10601] Requested code changes
  [ticket/10601] Cosmetic code changes
  [ticket/10601] Database updating code v2
  [ticket/10601] Database updating code
  [ticket/10601] Comment explaning the basename applied to categories
  [ticket/10601] Correctly access class property
  [ticket/10601]Move Inbox the default in private messages module
2012-12-01 15:09:38 -05:00
Bruno Ais
1ce0671181 [ticket/10601] The ORDER BY is only taking space there
PHPBB3-10601
2012-12-01 10:05:20 +00:00
Oleg Pudeyev
7a77edf25e Merge PR #893 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:48 -05:00
Joas Schilling
ad2d560f3f [ticket/10184] Query bots table to get the user_ids of the bots
PHPBB3-10184
2012-12-01 10:54:26 +01:00
Joas Schilling
314462d835 [ticket/10184] Disable receiving pms for bots by default
PHPBB3-10184
2012-12-01 10:54:16 +01:00
Bruno Ais
a0d5c52eb6 [ticket/10601] New approach in the update algorithm
- New approach in the database update algorithm

PHPBB3-10601
2012-12-01 09:44:51 +00:00
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
Bruno Ais
a4cc076177 [ticket/10601] Requested code changes
- Renamed the comment to PHPBB3-10601
- Removed backslashes
- Traded double quotes into single quotes inside.

PHPBB3-10601
2012-11-28 19:36:13 +00:00
Bruno Ais
1f9eaa1c56 [ticket/10601] Cosmetic code changes
- Removed the double line before the addition
- Moved the condition of the WHERE so that both are in the same line
- Removed TABs from the black lines
- Used double quotes instead of escaped single quotes.

PHPBB3-10601
2012-11-26 17:45:46 +00:00
Bruno Ais
85ebbbaec4 [ticket/10601] Database updating code v2
Added the space after the (int) as requested

PHPBB3-10601
2012-11-26 17:45:31 +00:00
Bruno Ais
80da19ca7c [ticket/10601] Database updating code
This is what is needed to update the database to comply with these code changes

PHPBB3-10601
2012-11-26 17:45:18 +00:00
Bruno Ais
81547ba980 [ticket/10601] Comment explaning the basename applied to categories
Explain in the code where
 if (isset($this->module_categories_basenames[$cat_name]))
and
if (isset($this->module_categories_basenames[$level2_name]))
exists, what does it do.

PHPBB3-10601
2012-11-26 17:45:06 +00:00
David King
61842c317a [ticket/10601] Correctly access class property
PHPBB3-10601
2012-11-26 17:44:54 +00:00
Bruno Ais
24939c8225 [ticket/10601]Move Inbox the default in private messages module
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111

PHPBB3-10601
2012-11-26 17:44:41 +00: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
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
Marc Alexander
8d0c667dce [feature/avatars] Fix the docs and small naming fixes
PHPBB3-10018
2012-11-19 00:30:18 +01:00
Igor Wiedler
98921e0b87 [ticket/11213] Add missing global in install_update.php
PHPBB3-11213
2012-11-17 05:27:36 +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
David King
4b6d538b06 [feature/controller] Rename kernel pass class properly
PHPBB3-10864
2012-11-16 16:45:29 -05:00
David King
dd1f8a0e55 [feature/controller-new] Call pass to subscribe the Kernel event listener
PHPBB3-10864
2012-11-16 16:45:26 -05: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