Merge branch 'master' into sismics_prod

This commit is contained in:
Benjamin Gamard 2017-03-21 09:14:19 +01:00
commit 7c24778460
4 changed files with 6 additions and 5 deletions

View File

@ -1,7 +1,8 @@
FROM sismics/jetty:9.2.20-jdk7 FROM sismics/jetty:9.2.20-jdk7
MAINTAINER benjamin.gam@gmail.com MAINTAINER benjamin.gam@gmail.com
RUN apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn RUN apt-get update && apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn && \
apt-get clean && rm -rf /var/lib/apt/lists/*
ENV TESSDATA_PREFIX /usr/share/tesseract-ocr ENV TESSDATA_PREFIX /usr/share/tesseract-ocr
ENV LC_NUMERIC C ENV LC_NUMERIC C

View File

@ -3,7 +3,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.android.tools.build:gradle:2.2.3'
} }
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'

View File

@ -1,6 +1,6 @@
#Sat Jan 16 19:15:13 CET 2016 #Fri Dec 23 21:14:18 CET 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

View File

@ -46,7 +46,7 @@
<a ng-click="openFile(file)"> <a ng-click="openFile(file)">
<img class="thumbnail-file" ng-src="../api/file/{{ file.id }}/data?size=thumb" tooltip="{{ file.mimetype }} | {{ file.size | filesize }}" tooltip-placement="top" /> <img class="thumbnail-file" ng-src="../api/file/{{ file.id }}/data?size=thumb" tooltip="{{ file.mimetype }} | {{ file.size | filesize }}" tooltip-placement="top" />
</a> </a>
<div class="caption btn btn-link file-name" ng-click="openFile(file)">{{ file.name }}</div> <div class="caption btn btn-link file-name" ng-click="openFile(file)" ng-if="file.name">{{ file.name }}</div>
<div class="caption" ng-show="document.writable"> <div class="caption" ng-show="document.writable">
<div class="pull-left"> <div class="pull-left">
<div class="btn btn-default handle"><span class="glyphicon glyphicon-resize-horizontal"></span></div> <div class="btn btn-default handle"><span class="glyphicon glyphicon-resize-horizontal"></span></div>