aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
* [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-249-32/+56
|\
| * Merge branch 'develop-olympus' into developJoas Schilling2013-06-211-16/+15
| |\
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
| | |\
| | | * [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | * Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ticke...Dhruv2013-06-201-15/+15
| | | |\
| | | | * [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | * [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into developJoas Schilling2013-06-212-6/+6
| |\ \ \ \
| | * | | | [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympusAndreas Fischer2013-06-201-0/+4
| | |\ \ \
| | | * | | [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| | | |/ /
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
| |\ \ \ \ | | |/ / /
| | * | | [ticket/10820] fix if condition to check for IEDhruv2013-06-141-1/+1
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-132-2/+2
| |\ \ \ \ | | |/ / /
| | * | | [ticket/10820] Add additional check for IE in conditionDhruv2013-06-131-2/+2
| | * | | [ticket/10820] Fix function docblockDhruv2013-06-121-1/+1
| | * | | [ticket/10820] Inject IE version in functionDhruv2013-06-121-8/+9
| | * | | [ticket/10820] fix regexDhruv2013-06-121-1/+9
| | * | | [ticket/10820] remove unnecessary parenthesesDhruv2013-06-121-1/+1
| | * | | [ticket/10820] fix docblockDhruv2013-06-121-1/+1
| | * | | [ticket/10820] add param and return to functionDhruv2013-06-121-3/+6
| | * | | [ticket/10820] simplify regex and escape dotDhruv2013-06-121-1/+1
| | * | | [ticket/10820] Use singular returnDhruv2013-06-121-1/+1
| | * | | [ticket/10820] remove unnecessary condition checksDhruv2013-06-121-2/+2
| | * | | [ticket/10820] add function docblockDhruv2013-06-121-0/+4
| | * | | [ticket/10820] fix IE check functionDhruv2013-06-121-8/+8
| | * | | [ticket/10820] proper usage of global and local variable browserDhruv2013-06-121-2/+2
| | * | | [ticket/10820] Image downloader recognize new version of ieriadhchtara2013-06-121-9/+14
| | |/ /
| * | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-131-1/+1
| |\ \ \
| | * \ \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-111-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| | | |\ \
| | | | * | [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| * | | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-13174-2575/+5351
| |\ \ \ \ \ | | |/ / / /
| | * | | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| * | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-081-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/10820] Fix function docblockDhruv2013-06-081-1/+1
| * | | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-052-8/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/10820] Inject IE version in functionDhruv2013-06-051-8/+9
| * | | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-05-121-1/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/10820] fix regexDhruv2013-05-121-1/+9
| * | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-dev...Andreas Fischer2013-04-272-7/+19
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/10820] remove unnecessary parenthesesDhruv2013-04-271-1/+1
| | * | | | | [ticket/10820] fix docblockDhruv2013-04-271-1/+1
| | * | | | | [ticket/10820] add param and return to functionDhruv2013-04-271-3/+6
| | * | | | | [ticket/10820] simplify regex and escape dotDhruv2013-04-271-1/+1
| | * | | | | [ticket/10820] Use singular returnDhruv2013-04-271-1/+1
| | * | | | | [ticket/10820] remove unnecessary condition checksDhruv2013-04-271-2/+2