aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/bantu/10047' into develop-olympusOleg Pudeyev2011-02-201-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10047] Do not put session id in URL on posting.php when cookies are on.Andreas Fischer2011-02-191-2/+2
| |/ /
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-172-9/+35
|\ \ \ | |/ /
| * | Merge branch 'ticket/nickvergessen/9944' into develop-olympusOleg Pudeyev2011-02-172-9/+35
| |\ \
| | * | [ticket/9944] Add empty line before the while() so you can better read the codeJoas Schilling2011-02-141-0/+1
| | * | [ticket/9944] Extension groups naming don't use users' language in ACPJoas Schilling2011-01-272-9/+34
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-171-44/+77
|\ \ \ | |/ /
| * | Merge branch 'ticket/p/10044' into develop-olympusAndreas Fischer2011-02-171-44/+77
| |\ \
| | * | [ticket/10044] Updated invocation documentation.Oleg Pudeyev2011-02-161-1/+1
| | * | [ticket/10044] Stop when failed to retrieve network/collaborators.Oleg Pudeyev2011-02-151-40/+50
| | * | [ticket/10044] Added -h to setup_github_network.php.Oleg Pudeyev2011-02-151-2/+3
| | * | [ticket/10044] Error handling for remote requests in setup_github_network.phpOleg Pudeyev2011-02-151-1/+22
| | * | [ticket/10044] Made setup_github_network.php runnable as a scriptOleg Pudeyev2011-02-151-0/+1
* | | | Merge branch 'ticket/nickvergessen/10045' into developIgor Wiedler2011-02-1612-14/+16
|\ \ \ \
| * | | | [ticket/10045] Update version in some more files.Joas Schilling2011-02-1611-11/+11