Merge branch 'dev' into feature_primaries
Conflicts: resources/static/test/qunit/shared/network_unit_test.js scripts/compress.sh
Showing
- lib/load_gen/user_db.js 1 addition, 1 deletionlib/load_gen/user_db.js
- resources/static/css/common.css 5 additions, 0 deletionsresources/static/css/common.css
- resources/static/css/style.css 9 additions, 4 deletionsresources/static/css/style.css
- resources/static/dialog/views/error.ejs 6 additions, 1 deletionresources/static/dialog/views/error.ejs
- resources/static/include_js/include.js 7 additions, 1 deletionresources/static/include_js/include.js
- resources/static/lib/jquery-1.6.2.min.js 0 additions, 18 deletionsresources/static/lib/jquery-1.6.2.min.js
- resources/static/lib/jquery-1.7.1.min.js 4 additions, 0 deletionsresources/static/lib/jquery-1.7.1.min.js
- resources/static/shared/network.js 1 addition, 0 deletionsresources/static/shared/network.js
- resources/static/test/index.html 1 addition, 1 deletionresources/static/test/index.html
- resources/static/test/qunit/mocks/xhr.js 1 addition, 1 deletionresources/static/test/qunit/mocks/xhr.js
- resources/static/test/qunit/shared/network_unit_test.js 2 additions, 1 deletionresources/static/test/qunit/shared/network_unit_test.js
- resources/views/communication_iframe.ejs 1 addition, 1 deletionresources/views/communication_iframe.ejs
- resources/views/dialog_layout.ejs 1 addition, 1 deletionresources/views/dialog_layout.ejs
- resources/views/layout.ejs 1 addition, 2 deletionsresources/views/layout.ejs
- resources/views/tos.ejs 1 addition, 1 deletionresources/views/tos.ejs
- scripts/compress.sh 3 additions, 3 deletionsscripts/compress.sh
Loading
Please register or sign in to comment