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
19105 commits 18 branches 192 tags 207 MiB
Commit graph

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
269330749f [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 
PHPBB3-9567
 2012-11-03 23:37:35 +01:00
Joas Schilling
334265fc83 [feature/soft-delete] Fix displaying the button/permission 
When the post is already softdeleted the options should only be available if
*_delete is granted.

PHPBB3-9567
 2012-11-03 22:57:49 +01:00
Joas Schilling
dfcfccf537 [feature/soft-delete] Fix deleting via post editing 
PHPBB3-9567
 2012-11-03 22:53:54 +01:00
Oleg Pudeyev
7fdab9c5d7 [ticket/10933] Prose for get_first_file_location. 
Also rewrite get_first_template_location prose a little to be
less repetitive with get_first_file_location.

PHPBB3-10933
 2012-11-02 19:45:02 -04:00
Oleg Pudeyev
bf66c47650 [ticket/10933] Remaining documentation for added functions in resource locator 
PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
b878d5daa9 [ticket/10933] Update template locator test to use style resource locator. 
There is no reason for it to go through a template instance to test
resource locator functionality.

PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
0dd981071b [ticket/10933] Dispose of locate function in template class. 
It had no callers other than the test suite.

PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
09794c6821 [ticket/10933] Add mutators for template_path to style resource locator. 
template_path is now private.

Change semantics of passing false for template path - now this resets
template path to default which I think makes sense.

PHPBB3-10933
 2012-11-02 19:39:05 -04:00
Oleg Pudeyev
6295b014d3 [ticket/10933] Delete template_path assignment. 
template_path is now only present in style resource locator and
should not be assigned to.

PHPBB3-10933
 2012-11-02 19:37:53 -04:00
Oleg Pudeyev
97e53103c3 [ticket/10933] Delete template_path from template class. 
template_path is now only present in style resource locator.

PHPBB3-10933
 2012-11-02 19:37:52 -04:00
Oleg Pudeyev
615d5ef628 [ticket/10933] Add get_first_template_location. 
This localizes template_path to style resource locator.

locate function on template will be removed in a subsequent commit.

PHPBB3-10933
 2012-11-02 19:37:52 -04:00
Igor Wiedler
816c546666 Merge remote-tracking branch 'p/ticket/10933-lite' into develop 
* p/ticket/10933-lite:
  [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
  [ticket/10933] Dependency inject template context.
  [ticket/10933] Expanded prose documentation for phpbb_extension_provider.
  [ticket/10933] Specify empty template path for absolute includephp test.
  [ticket/10933] Useful documentation for template locate function
  [ticket/10933] Typo fixes
  [ticket/10933] Initialize template context when template is constructed.
 2012-11-03 00:34:51 +01:00
Oleg Pudeyev
c063e3a52c [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. 
PHPBB3-10933
 2012-11-02 19:28:32 -04:00
Oleg Pudeyev
767d09227b [ticket/10933] Dependency inject template context. 
PHPBB3-10933
 2012-11-02 18:51:35 -04:00
Oleg Pudeyev
d7a626c70b [ticket/10933] Expanded prose documentation for phpbb_extension_provider. 
PHPBB3-10933
 2012-11-02 18:07:00 -04:00
Oleg Pudeyev
c3fb0f359c [ticket/10933] Specify empty template path for absolute includephp test. 
This was probably necessary all along, and the test happened to work
because state was not correctly reset between test runs and
a previous test set an empty template path.

PHPBB3-10933
 2012-11-02 18:06:21 -04:00
Oleg Pudeyev
766353fe5c [ticket/10933] Useful documentation for template locate function 
PHPBB3-10933
 2012-11-02 18:03:52 -04:00
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
Joas Schilling
6999d776d4 [feature/soft-delete] Correctly manage soft deleting via MCP 
PHPBB3-9567
 2012-11-02 14:23:17 +01:00
Joas Schilling
63e3baf0eb [feature/soft-delete] Correctly manage softdeleting via posting.php 
PHPBB3-9567
 2012-11-02 14:14:20 +01: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
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box 
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
 2012-11-01 22:23:35 +01:00
Andreas Fischer
969369254f [ticket/10875] Add comment about cache's sql_load() method. 
PHPBB3-10875
 2012-10-31 18:14:52 -04:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted 
PHPBB3-9567
 2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation 
PHPBB3-9567
 2012-10-31 14:09:23 +01: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
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation 
PHPBB3-9567
 2012-10-30 21:46:04 +01: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