Skip to content

Commit

Permalink
Merge branch 'develop' into feature/unbootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreaSuckro committed Jul 12, 2016
2 parents 896356d + 206656b commit 4e20da2
Show file tree
Hide file tree
Showing 86 changed files with 569 additions and 722 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ modules/ui/results
modules/ui/coverage2
modules/ui/results2
modules/ui/dist
modules/ui/node_modules
node_modules
modules/ui/app/bower_components
modules/ui/app/scripts/config.js
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ after_success:
- "./.travis/deploy.sh"
env:
global:
- secure: MlMVeBappiIk4tck/KCpyEuxbaXRCZyjSRuD3qHj1P70Vj3/mqJjuoqSXmUvp0Hls8RcEBbzwhZAWGLUUAjUr66WxfJD32qInapQaJVHImTenQ4pb2x8iSHfqlQNHuCOIJjUzX+Tz4vCkETprqeVcM0uel0rLqoxtsnWtZLEkcopWpBSe4gp+4Buptu5JAAntZMVoSBkrONfSB/nd0Kp0bdjk8Y0QG7doXubNRUUJtnOv7YXDYaqddLEAqQa4Pizbvf0lTWvgdDw+MR7DBo/AVYdjRcBVQNbxvytb4bxn+oGBTxsrDmWOK6grBf6TByLV3DXITihSvj9wJM1n3L98uw8SKt6mHE3hvtnA2VBUE4dW61YQTmaIUp6z5byj1XTrLmkgsIRj08C+9U87nS40mlSlltnXg5yRgWgs9tZUNQDfTw8n1aYn3S2ltHytpE9i3gtUSL1efR2AgJhCq4j+hEcc1K3UGB6/we+6jczKb3CERMVsSuOb1FBPBvbwznMs1Can2qqC2Cl7LlDPUP6dm02d4j166S/9z4vfR6aE1F44wDE5fmiqe46vMjfTmSpJaWW5pgqnwZRdjNXPwUNFAcVWlkgnLvJ3cXddKjeYXww/NlwSKIkc1+z62Z5tm8XkH//If9TgK55NtiFg5IIUdhrB+9D4SGXc2BdI18Jglk=
- secure: am0lZTtInN0Epq6rQI5bC4+U5Umb/L41394s58gvbhHcGicjS7vrWvmkL+AEJJ9390oKgTRgPBn+S281yJ9KF3KL8/ewGnvOnWtt1xyIUd75tUzk3h7Ho3Wz9RVNYXkc/2Ee61hI6SPBdYQEYXrrQTeBckOuw37F/KVUHdnJnvELW4ji7MKmJkf1LKDeLQcpJG6WZP1esfEk8MqjWx/Z7pplxby2Khla3GNxekTJLOkJZh6wwCZGbETevNHbDNZrRIxjeHSKQXN1ne7NVKK4IT7Ya8xfogQq0wpIJlU6boCuC3ZKTeMs0znBxdH13ERCLQFfITycI7hPHEPNQdhD6peKeXXS6dK39EGq5PjCxluZ+1ts27Y0kX+AkNa3P3Osc+WBQ1npmMh77gCq62gxjMTf5ejd++ElTz8a8NX2K0IyudDibJPUeH7DtiWnjHaAnCLxFzYqnp+ucR8vSe2rzGatxaZFJL5re6Rn5BqTRAdcWm7MO5nyYQKxR6sgtMRgHo6x0qwXYyQ3VW9cF1RsvsokBhKRXiq4/QsPiywOlXzI4lzHim3pNB2Ol06ThVmtfNt6VYI05JEIFRy6aCXdH7yZhqsjNFxmsD2QOKkpDA9YUgsi42XU3CwTs6t5ARAE/HDNrtlVTb8SrPRhjRKNiiGqV8rp7EokwbuD3gm8QNQ=
- secure: rbl2kvPWaF49XJqfNFx6M1P0dQvr1AziSgq5X3XazSqsLuYT0BB3ZMCBQKCKF7gWeG6H+dDl0O2bduFUYOEIBkjL51hdj6SdDA70GMppsKk2kENIDXgmSyewxqJsod83Z8YGJxSh+TjVAFTBazMkvDVnvQt5FOVHn8igWSLgiF5y4ktga2ld8/iqiAnzfCWPGr7xAqI3GawIFoW46DRt+STHd6AcjAjUiFL5x5Xmx3sat/mVP/V18XAGfNTBcA3TsMrmuTS7mHGTMXHw0Pa+Oz6S6pdapDKO+YO6OSDSluO1JOvXemkIiU5ezsBJX5t0v+dllF0N9KLr+l0YeI/8691//YlJYAb9aKUiThr4DiFqhh4qJkKZPfyJh+/2oQjptVaEcyFv/nShQ5gPGnRMX25CqK8zCc/p/tpb7stFM67Qpc2+6tX8E3qtBQ9ypOTGzizmBX4r5qXVwgui+Spvs+Ybp738TIbeH5PwdKoPp6M0txh8lx8fz5tz4WgtuMXUv+ScC+V7ElBO/rdDHKCUJXmsjriV9jBfjk+cC2wTRPRa/77WIp+XxdxdTL7BrE26gP0fYfhPJ44tPvwiSkoVSSGRfv7ZuN51TVZCHht2AyDeNaUW2GtLmqp9fFOv8QljQ3UximZ46YLKvFJhbopHhWGFHsvfyJI0tEYSWfnRNfM=
- secure: hhOb3/MkeLZrqmZBh0SxbBH46/2/EXKw+Upd8QyggaghdrMk3A5vOBm09WObPQNyOPIiAi3UZ2sFpMgdjduPbEwJvANXgSI5pDf/CBS0HhnW7XPAxQsTvpP+DaGcNkGMnPYDXzF87cbTmiL+vJbzjS2ybyyUMDLRSnm9G/2Pby/YAVo3uhp1W2TAaXiAUoPLsAcOU7dFUjCkj68P1s0Fg06NbhonxVsgal0GHGdy0SEYVezbKX0gXvF3OdvSOxgboiiDr6HD23f4w3bUskb9FIDXx1RlXCsyZwCUHSjGRsuaMC+TgNlW3d1fTgEzJpck4Tzwrp2ZB435/ICAl7BDPpjke8kGgVcKD0nPec0/m1AR9fkN+5iXTBKIq7QIxy7oPRp3ZgnN5cM98VsM4dwIVr6HrFBjdkb7ebzzXLslLxp9Sdo9gG9b5DfZl1k+hSRkZ3jXLMK1L9NSOTuVe0ZBc5SY10AU+XPrVokW3E5UphxPbye0qUoEqpbfeMcZkY3OJ6QJBLJAo4jpLmIr9Gcugeztb2k9dsTNB9VIUgg+GsQfgxIjAdsDCY6DFJJFf6+XeOVz5RQbcZwnI4LMmI5iifnwphMC+IDzQphhFTpmEy6waPCVl+H/oB02a7F5oNizBqpDJ/HEdN7Sj/bWW32G9Yw0c89/UkVyNKxxXOK0npM=
- secure: jaJmP3JTpDqvEtTTNlRQ8r+BG89BdJ2C6/fQaiQnzVpqvC3gFC1rXf136qieCV3X9oJH1l/D7oe8gkc/G6K2prQkfvpxBcoi8A0s3zjgPse/WkWPvUCZ/t4rAD4np2Fjhy6Y2VXWf3isoVVKwQ9mI1yohUv3YvYZL/k08YMcsTM5YnGmmRd3AvjwqLKaDncLY4T0pHGiCrc0nCddYd9YVIxozp4xslfxQA0mffBk/UXpVAGY/qc871yCKiyn/tbNC8N/nh6oYX4mUKRRVQR+H3hFORPHmnQYfojAw+EUYoKOCt1gDOg++UdQYyIrWCScPiHVBtks7HILnV5kTC0vR4ADAQ6YeKPZ/Wg7TAtP0H/3rd/ix2rvmYYwewcpLyYPErwuDvV2016kGyhv1RL6S1GpULh4m6MjVd428PQGK3VRt8m1krgL/I9V40HLXhyOz1U1Q7v7bvxEMHgXOXiAQjESG75hRjNWda/+AZ4Bkr6WjR5XQHc2Z9E6XsdJU+UcXV4OYQhXfLKOvHg1QsNi60N+BGyP7rIAlgEaaiZFWehjAowmwu+M8BfqWREvVtKlw8GVPr4kf9uMbzxADx/vEUgiVpS4hR+Iz41HcKQSAdTrjXTFAJxy08oJ45phQvy5gtUW4ytzOjKoYDQzBZge9wXWmh2DFD/R5QLwIxUqYKk=
- secure: Xun2mazBkzy+mIX4+0gPKXqbVtsS9n9c8eriAULDHAEPZbMcebMaB0gbHrCAOKuNgCUzPj3xOEc+wJAXXtCXJUx3/7fbM10iLplAxYT64BtfBZS346RLKHRFXyK8iVHJclVUzLZaSs/+nFUmkNzgZlEM4wyZk+CfA3gmw5MZfT7Pe/sUAmlhq1p3dGXqtGKQINlIrHeajklXvsgQ9xV/RbeenbU/Egu2NgEbPt/2Vrw1lAa2O/xeVh5q2lcGXe69Ogv+xB/wfAWasptvhzGDdMjOqw1XUMNP5X2RlLJzTL2HRdZxpmlQKYA84HlqzHC1tYPb2YGHRmDDnaAGuTseXWGgAmAbFAuPQUJkIP13QUieJnXopKbGPBrAbEs/pOw0rOZL4F+2Uj3mvdtncUUqVaPoCARl1zRynn1vGf0UgCsW6eFfxMl7PoUkkSOxPJ42URR7gedqAyMEBcY/Pv2yebp1jat/9Yjc13WiC5nyrBkJy2cik0fAcYEZ8mgRU/eXzUJP/nG4DiwI3Dhj5iedO2xVdhBqaclfftc5Sg/ePsWhYjgJL+Qp3ZLIVHg8b6JqHEl7bpeQUP85/seSdCKgv1zBjfJE3W4dZFlVrr0upKuHSaDIDO25m6O2HA3ymHRlfOtHOAE2XzSN822+GxQyDQ6AhnthUPQgEuFHV7ACiX0=
- secure: ZM9ZSP/knVQ4EvigIDJI0ZqjtORo5oY3l6aP650kZT6dAglyIgRLYTA+4DQgaJgHXKNo428KY2tCngUeHgBtgf0s6snSdulFDsHz9L/PlD6VJZMFTg1uYz+ZkHgQVnw9ecyaJJzCmCcqaXRTNtH5I4PA+AkdEgv27d4UGo9nzYjjrSKBdpiFbXTrYmiuiXSci5fjnusQvxlctdukoxRuKWJ2H1EPyK+Ry5lcpNrqKQLgduQwFvDRjP4k53okCp+piqN9cXGi0r7DNw1TdFeIlNtmohcC/eWlPe1ZqdGfiisFWxRwfb39QLJgJ5nlIR5K9g7U3+B569BzZ+rouqgU3a2+i4vmLr0UABjFFnz0Rhxx0H2T3jx+4xwawAE63TCom6RkFS0L2s8U1KmaKkFS3YMD7zBI71rSdHlo5OhXjUsELroxMV+golZ+U9vSk2Ktz5U5htTWdbxDZjuL3Usuc2gRcT3/XdoVxck2b2k6LC54CUNlTbuTMX2PJWoRY8VxiofWFqwbtbELiXeScS4LkCb7bxKtsIP7Ob9BDS8EcymZUKIzrA85+iImT4JS5CKbzF9kvQyCtUr/Y+M0ImSr7BFZfdfe4K+yIPkx5Mazn+3LQEiU3wfd7xNZHIncdMHKJp5XMQc7E6K//FyAj7Qzk1WmKtuKeQAASOuxn4/EkkI=
- secure: bqyOWPLfNPMik5q9nErt6BxtxReM04BCXHy7pRSF45idvJ7XGblV5vP4e1J970flfzXHQhSQj5G9w3hWRJFGZMFCli0nlaaP2UyCI6JpXYmD769MyD0X/OIFjx2dlHiIXrtXtOUmFGb1ExFW/iy9Ye+obj0bcK3rrAHXyDJi200hAF5cStB00Xe8+snU/W4uFoE8Z3WBaPcnJPN0wYA+2hCtsXIabvaCJjO3Y6rleCWclLun7mgBjgkDQkzQ+i2Oo+8CeXicP7clvORy+tuPE6HFnKPQzXtClUOyi2iup5Z0Xs4qgeXmuNduUDfx2PFvyY8o+b0hTIfPoINmpllBDqHA4n1dGgqH1sLuDRiXi12Z5271sBKqGuV+S2pdXLMGybY58XR0RKlfIQMw4jTjzlETGCJupTIhmymzNYOms5zfxmpWaDy5X9epFF2rOhYpxbCgdMDf8nSFJt0J5ZoXpXtiRlcKfuUgj0vE5zAHNLaJSYZaFm0yZU0LXyJ/BFNP75pDALcJLyyxxV+8S2WKIhfaJqaVrgCMLSHZjzrrYjWJIyRBSB+776lMMbNSsxws3EOv78rh9P/rtHrtP1HDl4pEbCXB5RBV3mVh5pkDDEYF9KaZRcaJyFDAmssJLd+/WxYuMZ3x1S9xtNnDAvTdNwgiNsuP95aWsyh/MX4XAeQ=
2 changes: 1 addition & 1 deletion .travis/before-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if [ "$TRAVIS_BRANCH" == 'develop' ] || [ "$TRAVIS_BRANCH" == 'master' ]; then
if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
openssl aes-256-cbc -K $encrypted_a6540285227b_key -iv $encrypted_a6540285227b_iv \
openssl aes-256-cbc -K $encrypted_68ab9ec6aea9_key -iv $encrypted_68ab9ec6aea9_iv \
-in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d
gpg --fast-import .travis/codesigning.asc
fi
Expand Down
154 changes: 0 additions & 154 deletions .travis/codesigning.asc

This file was deleted.

Binary file modified .travis/codesigning.asc.enc
Binary file not shown.
24 changes: 12 additions & 12 deletions ATTRIBUTIONS/wasabi-analytics-attribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -585,11 +585,11 @@
</downloadUrls>
</dependency>
<dependency>
<name>autumn.client</name>
<groupId>com.intuit.data.autumn</groupId>
<artifactId>autumn.client</artifactId>
<version>1.0.20160515205816</version>
<projectUrl>https://github.com/intuit/Autumn/autumn.client</projectUrl>
<name>autumn-client</name>
<groupId>com.intuit.autumn</groupId>
<artifactId>autumn-client</artifactId>
<version>1.0.20160626031951</version>
<projectUrl>https://github.com/intuit/Autumn/autumn-client</projectUrl>
<type>jar</type>
<licenses>
<license>
Expand All @@ -598,15 +598,15 @@
</license>
</licenses>
<downloadUrls>
<string>https://repo.maven.apache.org/maven2/com/intuit/data/autumn/autumn.client/1.0.20160515205816/autumn.client-1.0.20160515205816.jar</string>
<string>https://repo.maven.apache.org/maven2/com/intuit/autumn/autumn-client/1.0.20160626031951/autumn-client-1.0.20160626031951.jar</string>
</downloadUrls>
</dependency>
<dependency>
<name>autumn.utils</name>
<groupId>com.intuit.data.autumn</groupId>
<artifactId>autumn.utils</artifactId>
<version>1.0.20160515205816</version>
<projectUrl>https://github.com/intuit/Autumn/autumn.utils</projectUrl>
<name>autumn-utils</name>
<groupId>com.intuit.autumn</groupId>
<artifactId>autumn-utils</artifactId>
<version>1.0.20160626031951</version>
<projectUrl>https://github.com/intuit/Autumn/autumn-utils</projectUrl>
<type>jar</type>
<licenses>
<license>
Expand All @@ -615,7 +615,7 @@
</license>
</licenses>
<downloadUrls>
<string>https://repo.maven.apache.org/maven2/com/intuit/data/autumn/autumn.utils/1.0.20160515205816/autumn.utils-1.0.20160515205816.jar</string>
<string>https://repo.maven.apache.org/maven2/com/intuit/autumn/autumn-utils/1.0.20160626031951/autumn-utils-1.0.20160626031951.jar</string>
</downloadUrls>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit 4e20da2

Please sign in to comment.