makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 19:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
16376 commits 18 branches 192 tags 207 MiB
Commit graph

16376 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
0c18f92c0a [ticket/10933] Typo fixes 
PHPBB3-10933
 2012-11-02 18:03:52 -04:00
Oleg Pudeyev
8528d8ff34 [ticket/10933] Initialize template context when template is constructed. 
There is no apparent reason for either initializing or clearing
the context in set_style/set_custom_style.

Initially the initialization there was added in
0501640d5d, for reasons that
presently I do not see.

This permits making context property back private.

PHPBB3-10933
 2012-11-02 18:03:52 -04:00
Oleg Pudeyev
fd6ee50e06 [ticket/11162] Extract existing behavior into a function and add a test. 
PHPBB3-11162
 2012-11-02 16:05:53 -04:00
Oleg Pudeyev
000bbfd5b3 Merge pull request #1028 from bantu/ticket/11099 
[ticket/11099] Mark acp_ban::display_ban_options() as static.
 2012-11-01 19:39:03 -07:00
Andreas Fischer
969369254f [ticket/10875] Add comment about cache's sql_load() method. 
PHPBB3-10875
 2012-10-31 18:14:52 -04:00
Andreas Fischer
4e83cd461c [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save(). 
Previously (develop-olympus) $query_result was passed via reference into
sql_save(). Now the (possibly changed) result is returned by value.
Adjust logic to take this change into account correctly.

PHPBB3-10875
 2012-10-30 18:50:26 -04:00
Andreas Fischer
59af4d68fc [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result. 
PHPBB3-10875
 2012-10-30 18:50:26 -04:00
Andreas Fischer
e28f0aa336 [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save(). 
phpbb_cache_driver_null::sql_save() has to return $query_result as is instead
of null.

PHPBB3-10875
 2012-10-30 18:50:25 -04:00
Andreas Fischer
4f65a00334 [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory. 
sql_save() no longer takes $query_result as a reference, thus this assignment
is a no-op.

PHPBB3-10875
 2012-10-30 18:50:25 -04:00
Andreas Fischer
a1524a69d6 [ticket/11099] Mark acp_ban::display_ban_options() as static. 
It is called statically from mcp_ban.

PHPBB3-11099
 2012-10-30 18:43:00 -04:00
Andreas Fischer
1f248dab6f Merge remote-tracking branch 'p/ticket/11157' into develop 
* p/ticket/11157:
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
 2012-10-30 18:19:44 -04:00
Andreas Fischer
e0e3622ba9 Merge remote-tracking branch 'p/ticket/11159-develop' into develop 
* p/ticket/11159-develop:
  [ticket/11159] static public is the currently approved order.
 2012-10-30 18:16:16 -04:00
Nathan Guse
05e74b82ac [ticket/11103] enable/disable notifications functions 
disable_notifications
This should be called when an extension which has notification types
is disabled so that all those notifications are hidden and do not
cause errors

enable_notifications
This should be called when an extension which has notification types
that was disabled is re-enabled so that all those notifications that
were hidden are shown again

PHPBB3-11103
 2012-10-29 23:34:51 -05:00
Nathan Guse
6c213bd5fa [ticket/11103] Make sure post/topic approved notifications are always unread 
PHPBB3-11103
 2012-10-29 23:20:59 -05:00
Nathan Guse
ead1d92b22 [ticket/11103] Handle the ext notification type better 
We don't actually need to test the finder here, so don't copy the ext
directory over

PHPBB3-11103
 2012-10-29 18:41:31 -05:00
Nathan Guse
b1ba7b27ad [ticket/11103] _get_avatar -> get_user_avatar 
PHPBB3-11103
 2012-10-29 18:37:07 -05:00
Nathan Guse
b60ae30b02 [ticket/11103] More cleanup 
PHPBB3-11103
 2012-10-29 18:20:07 -05:00
Nathan Guse
a811e65147 [ticket/11103] Revert an overwrite that occured on merging from develop 
PHPBB3-11103
 2012-10-29 18:18:33 -05:00
Nathan Guse
ecf6f1eb8c [ticket/11103] Code cleanup 
PHPBB3-11103
 2012-10-29 18:15:01 -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
Andreas Fischer
88b100d818 Merge remote-tracking branch 'p/ticket/11158' into develop-olympus 
* p/ticket/11158:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
 2012-10-29 15:13:33 -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
88bd7292f1 [ticket/11158] Revert old fix in PHPBB3-10186. 
Revert "[ticket/10186] UCP signature panel displays when not authed
for signatures"

This reverts commit f6fa52540c.

PHPBB3-10186
PHPBB3-11158
 2012-10-29 14:58:19 -04:00
Oleg Pudeyev
31781adf0c [ticket/11159] static public is the currently approved order. 
PHPBB3-11159
 2012-10-29 14:57:27 -04:00
Oleg Pudeyev
d602f13d7f [ticket/11157] static public is the currently approved order. 
PHPBB3-11157
 2012-10-29 14:54:54 -04:00
Oleg Pudeyev
14a6e5ec73 [ticket/11157] Fix remaining captcha spam. 
PHPBB3-11157
 2012-10-29 14:48:43 -04:00
Oleg Pudeyev
60d9538b14 [ticket/11157] get_captcha_types is an instance method. 
It is specific to a particular captcha factory implementation,
instantiate a captcha factory to invoke it.

PHPBB3-11157
 2012-10-29 14:48:42 -04:00
Oleg Pudeyev
dc8052b5c0 Merge PR #1021 branch 'p/ticket/11156' into develop 
* p/ticket/11156:
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
 2012-10-29 08:10:56 -04:00
RMcGirr83
a9b59bfe03 [ticket/11156] Delete "Misc" tab of forum based permissions + move items 
PHPBB3-11156
 2012-10-29 08:01:16 -04:00
Nathan Guse
eddb56f842 [ticket/11103] Working on default notifications on install/update 
PHPBB3-11103
 2012-10-27 12:03:11 -05:00
Oleg Pudeyev
6bf60ac5cb Merge PR #971 branch 'nickvergessen/ticket/11018' into develop 
* nickvergessen/ticket/11018:
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  [ticket/11014] Fix text for previous/next links in Subsilver2
  [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
  [ticket/11018] Always display previous/next links if we can display one
  [ticket/11014] Restore template vars for next/previous links
  [ticket/11018] Swap prev/next links on pagination to the old order
  [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
  [ticket/11018] Fix minor issues with CSS in prosilver
  [ticket/11018] Attempt to fix li.pagination alignment issue
 2012-10-22 17:44:34 -04:00
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05:00
Nathan Guse
bc18e368c3 [ticket/11103] Correct the test case 
Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
 2012-10-20 21:55:58 -05:00
Nathan Guse
7e6f31b51d [ticket/11103] Correct the comments on the notification classes 
PHPBB3-11103
 2012-10-20 21:45:15 -05:00
Nathan Guse
f62e55091a [ticket/11103] PM notifications are not available if users cannot read them 
PHPBB3-11103
 2012-10-20 21:28:37 -05:00
Nathan Guse
de7e17b732 [ticket/11103] Notifications for subscriptions/bookmarks must obey ACP options 
If bookmarks/subscriptions are disabled, they should not be listed in the UCP

PHPBB3-11103
 2012-10-20 21:22:06 -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
6861af22ee [ticket/11103] Message of no notifications if you have none 
PHPBB3-11103
 2012-10-20 19:19:26 -05:00
Nathan Guse
52bb4a1bd6 [ticket/11103] Do not have empty queue in the interface 
This is not needed as it is not public.

PHPBB3-11103
 2012-10-20 19:00:37 -05:00
Nathan Guse
0ac9079d1c [ticket/11103] Replace $email_template with get_email_template() 
PHPBB3-11103
 2012-10-20 18:55:13 -05:00
Nathan Guse
a93067eb41 [ticket/11103] Create common.js for subsilver2, move added JS code there 
PHPBB3-11103
 2012-10-19 16:00:37 -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
c7c3ab07c6 [ticket/11103] Brackets on their own lines 
PHPBB3-11103
 2012-10-18 19:24:08 -05:00
Nathan Guse
2c06c2bd36 [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof 
PHPBB3-11103
 2012-10-18 19:20:54 -05:00
Nathan Guse
f96dac3352 [ticket/11103] Interface docblocks 
PHPBB3-11103
 2012-10-18 19:13:47 -05:00
Nathan Guse
eb07b3ad9c [ticket/11103] Expand class vars and use docblocks for phpBB classes 
PHPBB3-11103
 2012-10-18 18:50:04 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments 
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
 2012-10-18 18:32:13 -05:00
Nathan Guse
883a961720 [ticket/11103] Use e.preventDefault(); 
PHPBB3-11103
 2012-10-18 18:25:26 -05:00
Nathan Guse
3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions.php
 2012-10-18 18:23:22 -05:00