aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.11' into develop-olympusNils Adermann2012-07-191-30/+37
|\
| * Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-releas...Nils Adermann2012-07-191-30/+37
| |\
| | * [ticket/10441] Make CDB linking more consistentPatrick Webster2012-07-021-5/+5
| | * [ticket/10441] TypoPatrick Webster2012-06-291-1/+1
| | * [ticket/10441] Update to docs/README.htmlOyabun12012-06-291-28/+35
* | | Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympusAndreas Fischer2012-07-192-0/+61
|\ \ \
| * | | [ticket/10981] Added goutte via composerFyorl2012-07-162-0/+61
* | | | [ticket/10995] Return false in mssqlnative sql_fetchrow on empty resultPatrick Webster2012-07-171-1/+1
* | | | Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympusAndreas Fischer2012-07-171-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10789] Remove unnecessary variables from PM print - prosilverVinny2012-05-221-3/+2
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-121-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11Andreas Fischer2012-07-121-1/+1
| |\ \ \
| | * | | [ticket/10978] Fix typo in prosilver ucp_groups_membership.htmlPatrick Webster2012-07-091-1/+1
| | | |/ | | |/|
* | | | Merge PR #856 branch 'prep-release-3.0.11' into develop-olympusOleg Pudeyev2012-07-073-7/+54
|\ \ \ \ | |/ / /
| * | | Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11Oleg Pudeyev2012-07-073-7/+54
| |\ \ \
| | * | | [ticket/10937] Update documentation to say which comment styles are removed.Andreas Fischer2012-07-031-1/+1
| | * | | [ticket/10937] Comment removal functions: Restore backward compatibilityAndreas Fischer2012-07-033-7/+54
* | | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-013-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
| | |/ / | |/| |
* | | | [ticket/10850] Changed the fopen mode to wbBruno Ais2012-06-281-1/+1
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-212-2/+16
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10935' into prep-release-3...Andreas Fischer2012-06-212-2/+16
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-202-2/+16
* | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-06-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11Andreas Fischer2012-06-201-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10925] Clarify installation requirements for SQLitePatrick Webster2012-06-191-1/+1
* | | | Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-ol...Nils Adermann2012-06-191-1/+1
|\ \ \ \
| * | | | [ticket/9551] uncomment line and change length to 255Dhruv Goel2012-06-191-1/+1
* | | | | [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.Andreas Fischer2012-05-313-3/+3
| |/ / / |/| | |
* | | | [develop-olympus] Add changelog for 3.0.11 release.Andreas Fischer2012-05-311-19/+136
* | | | [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-313-5/+5
* | | | [develop-olympus] Bumping version numbers to final for 3.0.11 releases.Andreas Fischer2012-05-3110-11/+11
* | | | Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympusNils Adermann2012-05-311-0/+1
|\ \ \ \
| * | | | [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.Andreas Fischer2012-05-311-0/+1
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
|\ \ \ \
| * | | | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
* | | | | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
|\ \ \ \ \
| * | | | | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympusNils Adermann2012-05-311-3/+9
|\ \ \ \ \ \
| * | | | | | [ticket/10611] Filter out not existing database tables when making a backup.Andreas Fischer2012-05-301-1/+1
| * | | | | | [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().Andreas Fischer2012-05-301-2/+1
| * | | | | | [ticket/10611] Generate db_tools instance in acp_database module.Andreas Fischer2012-05-301-0/+7
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10162] Increase maximum length of email address TLD from 6 to 63.Andreas Fischer2012-05-301-1/+1
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympusNils Adermann2012-05-315-1/+38
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| * | | | | | | [ticket/10751] Add sql_lower_text() to database abstraction layer.Andreas Fischer2012-05-314-0/+36
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-313-6/+31
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/10908] Document that 0 filesize configuration means limited by PHPNils Adermann2012-05-292-2/+2
| * | | | | | [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| |/ / / / /