aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/bantu/ticket/11273' into developNathan Guse2012-12-151-1/+1
|\
| * [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.Andreas Fischer2012-12-151-1/+1
* | Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into developNathan Guse2012-12-151-4/+4
|\ \ | |/ |/|
| * [ticket/11162] Chase dbal autoloading changes in develop.Oleg Pudeyev2012-12-131-4/+4
* | Merge remote-tracking branch 'p/ticket/11268' into developAndreas Fischer2012-12-151-1/+0
|\ \
| * | [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.Oleg Pudeyev2012-12-141-1/+0
|/ /
* | Merge PR #1142 branch 'nickvergessen/ticket/11250' into developOleg Pudeyev2012-12-142-23/+248
|\ \ | |/ |/|
| * [ticket/11250] Use user defined message as incomplete messageJoas Schilling2012-12-141-3/+2
| * [ticket/11250] Add tests for simple nesting and codeJoas Schilling2012-12-141-7/+44
| * [ticket/11250] Run tests by default and add an option for incomplete onesJoas Schilling2012-12-141-1/+4
| * [ticket/11250] Fix parsing result with special charsJoas Schilling2012-12-141-35/+40
| * [ticket/11250] Add tests for size and attachmentJoas Schilling2012-12-141-0/+10
| * [ticket/11250] Fix method namesJoas Schilling2012-12-141-3/+3
| * [ticket/11250] Add some comments and fix a descriptionJoas Schilling2012-12-141-6/+4
| * [ticket/11250] Add some more tests for quotesJoas Schilling2012-12-141-0/+26
| * [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-142-11/+26
| * [ticket/11250] Add parsing tests for our basic bbcodes in simple casesJoas Schilling2012-12-141-8/+140
|/
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-147-13/+516
|\
| * Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-147-13/+516
| |\
| | * [ticket/11162] Reformat.Oleg Pudeyev2012-12-131-1/+1
| | * [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-127-4/+4
| | * [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | * [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-052-7/+8
| | * [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | * [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | * [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | * [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-053-10/+239
| | * [ticket/11162] This test really only works for bookmarks.Oleg Pudeyev2012-12-043-3/+50
| | * [ticket/11162] The test is not at all trivial.Oleg Pudeyev2012-12-041-1/+1
| | * [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | * [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-044-88/+104
| | * [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | * [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | * [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | * [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | * [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | * [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | * [ticket/11162] Make count function upper case.Andreas Fischer2012-11-111-1/+1
| | * [ticket/11162] Rename count variable name to remaining_rows.Andreas Fischer2012-11-111-2/+2
| | * [ticket/11162] Use integer casting instead of SQL escape.Andreas Fischer2012-11-111-1/+1
| | * [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-023-1/+150
* | | Merge remote-tracking branch 'p/ticket/11015' into developAndreas Fischer2012-12-1445-199/+243
|\ \ \
| * | | [ticket/11015] Move comment in the right place.Oleg Pudeyev2012-12-131-7/+7
| * | | [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31Andreas Fischer2012-12-131-0/+9
| * | | [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.Oleg Pudeyev2012-12-132-5/+61
| * | | [ticket/11015] Change permission adding in database updater to new style.Oleg Pudeyev2012-12-131-2/+2
| * | | [ticket/11015] Change more docblocks to phpbb_db_driver.Oleg Pudeyev2012-12-134-5/+5
| * | | [ticket/11015] Installer still needs 3.0-style dbms name.Oleg Pudeyev2012-12-131-0/+2
| * | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-134-12/+58
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-131-3/+11
|\ \ \ \ | | |/ / | |/| |
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 14:39:02 +0000