aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [feature/functional-tests] Generate config correctly and install only onceNils Adermann2011-10-142-27/+44
* Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-1/+1
|\
| * Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-1/+1
| |\
| | * [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-141-1/+1
* | | 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
| | * | [ticket/10189] Add "automatically generated" comment into schema-filesIgor Wiedler2011-10-148-0/+70
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+9
|\ \ \ \ | |/ / /
| * | | [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users tooNils Adermann2011-10-141-1/+10
| |/ /
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop...Nils Adermann2011-10-141-1/+1
| |\ \
| | * | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympusNils Adermann2011-10-141-1/+8
| |\ \ \
| | * | | [ticket/10187] XHTML fix for empty groups in UCP.Andreas Fischer2011-10-131-1/+8
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-143-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-143-2/+14
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | * | | [ticket/10278] Also timeout when receiving data over a slow connection.Andreas Fischer2011-10-131-1/+2
| | * | | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.Andreas Fischer2011-08-251-1/+1
| | * | | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-252-0/+9
| | * | | [ticket/10278] Also set timeout on stream in get_remote_file().Andreas Fischer2011-08-251-0/+2
* | | | | Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into de...Joas Schilling2011-10-142-32/+1
|\ \ \ \ \
| * | | | | [feature/remove-imagesets] Fix create_schema_files, get rid of imagesetsIgor Wiedler2011-10-142-32/+1
* | | | | | [ticket/10412] Replace memory_get_usage with memory_get_peak_usageNils Adermann2011-10-143-19/+6
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
|\ \ \ \ \
| * | | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10409' into developAndreas Fischer2011-10-131-28/+57
|\ \ \ \ \ \
| * | | | | | [ticket/10409] Running database_update.php multiple times breaks the updateJoas Schilling2011-10-131-28/+57
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympusAndreas Fischer2011-10-131-1/+7
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty resultIgor Wiedler2011-10-131-1/+7
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-51/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10246] Move coding guidelines VCS section to wikiIgor Wiedler2011-10-131-51/+1
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10275] Remove incorrect password information from FAQIgor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/9898] Encourage patches in READMEIgor Wiedler2011-10-131-1/+1
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-132-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympusAndreas Fischer2011-10-132-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/10408] Layout of topics/attachments list is broken in UCP and MCPJoas Schilling2011-10-132-3/+3
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10304] Fix URL for ICQ while view private messagesJoas Schilling2011-10-131-1/+1
| | |/ / / /