aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
* Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-297-24/+28
|\
| * [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-103-18/+18
| * [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-091-1/+1
| * [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| * [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-094-7/+10
* | Merge remote-tracking branch 'p/ticket/10758' into developAndreas Fischer2012-12-257-47/+100
|\ \
| * | [ticket/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| * | [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| * | [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| * | [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| * | [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| * | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| * | [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| * | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| * | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-156-32/+38
* | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-221-1712/+1712
|\ \ \
| * | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-071-1712/+1712
* | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-2213-20/+17
|\ \ \ \
| * | | | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-2013-20/+17
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-201-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
* | | | | Merge PR #1133 branch 'marc1706/ticket/10954' into developOleg Pudeyev2012-12-191-0/+28
|\ \ \ \ \
| * | | | | [ticket/10954] Change behavior of marking topics/forumsMarc Alexander2012-12-141-4/+10
| * | | | | [ticket/10954] Modify is_ajax check for consistencyMarc Alexander2012-12-121-13/+9
| * | | | | [ticket/10954] Mark forums read without popup or page refreshMarc Alexander2012-12-121-5/+31
* | | | | | Merge PR #1147 branch 'marc1706/ticket/10763' into developOleg Pudeyev2012-12-181-5/+10
|\ \ \ \ \ \
| * | | | | | [ticket/10763] Use self when calling get_extension() in filespec classMarc Alexander2012-12-171-1/+1
| * | | | | | [ticket/10763] Make functions for remote avatars staticMarc Alexander2012-12-171-5/+10
| |/ / / / /
* | | | | | 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