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

14664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
5d37c171c2 Merge remote-tracking branch 'p/ticket/11159' into develop 
* p/ticket/11159:
  [ticket/11159] Static public is the currently approved order.
 2012-11-08 23:57:33 +01:00
Oleg Pudeyev
a5f7f99478 [ticket/11174] Check common words, fix array equality assertion. 
PHPBB3-11174
 2012-11-08 11:15:46 -05:00
Oleg Pudeyev
e523517e03 [ticket/11174] Test for common words. 
PHPBB3-11174
 2012-11-08 11:01:34 -05:00
Oleg Pudeyev
1aa0b4567f [ticket/11174] More tests. 
PHPBB3-11174
 2012-11-08 10:23:28 -05:00
Oleg Pudeyev
ed37141f51 [ticket/11174] Clarify why that is the way it is. 
PHPBB3-11174
 2012-11-08 10:19:15 -05:00
Oleg Pudeyev
18a922c036 [ticket/11174] Started on search tests - keyword splitting. 
PHPBB3-11174
 2012-11-08 10:14:29 -05:00
Oleg Pudeyev
fc41b52cea Merge PR #1039 branch 'p/ticket/11154' into develop 
* p/ticket/11154:
  [ticket/11154] Do not try to load any extensions when installing.
 2012-11-07 19:49:12 -05:00
Oleg Pudeyev
2400a30027 [ticket/11154] Do not try to load any extensions when installing. 
Might be the right fix, might be not. Works for me.

PHPBB3-11154
 2012-11-07 19:19:07 -05:00
Andreas Fischer
ee29cc1678 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
 2012-11-07 22:57:40 +01:00
Andreas Fischer
02df59f1fe Merge remote-tracking branch 'p/ticket/11081' into develop-olympus 
* p/ticket/11081:
  [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
 2012-11-07 22:56:25 +01:00
Oleg Pudeyev
90b458d87e Merge PR #722 branch 'Senky/ticket/9918' into develop 
* Senky/ticket/9918:
  [ticket/9918] default values in request_var changed to one string
  [ticket/9918] $redirect variable used from now
 2012-11-06 21:10:20 -05:00
Oleg Pudeyev
17c43fcd70 Merge PR #717 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)
 2012-11-06 20:34:01 -05:00
Oleg Pudeyev
c08b7385c2 Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympus 
* NeoAdonis/ticket/10661:
  [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)
 2012-11-06 20:33:48 -05:00
Oleg Pudeyev
87a80e70da [ticket/11081] Drop duplicated </td> in subsilver captcha qa template. 
PHPBB3-11081
 2012-11-06 17:46:54 -05:00
Oleg Pudeyev
644662bc2c [ticket/11159] Static public is the currently approved order. 
PHPBB3-11159
 2012-11-06 16:43:48 -05: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
Nils Adermann
1d388d98ab Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD 
* github-phpbb/develop-olympus:
  [ticket/11159] static public is the currently approved order.

Conflicts:
	tests/dbal/select_test.php
	tests/dbal/write_test.php
	tests/request/request_var_test.php
	tests/security/extract_current_page_test.php
	tests/security/redirect_test.php
	tests/template/template_test.php
	tests/text_processing/make_clickable_test.php
	tests/utf/utf8_clean_string_test.php
 2012-11-06 20:02:40 +01:00
Nils Adermann
875adc4247 Merge pull request #1035 from p/ticket/11159-olympus 
[ticket/11159] static public is the currently approved order.
 2012-11-06 10:54:06 -08:00
Oleg Pudeyev
f941a5cc2d Merge PR #858 branch 'callumacrae/ticket/10947' into develop 
* callumacrae/ticket/10947:
  [ticket/10947] Fixed quickmod autosubmit functionality.
 2012-11-06 12:00:39 -05:00
Oleg Pudeyev
443af0ad56 [feature/prune-users] $author_id_sql is no longer needed here. 
PHPBB3-9622
 2012-11-06 11:15:41 -05:00
Oleg Pudeyev
87ea50948e Merge remote-tracking branch 'upstream/develop' into feature/prune-users 
* upstream/develop: (2171 commits)
  [ticket/11164] Update composer.phar
  [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.
  [ticket/11099] Mark acp_ban::display_ban_options() as static.
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
  [ticket/11159] static public is the currently approved order.
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
  [ticket/10848] Move include up.
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  ...

Conflicts:
	phpBB/includes/functions_user.php
 2012-11-06 11:11:27 -05:00
Oleg Pudeyev
a7babc211c [ticket/11159] static public is the currently approved order. 
PHPBB3-11159
 2012-11-06 10:41:06 -05:00
Andreas Fischer
44ff9d020f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11164] Update composer.phar
 2012-11-05 15:18:15 -05:00
Andreas Fischer
fea118cf0d Merge remote-tracking branch 'unknownbliss/ticket/111642' into develop-olympus 
* unknownbliss/ticket/111642:
  [ticket/11164] Update composer.phar
 2012-11-05 15:17:55 -05:00
Unknown Bliss
0dbd569385 [ticket/11164] Update composer.phar 
PHPBB3-11164
 2012-11-04 20:34:31 +00: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
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
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
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