aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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 remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
| |\ \ \ \
| | * | | | [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| | * | | | [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| | * | | | [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| | * | | | [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| | * | | | [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| | * | | | [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| | * | | | [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| | * | | | [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| | * | | | [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| | * | | | [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| | * | | | [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| | * | | | [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| | * | | | [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| | * | | | [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| | * | | | [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104