Merge pull request #786 from CounterpartyXCP/develop

1.8.0 append

.travis.yml

@@ -22,8 +22,10 @@ before_install:
 - sudo apt-get install jq
 - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST
 - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi)
+# Print some things for debugging purposes...
 - echo $PR
 - echo $BRANCH
+- echo `git rev-parse HEAD`
 # determine the docker image tag name ("nopush" being a placeholder to signify the image will not be pushed to dockerhub)
 - export DOCKER_TAG="nopush"
 - |
@@ -32,8 +34,10 @@ before_install:
     if [ "$BRANCH" == "develop" ]; then export DOCKER_TAG="develop"; fi
   fi
 - echo $DOCKER_TAG
+
+install:
 # build docker image
-- docker build -t counterparty/counterwallet:$DOCKER_TAG .
+- docker build -t counterparty/counterwallet:$DOCKER_TAG --no-cache --build-arg TRANSIFEX_USER="$TRANSIFEX_USER" --build-arg TRANSIFEX_PASSWORD="$TRANSIFEX_PASSWORD" .
 
 script:
 # run the test suite in the docker container we just made

Dockerfile

@@ -74,15 +74,18 @@ RUN if [ -n "$TRANSIFEX_USER" ] && [ -n "$TRANSIFEX_PASSWORD" ]; then echo "$TRA
 
 # Install project
 COPY . /counterwallet
+RUN rm -rf /counterwallet/build
 WORKDIR /counterwallet
+RUN git rev-parse HEAD
 RUN npm -g install npm@latest
 RUN npm config set strict-ssl false
 ENV PHANTOMJS_CDNURL="http://cnpmjs.org/downloads"
 RUN npm install -g bower grunt mocha-phantomjs
 RUN cd src; bower --allow-root --config.interactive=false update; cd ..
 RUN npm update
-RUN grunt build --dontcheckdeps
+RUN grunt build
 RUN cp -a /counterwallet/counterwallet.conf.json.example /counterwallet/counterwallet.conf.json
+RUN rm -f /root/.transifex
 
 EXPOSE 80 443
 

docker/start.sh

@@ -18,7 +18,7 @@ fi
 
 # Specify defaults (defaults are overridden if defined in the environment)
 export REDIS_HOST=${REDIS_HOST:="redis"}
-export REDIS_PORT=${REDIS_PORT:=6739}
+export REDIS_PORT=${REDIS_PORT:=6379}
 export REDIS_DB=${REDIS_DB:=0}
 export COUNTERBLOCK_HOST_MAINNET=${COUNTERBLOCK_HOST_MAINNET:="counterblock"}
 export COUNTERBLOCK_HOST_TESTNET=${COUNTERBLOCK_HOST_TESTNET:="counterblock-testnet"}

src/js/components/history.js

@@ -272,7 +272,7 @@ function TransactionHistoryViewModel() {
     self.transactions([]);
     $('#txnHistory').dataTable().fnClearTable();
     $('#txnHistory_wrapper').hide();
-    failoverAPI("get_raw_transactions", {address: newSelection, limit: 5000}, function(data, endpoint) {
+    failoverAPI("get_raw_transactions", {address: newSelection, limit: 2500}, function(data, endpoint) {
       //clear table data and populate with the new data (which comes in the order of newest to oldest)
       for (var i = 0; i < data.length; i++) {
         self.transactions.push(new TransactionHistoryItemViewModel(data[i]));

src/js/consts.js

@@ -1,7 +1,7 @@
 /***********
  * GLOBAL CONSTANTS
  ***********/
-var VERSION = "1.7.0";
+var VERSION = "1.8.0";
 var PREFERENCES = {}; //set when logging in
 
 //Addresses