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

18896 commits

Author SHA1 Message Date
Andreas Fischer
18c9733024 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12687] Remove french spaces
  [ticket/12687] Display the number of cached queries
  [ticket/12687] Don't check if memory_get_peak_usage() exists
  [ticket/12687] Wrap $GLOBALS['starttime'] in a if
  [ticket/12687] Fix the namespace of $request
  [ticket/12687] Update doc block
  [ticket/12687] Use microtime(true)
  [ticket/12687] Remove globals
  [ticket/12687] Return a string and move the displaying of the sql report
  [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME
  [ticket/12687] Display the explain link only when DEBUG is set
  [ticket/12687] Add a constant to display the load time without DEBUG
 2014-06-13 16:28:19 +02:00
Andreas Fischer
a262bfc78f Merge pull request #2570 from Nicofuma/ticket/12687 
[ticket/12687] Add a constant to display the load time without DEBUG

* Nicofuma/ticket/12687:
  [ticket/12687] Remove french spaces
  [ticket/12687] Display the number of cached queries
  [ticket/12687] Don't check if memory_get_peak_usage() exists
  [ticket/12687] Wrap $GLOBALS['starttime'] in a if
  [ticket/12687] Fix the namespace of $request
  [ticket/12687] Update doc block
  [ticket/12687] Use microtime(true)
  [ticket/12687] Remove globals
  [ticket/12687] Return a string and move the displaying of the sql report
  [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME
  [ticket/12687] Display the explain link only when DEBUG is set
  [ticket/12687] Add a constant to display the load time without DEBUG
 2014-06-13 16:28:19 +02:00
Tristan Darricau
8e9b27314b [ticket/12687] Remove french spaces 
PHPBB3-12687
 2014-06-13 14:56:55 +02:00
Tristan Darricau
bbc63456f9 [ticket/12687] Display the number of cached queries 
PHPBB3-12687
 2014-06-13 14:55:29 +02:00
Tristan Darricau
c605e8f423 [ticket/12687] Don't check if memory_get_peak_usage() exists 
PHPBB3-12687
 2014-06-13 14:54:13 +02:00
Tristan Darricau
dc4132a494 [ticket/12687] Wrap $GLOBALS['starttime'] in a if 
PHPBB3-12687
 2014-06-13 14:53:30 +02:00
Tristan Darricau
f7f65fe6c2 [ticket/12687] Fix the namespace of $request 
PHPBB3-12687
 2014-06-13 00:03:27 +02:00
Tristan Darricau
d70554760f [ticket/12687] Update doc block 
PHPBB3-12687
 2014-06-12 23:43:01 +02:00
Tristan Darricau
b93269f7bb [ticket/12687] Use microtime(true) 
PHPBB3-12687
 2014-06-12 23:35:55 +02:00
Tristan Darricau
6c0fd61b1d [ticket/12687] Remove globals 
PHPBB3-12687
 2014-06-12 23:27:19 +02:00
Tristan Darricau
ceef85ee0e [ticket/12687] Return a string and move the displaying of the sql report 
PHPBB3-12687
 2014-06-12 14:33:00 +02:00
Dhruv
464a1190ea Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12694] Remove whitespace at end of line from acp_groups
 2014-06-11 22:44:35 +05:30
Marc Alexander
afbf4ba296 [ticket/12694] Remove whitespace at end of line from acp_groups 
PHPBB3-12694
 2014-06-11 19:03:36 +02:00
Nils Adermann
86b5a815ab Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
 2014-06-11 14:28:06 +02:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus 
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
 2014-06-11 14:27:57 +02:00
Tristan Darricau
06e6c91513 [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME 
PHPBB3-12687
 2014-06-11 14:27:11 +02:00
Marc Alexander
2da12a8869 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12688] Correctly use web root path instead of phpbb root path
 2014-06-10 22:22:18 +02:00
Joas Schilling
d7ebc2c1fc [ticket/12688] Correctly use web root path instead of phpbb root path 
PHPBB3-12688
 2014-06-10 21:24:24 +02:00
Nils Adermann
618b73a3d3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12508] Ignore extensions in migration_tips dev tool
  [ticket/12508] Fix doc block
  [ticket/12508] Add new line to separate the if and foreach better
  [ticket/12508] Add a unit test for set_extensions()
  [ticket/12508] Only take a list of names for set_extensions()
  [ticket/12508] Fix class doc block
  [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
  [ticket/12508] Fix usages of the finder
  [ticket/12508] Remove extension manager from finder
 2014-06-10 18:40:18 +02:00
Tristan Darricau
1e769ba87f [ticket/12687] Display the explain link only when DEBUG is set 
PHPBB3-12687
 2014-06-10 17:52:41 +02:00
Tristan Darricau
39b76a628b [ticket/12687] Add a constant to display the load time without DEBUG 
PHPBB3-12687
 2014-06-10 16:13:09 +02:00
Joas Schilling
0134acd53f [ticket/12508] Ignore extensions in migration_tips dev tool 
PHPBB3-12508
 2014-06-10 11:50:11 +02:00
Joas Schilling
c82ae94f8a [ticket/12508] Fix doc block 
PHPBB3-12508
 2014-06-10 11:47:43 +02:00
Joas Schilling
1e9492bcaa [ticket/12508] Add new line to separate the if and foreach better 
PHPBB3-12508
 2014-06-10 11:47:42 +02:00
Joas Schilling
6980fbd27b [ticket/12508] Only take a list of names for set_extensions() 
PHPBB3-12508
 2014-06-10 11:47:41 +02:00
Joas Schilling
e1707b27ca [ticket/12508] Fix class doc block 
PHPBB3-12508
 2014-06-10 11:47:41 +02:00
Joas Schilling
183492b019 [ticket/12508] Move \phpbb\extension\finder to \phpbb\finder 
PHPBB3-12508
 2014-06-10 11:47:40 +02:00
Joas Schilling
d45c681b40 [ticket/12508] Fix usages of the finder 
PHPBB3-12508
 2014-06-10 11:47:39 +02:00
Joas Schilling
c20653dfbe [ticket/12508] Remove extension manager from finder 
PHPBB3-12508
 2014-06-10 11:47:36 +02:00
Joas Schilling
3c68da275b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12664] Refactor develop/migration_tips.php into a console command.
 2014-06-10 11:43:45 +02:00
Andreas Fischer
2964fb37e8 [ticket/12664] Refactor develop/migration_tips.php into a console command. 
PHPBB3-12664
 2014-06-10 01:57:59 +02:00
Joas Schilling
01a79fe1dc Merge pull request #2557 from Elsensee/ticket/12516 
[ticket/12516] Always preview signature in UCP/ACP module

* Elsensee/ticket/12516:
  [ticket/12516] Always preview signature in UCP/ACP module
 2014-06-10 00:27:18 +02:00
Joas Schilling
4916c8c24c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12606] Add ACP group core events
 2014-06-10 00:13:20 +02:00
Joas Schilling
456ff2559a Merge pull request #2518 from Pico88/ticket/12606 
[ticket/12606] Add ACP group core events

* Pico88/ticket/12606:
  [ticket/12606] Add ACP group core events
 2014-06-10 00:13:11 +02:00
Joas Schilling
f0a0de1721 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
 2014-06-10 00:01:39 +02:00
Joas Schilling
3a167ee801 Merge pull request #2568 from prototech/ticket/12667 
[ticket/12667] Do not point viewtopic URL to unread post outside of view=unread.

* prototech/ticket/12667:
  [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
 2014-06-10 00:01:30 +02:00
Joas Schilling
592624379f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
 2014-06-09 22:57:33 +02:00
Joas Schilling
771cbb2b3a Merge pull request #2434 from Nicofuma/ticket/8610 
[ticket/8610] Merging topics does not handle bookmarks correctly

* Nicofuma/ticket/8610:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly
 2014-06-09 22:57:27 +02:00
Cesar G
169a9a560d [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread 
PHPBB3-12667
 2014-06-09 13:54:43 -07:00
Pico88
74842b2354 [ticket/12606] Add ACP group core events 
PHPBB3-12606
 2014-06-09 18:56:04 +02:00
Nils Adermann
7a55594e93 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
 2014-06-09 17:55:59 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus 
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
 2014-06-09 17:55:25 +02:00
Joas Schilling
0440d09dc0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
 2014-06-09 17:20:36 +02:00
rxu
1ee39d8c93 [ticket/12668] Add subforums_row to core.display_forums_modify_template_vars 
Add subforums template data array to
'core.display_forums_modify_template_vars' event
to allow extensions to modify it if needed.

PHPBB3-12668
 2014-06-09 22:22:54 +08:00
Joas Schilling
7245c54bb8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12669] Add core event to the function display_forums()
 2014-06-09 16:09:33 +02:00
Joas Schilling
41a5c3bf2b Merge pull request #2554 from rxu/ticket/12669 
[ticket/12669] Add core event to the function display_forums()

* rxu/ticket/12669:
  [ticket/12669] Add core event to the function display_forums()
 2014-06-09 16:09:23 +02:00
Joas Schilling
ca259c1760 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment
 2014-06-09 15:47:42 +02:00
Knecht Ruprecht
4d3fcd19ac [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display comment 
PHPBB3-12677
 2014-06-09 15:42:14 +02:00
Dhruv
d1055bdd9e Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
 2014-06-09 13:25:24 +05:30
Dhruv
5e9cb35457 Merge branch 'develop-olympus' into develop-ascraeus 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-olympus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
 2014-06-09 13:23:49 +05:30