aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11283] Extension manager follow symlinks.Erik Frèrejean2012-12-231-1/+1
* Merge PR #1133 branch 'marc1706/ticket/10954' into developOleg Pudeyev2012-12-195-4/+134
|\
| * [ticket/10954] Add missing semi-colonMarc Alexander2012-12-181-1/+1
| * [ticket/10954] Make sure to mark subforums unread and add small fixesMarc Alexander2012-12-181-7/+12
| * [ticket/10954] Miscellaneous coding fixesMarc Alexander2012-12-181-8/+5
| * [ticket/10954] Use quotes in attribute selectors and reduce use of eachMarc Alexander2012-12-161-11/+5
| * [ticket/10954] Change currentObject to $this for consistencyMarc Alexander2012-12-161-8/+8
| * [ticket/10954] Use function for closing alert popupMarc Alexander2012-12-161-8/+11
| * [ticket/10954] Simplify marking forums read and fix topic markingMarc Alexander2012-12-151-10/+11
| * [ticket/10954] Join array of class names instead of creating a stringMarc Alexander2012-12-151-3/+3
| * [ticket/10954] Fix coding guidelines infractionsMarc Alexander2012-12-151-36/+31
| * [ticket/10954] Change behavior of marking topics/forumsMarc Alexander2012-12-143-40/+79
| * [ticket/10954] Fix scope of current_objectMarc Alexander2012-12-131-6/+5
| * [ticket/10954] Only call $(this) once and reduce number of DOM traversalsMarc Alexander2012-12-131-9/+20
| * [ticket/10954] Modify is_ajax check for consistencyMarc Alexander2012-12-122-18/+12
| * [ticket/10954] Mark topics read without popupMarc Alexander2012-12-123-3/+53
| * [ticket/10954] Mark forums read without popup or page refreshMarc Alexander2012-12-124-7/+49
* | [ticket/10803] Show failure message until user dismisses itMarc Alexander2012-12-181-6/+0
* | 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
| | * | [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