[Devel] [GIT] OpenBioMaps GIT repository, branch master updated: sablon updated

[git at vocs.unideb.hu]

    The project "OpenBioMaps GIT repository":

    The branch, master has been updated
       via  018dd31387c594ae1ef688b52e25d5dc6831186c (commit)
       via  aa26595121bd88e2884d7e6398a66211e1283726 (commit)
       via  f6458781efd8d97d5fa3473d8d184a3253454f7d (commit)
      from  7ae1e0671de2b6a77f7107d8ec3b2de125d140d7 (commit)


- Log -----------------------------------------------------------------
commit 018dd31387c594ae1ef688b52e25d5dc6831186c
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Jul 9 10:53:23 2019 +0200

sablon updated

commit aa26595121bd88e2884d7e6398a66211e1283726
Merge: 7ae1e06 f645878
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Jul 8 15:37:44 2019 +0200

Merge branch 'master' of gitlab.com:openbiomaps/web-app

commit f6458781efd8d97d5fa3473d8d184a3253454f7d
Author: Gáspár Ákos <gaspar.akos at gmail.com>
Date:   Fri Jul 5 22:09:50 2019 +0000

build and deploy db image from web-app

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml                                     |  42 +++-
 Dockerfile.db                                      |  21 ++
 Dockerfile.db-test                                 |  23 ++
 projects/sablon/css/style.css                      |   5 +-
 projects/sablon/css/uploader.css                   |   8 +-
 projects/sablon/includes/afuncs.php                |  58 ++++-
 projects/sablon/includes/common_pg_funcs.php       |  35 +--
 projects/sablon/includes/data-history-page.php     |  10 +-
 projects/sablon/includes/data-sheet-page.php       | 272 +++++++++++----------
 projects/sablon/includes/interface.php             |  58 ++++-
 .../sablon/includes/modules/results_asStable.php   |  18 +-
 projects/sablon/includes/modules/text_filter.php   |  14 +-
 projects/sablon/includes/prepare_vars.php          |   4 +-
 projects/sablon/includes/profile.php               |   3 +-
 projects/sablon/includes/project_admin.php         |  23 +-
 projects/sablon/includes/results_builder.php       |   4 +
 projects/sablon/includes/upload_funcs.php          |  15 +-
 .../sablon/includes/upload_show-table-form.php     |  13 +-
 projects/sablon/index.php                          |   6 +-
 projects/sablon/js/admin.js                        |  33 +--
 projects/sablon/js/functions.js                    |   1 -
 projects/sablon/js/uploader.js                     |  34 ++-
 projects/sablon/pds/pds_class.php                  |  12 +-
 projects/sablon/public/proxy.php                   |  18 +-
 24 files changed, 492 insertions(+), 238 deletions(-)
 create mode 100644 Dockerfile.db
 create mode 100644 Dockerfile.db-test

-- 
OpenBioMaps GIT repository