makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 04:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
14834 commits 18 branches 192 tags 207 MiB
Commit graph

590 commits

Author SHA1 Message Date
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
 2012-11-20 23:19:51 -06:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC 
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
 2012-11-20 22:54:16 -06: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
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
 2012-11-14 11:33:24 -06: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
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06: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
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-11-10 10:58:44 -06:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG 
PHPBB3-11189
 2012-11-10 10:45:02 -06: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
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
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
Nathaniel Guse
6c8c54d4d2 [ticket/11103] Inject table prefix to notifications system instead of constants 
PHPBB3-11103
 2012-11-09 08:48:41 -06: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
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
Nathan Guse
e549b7663d [ticket/11103] Set basic notifications to be enabled by default 
Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
 2012-10-29 18:09:20 -05: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
Nathan Guse
eddb56f842 [ticket/11103] Working on default notifications on install/update 
PHPBB3-11103
 2012-10-27 12:03:11 -05:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
471ca5e7dc [ticket/11103] Change is_disabled to is_enabled 
If you're following along and would like to update your DB, you can run
the following queries to do so:

ALTER TABLE phpbb_notifications CHANGE `is_disabled` `is_enabled`
TINYINT( 1 ) NOT NULL DEFAULT  '1';

UPDATE `phpbb_notifications` SET is_enabled = 1;

PHPBB3-11103
 2012-10-19 15:50:32 -05:00
Nathan Guse
94ffbb4050 [ticket/11103] Add is_disabled column to notifications table 
EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications
from extensions!

Set is_disabled to 1 for all your notifications when your extension is
disabled so they are ignored and do not cause errors.

When your extension is enabled again, set is_disabled to 0 and your
notifications will be working again.

PHPBB3-11103
 2012-10-13 23:24:30 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List 
PHPBB3-11103
 2012-10-13 20:02:38 -05:00
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05: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
Nathan Guse
948bd69495 [ticket/11103] Move UCP Notification Options to Board Preferences tab 
Also rename to "Edit notification options" for consistency

PHPBB3-11103
 2012-10-05 13:54:27 -05:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header 
PHPBB3-11103
 2012-10-05 13:43:03 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template 
PHPBB3-11103
 2012-09-27 19:04:47 -05:00
Nathan Guse
d07cb7b2af [ticket/11103] UCP Notifications module added to db updater 
PHPBB3-11103
 2012-09-27 18:56:15 -05:00