aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-163-2/+75
|\
| * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
| |\
| * | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| * | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| * | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| * | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| * | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| * | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| * | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
* | | 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
* | | | [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-141-11/+0
|/ / /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-143-13/+217
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-143-13/+217
| |\ \ | | |/ | |/|
| | * [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | * [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | * [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | * [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-051-3/+108
| | * [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-042-87/+103
| | * [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] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-021-1/+23
* | | [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-131-5/+21
* | | [ticket/11015] Change more docblocks to phpbb_db_driver.Oleg Pudeyev2012-12-134-5/+5
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-131-1/+1
|\ \ \
| * | | [ticket/11263] Fix PHP Notice: Undefined variable: extension_managerNathan Guse2012-12-131-1/+1
* | | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-1320-101/+571
|\ \ \ \ | |/ / /
| * | | [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-122-3/+3
| * | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-1/+1
| |\ \ \
| | * | | [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| * | | | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-107-19/+209
| |\ \ \ \
| | * | | | [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| | |/ / /
| | * | | [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-174-5/+16
| | * | | [feature/template-events] Make style names private on template.Oleg Pudeyev2012-11-172-2/+14
| | * | | [feature/template-events] Use style names array in template filter.Oleg Pudeyev2012-11-171-5/+13
| | * | | [feature/template-events] Generate style names array in set_style.Oleg Pudeyev2012-11-171-5/+11
| | * | | [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-175-18/+25
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 13:44:16 +0000