aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'naderman/feature/functional-tests' into developIgor Wiedler2011-10-1410-64/+328
|\ | | | | | | | | | | | | | | * 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
| * [feature/functional-tests] Don't add elements to backup list twiceNils Adermann2011-10-141-7/+0
| | | | | | | | PHPBB3-10414
| * [feature/functional-tests] Generate config correctly and install only onceNils Adermann2011-10-144-51/+92
| | | | | | | | PHPBB3-10414
| * [feature/functional-tests] Configure functional tests through config fileNils Adermann2011-10-143-61/+87
| | | | | | | | | | | | The functional tests now also use the test database PHPBB3-10414
| * [feature/functional-tests] Implementing functional test framework with goutteIgor Wiedler2011-10-146-0/+204
|/ | | | PHPBB3-10414
* Merge branch 'develop-olympus' into developIgor Wiedler2011-10-142-1/+19
|\ | | | | | | | | * develop-olympus: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| * Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-142-1/+19
| |\ | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| | * [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-142-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-148-35/+56
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'remotes/igorw/ticket/10189' into develop-olympusJoas Schilling2011-10-148-35/+56
| |\ \
| | * | [ticket/10189] Get rid of $id$ from schema filesIgor Wiedler2011-10-148-50/+1
| | | | | | | | | | | | | | | | PHPBB3-10189
| | * | [ticket/10189] Add "automatically generated" comment into schema-filesIgor Wiedler2011-10-148-0/+70
| | | | | | | | | | | | | | | | PHPBB3-10189
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too Conflicts: phpBB/includes/auth/auth_db.php
| * | | Merge remote-tracking branch 'naderman/ticket/10212' into develop-olympusIgor Wiedler2011-10-141-1/+10
| |\ \ \ | | |/ / | |/| | | | | | | | | | * naderman/ticket/10212: [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
| | * | [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
| |/ / | | | | | | | | | PHPBB3-10212
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10074] Change default value of 'Set as special rank' to No
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵Nils Adermann2011-10-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10074: [ticket/10074] Change default value of 'Set as special rank' to No
| | * | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10074
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10187] XHTML fix for empty groups in UCP.
| * | | Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympusNils Adermann2011-10-141-1/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10187: [ticket/10187] XHTML fix for empty groups in UCP.
| | * | | [ticket/10187] XHTML fix for empty groups in UCP.Andreas Fischer2011-10-131-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10187
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-143-2/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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().
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-143-2/+14
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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().
| | * | | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| | * | | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| | * | | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| | * | | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-252-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10278
| | * | | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278
* | | | | Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into ↵Joas Schilling2011-10-142-32/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | develop
| * | | | | [feature/remove-imagesets] Fix create_schema_files, get rid of imagesetsIgor Wiedler2011-10-142-32/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10336
* | | | | | Merge pull request #415 from naderman/ticket/10412Igor Wiedler2011-10-133-19/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usage
| * | | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-143-19/+6
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10412
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10300: [ticket/10300] Always set group attributes for teampage and legend
| * | | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in acp_groups.php removes unchanged attributes from the group_attributes array, to prevent issues with reapplying avatar/rank and more. This code causes problems with the new teampage/legend feature, because when the attribute is not set, the group is removed from the feature. Therefore I added an array with the keys that need to be set, when calling the function. PHPBB3-10300
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10409' into developAndreas Fischer2011-10-131-28/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10409: [ticket/10409] Running database_update.php multiple times breaks the update
| * | | | | | [ticket/10409] Running database_update.php multiple times breaks the updateJoas Schilling2011-10-131-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10409
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-2/+24
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * | | | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-132-2/+24
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| | * | | | | [ticket/10307] Add a test for PHPBB3-10307Igor Wiedler2011-10-131-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10307
| | * | | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-10307
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-51/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10246] Move coding guidelines VCS section to wiki
| * | | | | Merge remote-tracking branch 'igorw/ticket/10246' into develop-olympusAndreas Fischer2011-10-131-51/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10246: [ticket/10246] Move coding guidelines VCS section to wiki
| | * | | | | [ticket/10246] Move coding guidelines VCS section to wikiIgor Wiedler2011-10-131-51/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VCS section can now be found at: * http://wiki.phpbb.com/Git#Branches PHPBB3-10246
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| * | | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8094: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| | * | | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-8094
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10275] Remove incorrect password information from FAQ
| * | | | | Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10275: [ticket/10275] Remove incorrect password information from FAQ
| | * | | | | [ticket/10275] Remove incorrect password information from FAQIgor Wiedler2011-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FAQ contains instructions to find the password in the registration e-mail. We no longer send the password on registration. So let's just remove this incorrect piece of information from the FAQ. PHPBB3-10275
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9898] Encourage patches in README
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-22 04:01:41 +0000