Commit ID 398a6c8045113f14900bdea8c70ba032f75b45f6
|
Contributor: | Vjacheslav Trushkin | Files Modified: | 81 |
| Date: | 31-March-2012 at 07:43 | Lines Added: | 1664 | |
| Repository: | git://github.com/phpbb/phpbb3.git develop | Lines Removed: | 606 | |
| Commit Comment: | Merge branch 'develop' into feature/merging-style-components * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php |
|||
| Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|
| JavaScript | 455 | 16 | 115 | 2 | 110 | 2 | |
| PHP | 424 | 64 | 141 | 3 | 75 | 5 | |
| CSS | 189 | 358 | 12 | 26 | 10 | 45 | |
| HTML | 110 | 83 | 14 | 1 | 9 | 1 | |
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|---|
| .gitignore | No source code was detected in this file. | |||||||
| phpBB/adm/images/alert_close.png | No source code was detected in this file. | |||||||
| phpBB/adm/style/acp_attachments.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 | |
| JavaScript | 0 | 0 | 0 | 0 | 0 | 0 | ||
| phpBB/adm/style/acp_bbcodes.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 | |
| phpBB/adm/style/acp_bots.html | HTML | 2 | 2 | 0 | 0 | 0 | 0 | |
| phpBB/adm/style/acp_forums.html | HTML | 15 | 9 | 0 | 0 | 2 | 0 | |
| JavaScript | 0 | 0 | 0 | 0 | 0 | 0 | ||
| phpBB/adm/style/acp_groups.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 | |
| phpBB/adm/style/acp_icons.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 | |
| JavaScript | 0 | 0 | 0 | 0 | 0 | 0 | ||
| phpBB/adm/style/acp_main.html | HTML | 7 | 7 | 0 | 0 | 1 | 0 | |
| phpBB/adm/style/acp_modules.html | HTML | 1 | 1 | 0 | 0 | 0 | 0 | |
| JavaScript | 0 | 0 | 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.