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

14612 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
88d064b6f4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
 2011-10-17 16:43:33 +02:00
Andreas Fischer
af11d94fb0 Merge remote-tracking branch 'naderman/ticket/10414' into develop 
* naderman/ticket/10414:
  [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
 2011-10-17 16:35:10 +02:00
Nils Adermann
9c861a0350 [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2 
Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php
version limitation for a directory was added in PHPUnit 3.6. A separate test
suite is required because the functional tests are in the whitelisted tests
directory. The base test for functional testing is only included in bootstrap
in versions 5.3 and above.

PHPBB3-10414
 2011-10-17 06:52:34 +02:00
Igor Wiedler
ff0839e76b Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympus 
* bantu/ticket/10416:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
 2011-10-17 02:40:44 +02:00
Igor Wiedler
2d42dbc385 Merge remote-tracking branch 'bantu/ticket/10417' into develop 
* bantu/ticket/10417:
  [ticket/10417] Fix array_merge() on undefined $config variable.
 2011-10-17 02:38:20 +02:00
Andreas Fischer
38e7f3fff7 [ticket/10417] Fix array_merge() on undefined $config variable. 
PHPBB3-10417
 2011-10-16 20:34:25 +02:00
Andreas Fischer
c451a15504 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
 2011-10-16 20:16:25 +02:00
Andreas Fischer
cc227cc6f6 Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympus 
* igorw/ticket/10413:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
 2011-10-16 20:16:12 +02:00
Andreas Fischer
fa1d9a4571 [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect(). 
PHPBB3-10416
 2011-10-16 20:10:37 +02:00
Igor Wiedler
8d33dea2cd [ticket/10413] Fix CS 
PHPBB3-10413
 2011-10-16 19:30:33 +02:00
Igor Wiedler
d4189013ab [feature/functional-tests] Introduce bootstrap method 
PHPBB3-10414
 2011-10-14 19:42:35 +02:00
Igor Wiedler
66b0cfe221 [feature/functional-tests] Make sure functional tests only install once 
The functional test setup bootstrapping should only be run once per
class.

PHPBB3-10414
 2011-10-14 19:37:20 +02:00
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:46 +02:00
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus 
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:38 +02:00
Igor Wiedler
99d6f00d51 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus 
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
 2011-10-14 17:48:15 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts 
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
 2011-10-14 17:37:12 +02:00
Igor Wiedler
207a73537b Merge remote-tracking branch 'naderman/feature/functional-tests' into develop 
* naderman/feature/functional-tests:
  [feature/functional-tests] Don't add elements to backup list twice
  [feature/functional-tests] Generate config correctly and install only once
  [feature/functional-tests] Configure functional tests through config file
  [feature/functional-tests] Implementing functional test framework with goutte
 2011-10-14 17:24:03 +02:00
Nils Adermann
a8aa7fd6c0 [feature/functional-tests] Don't add elements to backup list twice 
PHPBB3-10414
 2011-10-14 17:23:31 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once 
PHPBB3-10414
 2011-10-14 17:23:31 +02:00
Andreas Fischer
607761e830 [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. 
PHPBB3-10327
 2011-10-14 17:23:29 +02:00
Andreas Fischer
7e18d2b861 [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE. 
PHPBB3-10327
 2011-10-14 17:23:21 +02:00
Nils Adermann
0ffe494edd [feature/functional-tests] Configure functional tests through config file 
The functional tests now also use the test database

PHPBB3-10414
 2011-10-14 17:20:54 +02:00
Igor Wiedler
637d8eabe7 [feature/functional-tests] Implementing functional test framework with goutte 
PHPBB3-10414
 2011-10-14 17:20:53 +02:00
Andreas Fischer
4effe8fb8b [ticket/8240] Add ability to get a list of columns of a tables to db_tools. 
PHPBB3-8240
 2011-10-14 16:35:14 +02:00
Andreas Fischer
234edf674c [ticket/8240] Add ability to get a list of tables to db_tools. 
PHPBB3-8240
 2011-10-14 16:35:07 +02:00
Joas Schilling
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working. 
PHPBB3-9525
 2011-10-14 15:19:47 +02:00
Igor Wiedler
37d9e7e30c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
 2011-10-14 14:35:21 +02:00
Igor Wiedler
1657339e6d Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus 
* bantu/ticket/10327:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
 2011-10-14 14:34:44 +02:00
Andreas Fischer
d86fccf9c9 [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL. 
* CREATE INDEX is internally mapped to an ALTER INDEX statement.
* CREATE INDEX requires the INDEX permission.
* ALTER TABLE requires the (more powerful) ALTER permission.
* We require the ALTER permission anyway for operation.
* Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX
  permission which is good because some management software does not give
  out the INDEX permission by default.

http://dev.mysql.com/doc/refman/5.0/en/create-index.html

PHPBB3-10327
 2011-10-14 14:30:51 +02:00
Joas Schilling
8f6e99740b Merge branch 'develop-olympus' into develop 2011-10-14 04:39:20 +02:00
Joas Schilling
893469c652 Merge remote-tracking branch 'remotes/igorw/ticket/10189' into develop-olympus 2011-10-14 04:38:42 +02:00
Igor Wiedler
c3f3435228 [ticket/10189] Get rid of $id$ from schema files 
PHPBB3-10189
 2011-10-14 04:29:28 +02:00
Joas Schilling
ab8ecf5b92 [ticket/9956] Display error message if no disapprove reason given 
PHPBB3-9956
 2011-10-14 04:18:44 +02:00
Igor Wiedler
14636f61d5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too

Conflicts:
	phpBB/includes/auth/auth_db.php
 2011-10-14 03:56:55 +02:00
Igor Wiedler
3100b9bb7c Merge remote-tracking branch 'naderman/ticket/10212' into develop-olympus 
* naderman/ticket/10212:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
 2011-10-14 03:55:23 +02:00
Nils Adermann
768932a3f2 [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too 
PHPBB3-10212
 2011-10-14 03:41:52 +02:00
Igor Wiedler
8cf22f5529 [ticket/10189] Add "automatically generated" comment into schema-files 
PHPBB3-10189
 2011-10-14 03:41:02 +02:00
Igor Wiedler
7fa14e654a [ticket/10413] Make create_schema_files usable 
PHPBB3-10413
 2011-10-14 03:12:44 +02:00
Nils Adermann
d68b815690 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:21 +02:00
Nils Adermann
d16b160d5c Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop-olympus 
* github-nickvergessen/ticket/10074:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:05 +02:00
Nils Adermann
e11caec2a0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10187] XHTML fix for empty groups in UCP.
 2011-10-14 02:51:32 +02:00
Nils Adermann
cdacbd07f8 Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympus 
* github-bantu/ticket/10187:
  [ticket/10187] XHTML fix for empty groups in UCP.
 2011-10-14 02:51:12 +02:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:49:15 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus 
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:47:45 +02:00
Joas Schilling
1f677d5de3 [ticket/10074] Change default value of 'Set as special rank' to No 
PHPBB3-10074
 2011-10-14 02:41:37 +02:00
Joas Schilling
52b2ee5a06 Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into develop 2011-10-14 02:17:20 +02:00
Igor Wiedler
5d055747d1 Merge pull request #415 from naderman/ticket/10412 
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
 2011-10-13 17:06:42 -07:00
Nils Adermann
bb616b4135 [ticket/10412] Replace memory_get_usage with memory_get_peak_usage 
PHPBB3-10412
 2011-10-14 02:02:17 +02:00