Commit ID 0ac510e9b9bde67ff06b3ca9fb2f24823e4f2033
|
|
Contributor: | Ruben S. Montero | Files Modified: | 26 |
| Date: | 15-March-2012 at 11:34 | Lines Added: | 1023 | |
| Repository: | git://git.opennebula.org/one.git master | Lines Removed: | 214 | |
| Commit Comment: | Merge remote-tracking branch 'hector/feature-1112' into feature-1112 Conflicts: src/sunstone/public/js/plugins/dashboard-tab.js src/sunstone/public/js/plugins/dashboard-users-tab.js src/sunstone/public/js/sunstone-util.js |
|||
| Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|
| JavaScript | 663 | 182 | 37 | 3 | 59 | 10 | |
| CSS | 222 | 19 | 6 | 0 | 34 | 0 | |
| shell script | 2 | 0 | 0 | 0 | 0 | 0 | |
| File | Language | Code Added | Code Removed | Comments Added | Comment Removed | Blanks Added | Blanks Removed | |
|---|---|---|---|---|---|---|---|---|
| install.sh | shell script | 2 | 0 | 0 | 0 | 0 | 0 | |
| src/cloud/occi/lib/ui/public/css/layout.css | CSS | 70 | 6 | 2 | 0 | 9 | 0 | |
| src/cloud/occi/lib/ui/public/js/layout.js | JavaScript | 65 | 24 | 4 | 0 | 1 | 0 | |
| src/ozones/Server/public/css/layout.css | CSS | 61 | 3 | 2 | 0 | 7 | 0 | |
| src/sunstone/etc/sunstone-plugins.yaml | No source code was detected in this file. | |||||||
| src/sunstone/public/css/application.css | CSS | 17 | 3 | 0 | 0 | 6 | 0 | |
| src/sunstone/public/css/layout.css | CSS | 74 | 7 | 2 | 0 | 12 | 0 | |
| src/sunstone/public/js/layout.js | JavaScript | 62 | 21 | 0 | 0 | 0 | 1 | |
| src/sunstone/public/js/plugins/acls-tab.js | JavaScript | 4 | 1 | 0 | 0 | 0 | 0 | |
| ...nstone/public/js/plugins/clusters-tab.js | JavaScript | 193 | 2 | 2 | 0 | 34 | 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.