aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-111-0/+1
|\
| * Merge branch 'ticket/erikfrerejean/10090' into develop-olympusOleg Pudeyev2011-03-111-0/+1
| |\
| | * [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignoreErik Frèrejean2011-03-101-0/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'ticket/p/10016' into develop-olympusAndreas Fischer2011-03-111-1/+5
| |\ \
| | * | [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)Andreas Fischer2011-03-051-0/+1
| | * | [ticket/10016] Leave Firebird unchanged.Andreas Fischer2011-03-051-0/+3
| | * | [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.Oleg Pudeyev2011-01-281-1/+1
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-104-5/+143
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/rxu/10035' into develop-olympusOleg Pudeyev2011-03-101-1/+1
| |\ \ \
| | * | | [ticket/10035] ACP template edit feature allows to read any files on webserver.rxu2011-03-071-1/+1
| * | | | Merge branch 'ticket/p/10057' into develop-olympusAndreas Fischer2011-03-093-4/+142
| |\ \ \ \
| | * | | | [ticket/10057] Fixes for a bunch of small problems.Oleg Pudeyev2011-03-083-2/+18
| | * | | | [ticket/10057] Handle the case of missing interbase extension better.Oleg Pudeyev2011-03-071-1/+17
| | * | | | [ticket/10057] Fixed wrong usage of sql_error again, in firebird.Oleg Pudeyev2011-03-071-2/+5
| | * | | | [ticket/10057] Fixed usage of sql_error again.Oleg Pudeyev2011-03-071-2/+4
| | * | | | [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.Oleg Pudeyev2011-03-071-1/+1
| | * | | | [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.Oleg Pudeyev2011-03-061-3/+15
| | * | | | [ticket/10057] Skip ibase_service_attach if firebird connection failed.Oleg Pudeyev2011-03-061-1/+3
| | * | | | [ticket/10057] Check for interbase function existence.Oleg Pudeyev2011-03-061-0/+8
| | * | | | [ticket/10057] Split statements in firebird dbal for readability.Oleg Pudeyev2011-03-061-2/+16
| | * | | | [ticket/10057] Include error collector class file in postgres dbal.Oleg Pudeyev2011-03-061-0/+5
| | * | | | [ticket/10057] Moved error collector class into its own file.Oleg Pudeyev2011-03-062-44/+45
| | * | | | [ticket/10057] Use a class for error collection.Oleg Pudeyev2011-03-062-36/+38
| | * | | | [ticket/10057] More informative error messages in postgres dbal.Oleg Pudeyev2011-03-061-2/+2
| | * | | | [ticket/10057] No negative array indexing.Oleg Pudeyev2011-03-061-1/+1
| | * | | | [ticket/10057] Report postgres db connection errors.Oleg Pudeyev2011-03-062-1/+58
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-072-8/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/p/10069' into develop-olympusAndreas Fischer2011-03-071-8/+25
| |\ \ \ \
| | * | | | [ticket/10069] Improvements to sample nginx configuration.Oleg Pudeyev2011-03-061-8/+25
| | |/ / /
| * | | | Merge branch 'ticket/bantu/10079' into develop-olympusAndreas Fischer2011-03-071-0/+1
| |\ \ \ \
| | * | | | [ticket/10079] Add gallery avatars to .gitignore.Andreas Fischer2011-03-071-0/+1
* | | | | | Merge branch 'ticket/igorw/9669' into developAndreas Fischer2011-03-071-30/+87
|\ \ \ \ \ \
| * | | | | | [ticket/9669] Replace spaces with tabsIgor Wiedler2011-03-071-1/+1
| * | | | | | [ticket/9669] Switch if/else to make the if positiveIgor Wiedler2011-03-061-33/+33
| * | | | | | [ticket/9669] Make sure normalize_nfc returns stringIgor Wiedler2011-03-051-3/+3
| * | | | | | [ticket/9669] Add isNormalized checks for performanceIgor Wiedler2011-03-051-2/+14
| * | | | | | [ticket/9669] Add native Normalizer supportIgor Wiedler2011-03-051-30/+75
* | | | | | | Merge branch 'ticket/naderman/10080' into developNils Adermann2011-03-072-2/+25
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10080] Allow resetting the request instance used by request_var.Nils Adermann2011-03-072-2/+25
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-03-073-206/+47
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'ticket/aptx/10081' into develop-olympusNils Adermann2011-03-073-206/+47
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | [ticket/10081] remove $phpEx.Marek A. Ruszczynski2011-03-071-10/+3
| | * | | | | | [ticket/10081] Cleanup Template Tests.Marek A. Ruszczynski2011-03-073-199/+47
| |/ / / / / /
* | | | | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-071-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/10011] Removing __DIR__ uses I missed in previous commitNils Adermann2011-03-071-3/+3
* | | | | | | Merge branch 'ticket/naderman/10011' into developAndreas Fischer2011-03-072-7/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.Nils Adermann2011-03-072-7/+7
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-071-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge branch 'ticket/naderman/10040' into develop-olympusAndreas Fischer2011-03-071-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |