Commit graph

23486 commits

Author SHA1 Message Date
Joas Schilling
99c3ca18be Merge pull request #2582 from bantu/ticket/12682
[ticket/12682] Make Code Sniffer run properly on Travis CI again.

* bantu/ticket/12682:
  [ticket/12682] Make Code Sniffer run properly on Travis CI again.
2014-06-13 22:30:48 +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
PayBas
f6ee0152ed [ticket/12613] Add distinction between top/bottom action-bar
PHPBB3-12613
2014-06-13 14:53:45 +02:00
Tristan Darricau
dc4132a494 [ticket/12687] Wrap $GLOBALS['starttime'] in a if
PHPBB3-12687
2014-06-13 14:53:30 +02:00
PayBas
93c39477e0 [ticket/12613] Replaced topic-actions with action-bar
PHPBB3-12613
2014-06-13 14:38:41 +02:00
Joas Schilling
e18365dc63 [ticket/12209] Notify the admin that OAuth still allows DB authentification
PHPBB3-12209
2014-06-13 14:00:34 +02:00
Andreas Fischer
f2e57d339e [ticket/12682] Make Code Sniffer run properly on Travis CI again.
The --ignore parameter takes a case-insensitive pattern and as such
'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name.
This results in nothing being checked against ruleset-php-legacy.xml.

Using absolute paths in the --ignore pattern fixes this issues.

PHPBB3-12682
2014-06-13 13:32:19 +02:00
PayBas
f17eee19de [ticket/12613] Remove responsive linklist from memberlist
PHPBB3-12613
2014-06-13 13:29:50 +02:00
brunoais
2c70cec4fb [ticket/12699] Add tab key to keymap
PHPBB3-12699
2014-06-13 12:08:03 +01:00
Joas Schilling
309aa1d8bf Merge pull request #2580 from VSEphpbb/ticket/12697
[ticket/12697] Delete cached extension schema.json files after testing

* VSEphpbb/ticket/12697:
  [ticket/12697] Delete cached extension schema.json files after testing
2014-06-13 12:49:04 +02:00
PayBas
7c527adee8 [ticket/12613] Remove unnecessary checks and clean up CSS
PHPBB3-12613
2014-06-13 12:25:02 +02:00
Tristan Darricau
f7f65fe6c2 [ticket/12687] Fix the namespace of $request
PHPBB3-12687
2014-06-13 00:03:27 +02:00
Matt Friedman
be54b64893 [ticket/12697] Delete cached extension schema.json files after testing
PHPBB3-12697
2014-06-12 14:57:32 -07: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
Crizzo
453cb70963 [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
PHPBB3-12563
2014-06-12 19:19:46 +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
Marc Alexander
204904441a [ticket/9801] Allow display of page outside board directory on viewonline
Until now, the preg_match didn't take into account that a page might be
outside the board directory. After this change, the regular expression will
allow preceding dots and slashes. Paths like ../../test.php will be allowed.
The page will be unknown in viewonline.php and it will revert to index.php as
current page. However, the core.viewonline_overwrite_location event will
receive proper info of the page the user is on right now allowing a listener
to change the info that is being displayed.

PHPBB3-9801
2014-06-11 23:34:51 +02:00
Dhruv Goel
1fdb47bb20 Merge pull request #2577 from marc1706/ticket/12694
[ticket/12694] Remove whitespace at end of line from acp_groups
2014-06-11 22:43:06 +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
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
e1f371d14a Merge remote-tracking branch 'nickvergessen/ticket/12483' into develop-ascraeus
* nickvergessen/ticket/12483:
  [ticket/12483] Fix selectors for installing extensions in functional tests
  [ticket/12483] Remove unused globals
  [ticket/12483] Fix finder usage when generating the schema.json file
  [ticket/12483] Fix copyright in prepare_extension.sh
  [ticket/12483] Use file_put_contents()
  [ticket/12483] Close database connection when tearDown() is called
  [ticket/12483] Require the extension manager class
  [ticket/12483] Move schema files into tmp/ and only copy them when needed
  [ticket/12483] Add a .sh that moves an extension in place
  [ticket/12483] Allow to setup extensions before database and functional tests
2014-06-11 09:27:12 +02:00
Marc Alexander
cab1f2cf16 Merge remote-tracking branch 'nickvergessen/ticket/12688' into develop-ascraeus
* nickvergessen/ticket/12688:
  [ticket/12688] Correctly use web root path instead of phpbb root path
2014-06-10 22:12:01 +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
Joas Schilling
e71f65c2bb [ticket/12099] Fix correction in path_helper test
PHPBB3-12099
2014-06-10 21:06:36 +02:00
Joas Schilling
916db1a0b1 [ticket/12483] Fix selectors for installing extensions in functional tests
PHPBB3-12483
2014-06-10 20:30:07 +02:00
Crizzo
3a48f76558 [ticket/12563] Changes 2 language variables to better understandable names
PHPBB3-12563
2014-06-10 20:29:30 +02:00
Joas Schilling
38c2d42304 [ticket/12483] Remove unused globals
PHPBB3-12483
2014-06-10 19:44:06 +02:00
Joas Schilling
d0766a2321 [ticket/12483] Fix finder usage when generating the schema.json file
PHPBB3-12483
2014-06-10 19:43:13 +02:00
Joas Schilling
3d347d47f2 [ticket/12483] Fix copyright in prepare_extension.sh
PHPBB3-12483
2014-06-10 19:41:38 +02:00
Joas Schilling
18d145f38f [ticket/12483] Use file_put_contents()
PHPBB3-12483
2014-06-10 19:41:37 +02:00
Joas Schilling
7b0b6a99c0 [ticket/12483] Close database connection when tearDown() is called
Similar to phpbb_database_test_case::tearDown()

PHPBB3-12483
2014-06-10 19:41:36 +02:00
Joas Schilling
13217fe3ff [ticket/12483] Require the extension manager class
PHPBB3-12483
2014-06-10 19:41:36 +02:00
Joas Schilling
5bae2911a2 [ticket/12483] Move schema files into tmp/ and only copy them when needed
PHPBB3-12483
2014-06-10 19:41:35 +02:00
Joas Schilling
709296e54a [ticket/12483] Add a .sh that moves an extension in place
PHPBB3-12483
2014-06-10 19:41:34 +02:00
Joas Schilling
997028a0ec [ticket/12483] Allow to setup extensions before database and functional tests
PHPBB3-12483
2014-06-10 19:41:34 +02:00
Crizzo
af60861cfd [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
PHPBB3-12680
2014-06-10 19:34:32 +02:00
Crizzo
02c53595b5 [ticket/12680] Adds alternativ text with new variable to contact:
PHPBB3-12680
2014-06-10 19:32:27 +02:00
Nils Adermann
9842137028 Merge remote-tracking branch 'github-nickvergessen/ticket/12508' into develop-ascraeus
* github-nickvergessen/ticket/12508:
  [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:07 +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
Marc Alexander
5ee7f20f4e [ticket/11711] Improve coding and comments of character check
PHPBB3-11711
2014-06-10 15:51:25 +02:00
PayBas
ad59f371bf [ticket/12646] Changed to navlinks.MICRODATA
PHPBB3-12646
2014-06-10 12:47:31 +02:00
PayBas
a77a19af93 [ticket/12646] Add check for navlinks.FORUM_ID
PHPBB3-12646
2014-06-10 12:08:19 +02:00
Joas Schilling
0134acd53f [ticket/12508] Ignore extensions in migration_tips dev tool
PHPBB3-12508
2014-06-10 11:50:11 +02:00