aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'ee0db1a1d5f0150016d0971057f889f2366f9856' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
|\
| * Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-247-56/+22
| |\
* | \ Merge commit '904bcb86a054ab6256da565098eb9bd8ab20414b' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'ticket/callumacrae/7834' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \
| | * | [ticket/7834] Topic time didn't update when first post was deletedCallum Macrae2011-02-241-2/+2
* | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
* | | | Merge commit 'e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5' into feature/prune-usersOleg Pudeyev2011-05-080-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/callumacrae/9872' into develop-olympusOleg Pudeyev2011-02-241-38/+0
| |\ \ \
| | * | | [ticket/9872] Removed some useless code that broke delete_postsCallum Macrae2011-02-241-38/+0
| | |/ /
* | | | Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/callumacrae/9997' into develop-olympusOleg Pudeyev2011-02-241-2/+2
| |\ \ \
| | * | | [ticket/9997] Fixed an inconsistency in the Moderator Control PanelCallum Macrae2011-02-241-2/+2
| | |/ /
* | | | Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/nickvergessen/9874' into develop-olympusOleg Pudeyev2011-02-244-14/+18
| |\ \ \
| | * | | [ticket/9874] view_log() performs unneeded count query over all log entries.Joas Schilling2011-02-254-14/+18
| | |/ /
* | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-084-45/+161
* | | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
* | | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
| |_|/ |/| |
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-02-241-0/+1
|\ \ \ | |/ /
| * | Merge branch 'ticket/p/10058' into develop-olympusIgor Wiedler2011-02-241-0/+1
| |\ \ | | |/ | |/|
| | * [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.Oleg Pudeyev2011-02-241-0/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-243-1/+13
|\ \ \ | |/ /
| * | Merge branch 'ticket/p/10041' into develop-olympusAndreas Fischer2011-02-241-0/+12
| |\ \
| | * | [ticket/10041] Use send_status_line more in download/file.phpOleg Pudeyev2011-02-231-0/+12
| * | | Merge branch 'ticket/p/10056' into develop-olympusAndreas Fischer2011-02-241-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10056] Corrected a typo in Firebird name.Oleg Pudeyev2011-02-231-1/+1
| | |/
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-2310-10/+21
|\ \ \ | |/ /
| * | Merge branch 'ticket/erikfrerejean/7778' into develop-olympusOleg Pudeyev2011-02-2310-10/+20
| |\ \ | | |/ | |/|
| | * [ticket/7778] Update all the schema filesErik Frèrejean2011-02-235-5/+5
| | * [ticket/7778] Add the column change to `mysql_upgrader.php`Erik Frèrejean2011-02-231-1/+1
| | * [ticket/7778] BBCode single limitErik Frèrejean2011-02-234-4/+14
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2011-02-246-78/+274
|\ \ | |/
| * Merge branch 'ticket/naderman/10052' into develop-olympusNils Adermann2011-02-235-78/+218
| |\
| | * [ticket/10052] Add comments to the session testable factory.Nils Adermann2011-02-232-7/+60
| | * [ticket/10052] Correct session tests, and separate session factory from testsNils Adermann2011-02-235-78/+165
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-213-44/+237
|\ \ \ | |/ /
| * | Merge branch 'ticket/nickvergessen/9675' into develop-olympusOleg Pudeyev2011-02-213-44/+237
| |\ \ | | |/ | |/|
| | * [ticket/9675] Correctly check whether the style/component is still in use.Joas Schilling2011-02-081-28/+64
| | * [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-083-124/+162
| | * [ticket/9675] Adjust the language-string to reflect the changes.Joas Schilling2011-02-081-1/+1
| | * [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-083-2/+121
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-203-12/+15
|\ \ \ | |/ /
| * | Merge branch 'ticket/p/10049' into develop-olympusAndreas Fischer2011-02-203-12/+15
| |\ \
| | * | [ticket/10049] Mark session init test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | * | [ticket/10049] Mark session continue test incomplete for now.Oleg Pudeyev2011-02-201-0/+2
| | * | [ticket/10049] Globalize $_SID.Oleg Pudeyev2011-02-191-0/+1
| | * | [ticket/10049] Chase assertResultEquals rename.Oleg Pudeyev2011-02-192-4/+4
| | * | [ticket/10049] Fixed requires in session tests and mock.Oleg Pudeyev2011-02-193-8/+6
| | * | [ticket/10049] Renamed session test files to proper file names.Oleg Pudeyev2011-02-192-0/+0
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-201-2/+2
|\ \ \ \ | |/ / /