Commit ID fd55c8664a046258c12e8a207d44340010155627
|
Contributor: | Shibu Lijack | Files Modified: | 133 |
| Date: | 10-April-2012 at 16:16 | Lines Added: | 6333 | |
| Repository: | git://github.com/phpbb/phpbb3.git develop | Lines Removed: | 7671 | |
| Commit Comment: | Merge remote-tracking branch 'upstream/develop' into ticket/10734 Conflicts: phpBB/styles/prosilver/theme/tweaks.css |
|||
| Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|
| PHP | 3599 | 4512 | 1756 | 1523 | 641 | 913 | |
| HTML | 136 | 262 | 39 | 37 | 2 | 39 | |
| CSS | 33 | 6 | 3 | 2 | 6 | 1 | |
| SQL | 31 | 228 | 0 | 28 | 0 | 52 | |
| shell script | 17 | 4 | 40 | 1 | 1 | 0 | |
| XML | 16 | 8 | 0 | 0 | 0 | 0 | |
| JavaScript | 7 | 42 | 4 | 3 | 2 | 10 | |
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed |
|---|---|---|---|---|---|---|---|
| git-tools/hooks/pre-commit | shell script | 17 | 4 | 40 | 1 | 1 | 0 |
| phpBB/adm/index.php | PHP | 2 | 2 | 1 | 1 | 0 | 0 |
| HTML | 0 | 0 | 0 | 0 | 0 | 0 | |
| phpBB/adm/style/acp_styles.html | HTML | 65 | 205 | 33 | 34 | 0 | 38 |
| JavaScript | 0 | 40 | 0 | 3 | 0 | 10 | |
| phpBB/adm/style/admin.css | CSS | 13 | 0 | 2 | 0 | 2 | 0 |
| phpBB/adm/style/overall_footer.html | HTML | 2 | 2 | 1 | 0 | 0 | 0 |
| phpBB/adm/style/simple_footer.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 |
| phpBB/common.php | PHP | 6 | 7 | 1 | 0 | 0 | 0 |
| HTML | 0 | 0 | 0 | 0 | 0 | 0 | |
| phpBB/develop/create_schema_files.php | PHP | 4 | 31 | 0 | 0 | 0 | 2 |
| HTML | 0 | 0 | 0 | 0 | 0 | 0 | |
| phpBB/develop/mysql_upgrader.php | PHP | 4 | 48 | 0 | 0 | 0 | 3 |
| HTML | 0 | 0 | 0 | 0 | 0 | 0 | |
| phpBB/docs/auth_api.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 |
Copyright
©
2013
Black Duck Software, Inc.
and its contributors, Some Rights Reserved. Unless otherwise marked, this work is licensed under a
Creative Commons Attribution 3.0 Unported License
. Ohloh
®
and the Ohloh logo are trademarks of
Black Duck Software, Inc.
in the United States and/or other jurisdictions. All other trademarks are the property of their respective holders.