/[Apache-SVN]
ViewVC logotype

Revision 1329241


Jump to revision: Previous Next
Author: mfranklin
Date: Mon Apr 23 13:51:02 2012 UTC (11 years, 11 months ago)
Changed paths: 47
Log Message:
Merged bootstrap branch into trunk

Changed paths

Path Details
Directoryrave/trunk/ modified , props changed
Directoryrave/trunk/.gitignore
(Copied from rave/branches/bootstrap/.gitignore, r1329195)
added
Directoryrave/trunk/README.txt modified , text changed
Directoryrave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/resources/messages.properties modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag, r1329195)
added
Directoryrave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap, r1329195)
added
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/css/
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.css
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.css, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.min.css
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.min.css, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/img/
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings-white.png
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings-white.png, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings.png
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings.png, r1329195)
replaced
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/default.css modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/css/rave.css
(Copied from rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css, r1329195)
added
Directoryrave/trunk/rave-portal-resources/src/main/webapp/script/rave.js modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/script/rave_person_profile.js modified , text changed
Directoryrave/trunk/rave-portal-resources/src/main/webapp/script/rave_store.js modified , text changed
Directoryrave/trunk/rave-portal-resources/src/test/javascript/raveSpec.js modified , text changed
Directoryrave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26