mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity
16,420 Commits 17 Branches 190 Tags
Commit Graph

16420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
 2013-05-09 19:42:13 +02:00
Nils Adermann
3fb536d7b7 Merge pull request #1387 from bantu/ticket/11513 
[ticket/11513] Install PHPUnit via Composer
 2013-05-09 10:30:20 -07:00
Andreas Fischer
c31123e8a4 [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR. 
PHPBB3-11513
 2013-05-09 19:21:40 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. 
PHPBB3-11513
 2013-05-09 19:21:40 +02:00
Andreas Fischer
b5b1e88915 [ticket/11513] Use PHPUnit from composer in .travis.yml. 
PHPBB3-11513
 2013-05-09 18:46:29 +02:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies. 
PHPBB3-11513
 2013-05-09 18:46:29 +02:00
Andreas Fischer
585f0bc827 [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. 
PHPBB3-11513
 2013-05-09 18:42:35 +02:00
Nils Adermann
dbb4a87b79 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11526] Update all dependencies / regenerate composer.lock.
  [ticket/11526] Increase composer minimum stability in olympus to stable.
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2013-05-09 18:12:54 +02:00
Nils Adermann
4e3c5aefa8 Merge pull request #1393 from bantu/ticket/11526 
[ticket/11526] Increase composer minimum-stability from beta to stable
 2013-05-09 08:30:16 -07:00
Nils Adermann
176ac6e691 Merge pull request #1392 from bantu/ticket/11527 
[ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
 2013-05-09 08:28:39 -07:00
Andreas Fischer
5ea75ddf09 [ticket/11526] Update all dependencies / regenerate composer.lock. 
PHPBB3-11526
 2013-05-09 02:48:38 +02:00
Andreas Fischer
b3d16f21a8 [ticket/11526] Increase composer minimum stability in olympus to stable. 
PHPBB3-11526
 2013-05-09 02:48:31 +02:00
Andreas Fischer
d26da01fa0 Merge branch 'ticket/11527' into ticket/11526 
* ticket/11527:
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.
 2013-05-09 02:48:11 +02:00
Andreas Fischer
051c2ec251 [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7. 
PHPBB3-11527
 2013-05-09 02:38:27 +02:00
Oleg Pudeyev
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop 
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
  [ticket/10155] Update copyright in new migration file to 2013
  [ticket/10155] Make effectively installed test more specific
  [ticket/10155] Use more descriptive title for migration file
  [ticket/10155] Use new migration file for jQuery config update
  [ticket/10155] Update jQuery to 1.8.3
 2013-05-08 19:35:59 -04:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
 2013-05-08 08:23:11 -04:00
Oleg Pudeyev
1a062c5064 Merge PR #1308 branch 'nickvergessen/ticket/11450' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11450:
  [ticket/11450] Limit scopes of filters and add better docs
  [ticket/11450] Use helpers to copy/remove files
  [ticket/11450] Move mocked class into mock/metadata_manager.php
  [ticket/11450] Add new line at end of file
  [ticket/11450] Fix tests class name
  [ticket/11450] Require db_tools file to be included
  [ticket/11450] Add test for unexisting composer.json
  [ticket/11450] Test the extensions details page in ACP Customise Tab
  [ticket/11450] Fix all instances of phpbb_extension_metadata_manager
  [ticket/11450] Fix doc blocks and add missing class var $config
  [ticket/11450] Sort parameters alphabetically
  [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()
 2013-05-08 08:17:39 -04:00
Dhruv
284011ebf2 [ticket/10325] move migration into a new file 
PHPBB3-10325
 2013-05-08 17:04:03 +05:30
Joas Schilling
54680b9709 [ticket/11450] Limit scopes of filters and add better docs 
PHPBB3-11450
 2013-05-08 08:47:28 +02:00
Joas Schilling
4c9c1d8c02 [ticket/11450] Use helpers to copy/remove files 
PHPBB3-11450
 2013-05-08 08:47:27 +02:00
Joas Schilling
65c407044e [ticket/11450] Move mocked class into mock/metadata_manager.php 
PHPBB3-11450
 2013-05-08 08:47:26 +02:00
Joas Schilling
d75af4109f [ticket/11450] Add new line at end of file 
PHPBB3-11450
 2013-05-08 08:47:26 +02:00
Joas Schilling
74f3161b4b [ticket/11450] Fix tests class name 
PHPBB3-11450
 2013-05-08 08:47:25 +02:00
Joas Schilling
a44a35926f [ticket/11450] Require db_tools file to be included 
PHPBB3-11450
 2013-05-08 08:47:24 +02:00
Joas Schilling
0de153d903 [ticket/11450] Add test for unexisting composer.json 
PHPBB3-11450
 2013-05-08 08:47:23 +02:00
Joas Schilling
269c2ce98d [ticket/11450] Test the extensions details page in ACP Customise Tab 
PHPBB3-11450
 2013-05-08 08:47:22 +02:00
Joas Schilling
62f35121d9 [ticket/11450] Fix all instances of phpbb_extension_metadata_manager 
PHPBB3-11450
 2013-05-08 08:47:21 +02:00
Joas Schilling
001e3ebe9e [ticket/11450] Fix doc blocks and add missing class var $config 
PHPBB3-11450
 2013-05-08 08:46:04 +02:00
Joas Schilling
5794b3d621 [ticket/11450] Sort parameters alphabetically 
PHPBB3-11450
 2013-05-08 08:46:03 +02:00
Joas Schilling
b63a148e08 [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct() 
PHPBB3-11450
 2013-05-08 08:46:02 +02:00
Nils Adermann
d84617bb79 Merge pull request #1391 from nickvergessen/ticket/11442 
[ticket/11442] Use button name as indicator instead of css classes
 2013-05-07 15:23:53 -07:00
Joas Schilling
1834ceb614 [ticket/11442] Use button name as indicator instead of css classes 
This leaves it up to the style authors how to style any buttons, without
messing up any functionality.

PHPBB3-11442
 2013-05-08 00:08:35 +02:00
Joas Schilling
665352d0d1 [ticket/11442] Do not suggest an option on ajax confirm box 
Reverting commit cb13add269b78e1a9ac84a80c78557bb7695df09
Also fixing in prosilver and subsilver2

PHPBB3-11442
 2013-05-08 00:07:13 +02:00
Oleg Pudeyev
7a881183d8 Merge PR #1375 branch 'marc1706/ticket/11442' into develop 
# By marc1706
# Via marc1706
* marc1706/ticket/11442:
  [ticket/11442] Use correct button class for ajaxified confirm_box
 2013-05-07 16:30:48 -04:00
Andreas Fischer
5fba9c22dd Merge remote-tracking branch 'p-push/ticket/11435' into develop 
* p-push/ticket/11435:
  [ticket/11435] Fit comment into 80 columns and link to php manual.
 2013-05-06 22:25:41 +02:00
Andreas Fischer
a97d9d4b89 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
 2013-05-06 22:11:33 +02:00
Andreas Fischer
841f1e4922 Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus 
* MGaetan89/ticket/11144:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable
 2013-05-06 21:56:20 +02:00
Gaëtan Muller
eefcdfa54a [ticket/11144] Add missing {FORUM_NAME} variable 
Replace spaces with tabs

PHPBB3-11144
 2013-05-06 21:50:45 +02:00
Oleg Pudeyev
01eded7cc2 Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11288:
  [ticket/11288] fix regex in postgres
  [ticket/11288] add search tests cases
 2013-05-06 15:46:00 -04:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable 
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
 2013-05-06 21:31:16 +02:00
Oleg Pudeyev
ba01996e5a Merge PR #1389 branch 'EXreaction/ticket/11519' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11519:
  [ticket/11519] Rename test event template file
 2013-05-06 15:12:44 -04:00
Matt Friedman
153be855ca [ticket/10155] Update copyright in new migration file to 2013 
PHPBB3-10155
 2013-05-06 09:49:37 -07:00
Nathaniel Guse
9608d9bf1e [ticket/11519] Rename test event template file 
As requested by Oleg
https://github.com/phpbb/phpbb3/pull/1340#issuecomment-17306967

PHPBB3-11519
 2013-05-04 11:45:49 -05:00
Dhruv
bfdc6e1930 [ticket/11288] fix regex in postgres 
Postgres search backend now uses updated regex being used by
mysql search backend.

PHPBB3-11288
 2013-05-04 20:11:12 +05:30
Dhruv
3a30bd2753 [ticket/11288] add search tests cases 
PHPBB3-11288
 2013-05-04 18:25:43 +05:30
Dhruv
00d5cde04e [ticket/10325] fix acp language 
PHPBB3-10325
 2013-05-04 14:44:33 +05:30
Nils Adermann
7320e4a535 Merge pull request #1348 from nickvergessen/ticket/11495 
Ticket/11495 Nested Set Implementation
 2013-05-02 15:04:19 -07:00
Andreas Fischer
1dea12d607 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11517] Fix list numbering
 2013-05-02 23:13:27 +02:00
Andreas Fischer
92e0613324 Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympus 
* hjpotter92/ticket/11517:
  [ticket/11517] Fix list numbering
 2013-05-02 23:12:39 +02:00
hjpotter92
6d4a75b3cb [ticket/11517] Fix list numbering 
PHPBB3-11517
 2013-05-02 06:29:32 +05:30