aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/nickvergessen/9823' into developAndreas Fischer2011-02-048-541/+1283
|\
| * [ticket/9823] Replace 0x80000000 with -2147483648 in tests.Andreas Fischer2011-02-041-2/+2
| * [ticket/9823] Move mock file into the mock/ folder.Joas Schilling2011-02-016-10/+10
| * [ticket/9823] Update Unit tests to the new system and correct some minor issuesJoas Schilling2011-02-016-70/+17
| * [ticket/9823] Update copyright year and add newline at the end of the file.Joas Schilling2011-02-011-2/+2
| * [ticket/9823] Correct unit-tests to use self:: instead of the class-name.Joas Schilling2011-02-012-10/+10
| * [ticket/9823] Unit tests for validate_config_vars.Joas Schilling2011-02-014-10/+159
| * [ticket/9823] Unit tests for build_cfg_template.Joas Schilling2011-02-012-0/+195
| * [ticket/9823] Unit tests for validate_rang.Joas Schilling2011-02-012-0/+187
| * [ticket/9823] Unit tests for h_radio.Joas Schilling2011-02-013-0/+157
| * [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-014-537/+644
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-1/+5
|\ \
| * \ Merge branch 'ticket/p/10020' into develop-olympusAndreas Fischer2011-02-041-1/+5
| |\ \
| | * | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | * | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
| |/ /
* | | Merge branch 'ticket/erikfrerejean/10011' into developAndreas Fischer2011-02-018-16/+16
|\ \ \
| * | | [ticket/10011] Tests can't be ran on PHP < 5.3Erik Frèrejean2011-01-318-16/+16
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-011-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
| |\ \
| | * | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-3118-35/+35
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch 'ticket/erikfrerejean/10011' into develop-olympusAndreas Fischer2011-01-3118-33/+33
| |\ \
| | * | [ticket/10011] Tests don't work on PHP < 5.3Erik Frèrejean2011-01-3118-33/+33
* | | | Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-301-0/+3
|\ \ \ \
| * | | | [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.Joas Schilling2011-01-301-0/+3
* | | | | Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-302-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-302-0/+10
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-303-13/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/nickvergessen/9985' into develop-olympusAndreas Fischer2011-01-301-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| * | | Merge branch 'ticket/nickvergessen/9989' into develop-olympusAndreas Fischer2011-01-302-11/+5
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.Joas Schilling2011-01-292-11/+5
| | |/
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-274-9/+33
|\ \ \ | |/ /
| * | Merge branch 'ticket/bantu/9166' into develop-olympusOleg Pudeyev2011-01-274-11/+35
| |\ \ | | |/ | |/|
| | * [ticket/9166] Fixed CSS element order in subsilver.Schnorrer422011-01-281-4/+10
| | * [ticket/9166] Fixed CSS element order in prosilver.Schnorrer422011-01-283-7/+25
| |/
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-261-0/+2
|\ \ | |/
| * Merge branch 'ticket/bantu/10007' into develop-olympusOleg Pudeyev2011-01-261-0/+2
| |\
| | * [ticket/10007] Add directive 'internal' to blocked folders in nginx config.Andreas Fischer2011-01-241-0/+2
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-238-1/+322
|\ \ | |/
| * Merge branch 'task/naderman/session-tests' into develop-olympusNils Adermann2011-01-238-1/+378
| |\
| | * [task/session-tests] Renamed assertSqlResultEquals and fixed its param orderNils Adermann2011-01-211-1/+1
| | * [task/session-tests] Test additional combinations of session_begin.Nils Adermann2011-01-201-12/+46
| | * [task/session-tests] Added tests for the session class.Nils Adermann2011-01-208-1/+344
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-231-2/+3
|\ \ \ | |/ /
| * | Merge branch 'ticket/rxu/8779' into develop-olympusNils Adermann2011-01-231-2/+3
| |\ \ | | |/ | |/|
| | * [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
| |/
* | Merge branch 'ticket/bantu/9790' into developIgor Wiedler2011-01-183-20/+55
|\ \
| * | [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.Andreas Fischer2011-01-182-15/+18
| * | [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.Andreas Fischer2011-01-172-0/+18