Merge remote-tracking branch 'origin/master' into use-proper-API

nextcloud · Oct 20, 2019 · a1533ea · a1533ea
2 parents 344996f + 5948308
commit a1533ea
Show file tree

Hide file tree

Showing 188 changed files with 8,352 additions and 3,046 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 php:
-    - 5.6
-    - 7
+    - 7.1
+    - 7.2
 env:
     global:
         - CORE_BRANCH=master
@@ -15,13 +15,15 @@ env:
 branches:
   only:
     - master
+    - fix_layout_for_14
 
 
+services:
+  # enable a display for running JavaScript tests
+  - xvfb
+
 before_install:
-    # enable a display for running JavaScript tests
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-#    <- if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
+    - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi
     # - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - sh -c "if [ '$CLOUD' = 'nextcloud' ]; then wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh; fi;"
     - sh -c "if [ '$CLOUD' = 'owncloud' ]; then wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh; fi;"
@@ -83,17 +85,13 @@ addons:
 
 matrix:
   include:
-    - php: 5.6
-      env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 5.6
-      env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 5.6
+    - php: 7.1
+      env: DB=mysql;
+    - php: 7.1
       env: DB=mysql;JSTESTS=1;
-    - php: 7.0
+    - php: 7.2
       env: DB=mysql;
-    - php: 7.0
-      env: DB=sqlite;CLOUD=owncloud;SERVER_FOLDER=core
-    - php: 7.0
-      env: DB=mysql;CLOUD=owncloud;SERVER_FOLDER=core
+    - php: 7.2
+      env: DB=mysql;JSTESTS=1;
   allow_failures:
     - env: DB=sqlite;CODECHECK=2
diff --git a/l10n/.tx/config → .tx/config b/l10n/.tx/config → .tx/config
@@ -3,7 +3,7 @@ host = https://www.transifex.com
 lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
 
 [nextcloud.passman]
-file_filter = <lang>/passman.po
-source_file = templates/passman.pot
+file_filter = translationfiles/<lang>/passman.po
+source_file = translationfiles/templates/passman.pot
 source_lang = en
 type = PO
diff --git a/Dockerfile b/Dockerfile
@@ -17,27 +17,29 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
         /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password password PASS'" && \
         /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password_again password PASS'" && \
+        /bin/bash -c "debconf-set-selections <<< 'tzdata    tzdata/Zones/Europe select  Madrid'" && \
+    	/bin/bash -c "echo \"Europe/Zurich\" > /etc/timezone " && \
+    	/bin/bash -c "ln -fs /usr/share/zoneinfo/`cat /etc/timezone` /etc/localtime" && \
         apt-get -y update && apt-get install -y \
         apache2 \
         cowsay \
         cowsay-off \
         git \
         curl \
-        libapache2-mod-php7.0 \
+        libapache2-mod-php7.2 \
         mariadb-server \
-        php7.0 \
-        php7.0-mysql \
-        php-curl \
+        php7.2 \
+        php7.2-mysql \
+        php7.2-curl \
         php-dompdf \
-        php-gd \
-        php-mbstring \
-        php-xml \
-        php-xml-serializer \
-        php-zip \
+        php7.2-gd \
+        php7.2-mbstring \
+        php7.2-xml \
+        php7.2-zip \
         wget
 
 RUN a2enmod ssl
@@ -57,38 +59,37 @@ COPY ./LICENSE /var/www/passman/
 ADD https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh /var/www/passman
 
 RUN service mysql restart && \
-                mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \
-                sed  -i '0,/.*SSLCertificateChainFile.*/s/.*SSLCertificateChainFile.*/SSLCertificateChainFile \/etc\/ssl\/private\/fullchain.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
-                sed -i '0,/.*ssl-cert-snakeoil.pem.*/s/.*ssl-cert-snakeoil.pem.*/SSLCertificateFile \/etc\/ssl\/private\/cert.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
-                sed -i '0,/.*SSLCertificateKeyFile.*/s/.*SSLCertificateKeyFile.*/SSLCertificateKeyFile \/etc\/ssl\/private\/privkey.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
-                echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \
-                cd /var/www/passman && \
-                chmod +x before_install.sh && \
-                sleep 1 && \
-                /bin/bash -c "./before_install.sh passman master mysql; exit 0" && \
-		rm /var/www/server/apps/passman/before_install.sh && \
-                mv /var/www/server/* /var/www/html/ && \
-                cd /var/www/html/ && \
-                chmod +x occ && \
-                service mysql restart && \
-                ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database mysql --database-pass 'owncloud' && \
-                ./occ check && \
-                ./occ status && \
-                ./occ app:list && \
-                ./occ app:enable passman && \
-                ./occ upgrade && \
-                ./occ config:system:set defaultapp --value=passman && \
-                ./occ config:system:set appstoreenabled --value=false && \
-                ./occ config:system:set trusted_domains 2 --value=172.17.0.2 && \
-                ./occ config:system:set trusted_domains 3 --value=passman.cc && \
-                ./occ config:system:set trusted_domains 4 --value=demo.passman.cc && \
+    mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \
+    sed  -i '0,/.*SSLCertificateChainFile.*/s/.*SSLCertificateChainFile.*/SSLCertificateChainFile \/etc\/ssl\/private\/fullchain.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
+    sed -i '0,/.*ssl-cert-snakeoil.pem.*/s/.*ssl-cert-snakeoil.pem.*/SSLCertificateFile \/etc\/ssl\/private\/cert.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
+    sed -i '0,/.*SSLCertificateKeyFile.*/s/.*SSLCertificateKeyFile.*/SSLCertificateKeyFile \/etc\/ssl\/private\/privkey.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
+    echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \
+    cd /var/www/passman && \
+    chmod +x before_install.sh && \
+    sleep 1 && \
+    /bin/bash -c "./before_install.sh passman master mysql; exit 0" && \
+    rm /var/www/server/apps/passman/before_install.sh && \
+    mv /var/www/server/* /var/www/html/ && \
+    cd /var/www/html/ && \
+    chmod +x occ && \
+    service mysql restart && \
+    ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database mysql --database-pass 'owncloud' && \
+    ./occ check && \
+    ./occ status && \
+    ./occ app:list && \
+    ./occ app:enable passman && \
+    ./occ upgrade && \
+    ./occ config:system:set defaultapp --value=passman && \
+    ./occ config:system:set appstoreenabled --value=false && \
+    ./occ config:system:set trusted_domains 2 --value=172.17.0.2 && \
+    ./occ config:system:set trusted_domains 3 --value=passman.cc && \
+    ./occ config:system:set trusted_domains 4 --value=demo.passman.cc && \
                 chown -R www-data /var/www
 EXPOSE 80
 EXPOSE 443
 ENTRYPOINT              service mysql start && \
-                                                service apache2 start && \
-                                                bash -c "trap 'echo stopping services...; service apache2 stop && service mysql stop && exit 0' SIGTERM SIGKILL; \
-                                                tail -f /var/www/html/data/nextcloud.log"
+                        service apache2 start && \
+                        bash -c "trap 'echo stopping services...; service apache2 stop && service mysql stop && exit 0' SIGTERM SIGKILL; \
+                                tail -f /var/www/html/data/nextcloud.log"
 
 #/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \
-