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

[git at vocs.unideb.hu]

    The project "OpenBioMaps GIT repository":

    The branch, master has been updated
       via  7c92dbc155ef9206826494d0c4efbb1b586ca091 (commit)
       via  33ed48e63290b4a4b41263da70e4314942361c84 (commit)
      from  1710eadfa318f1c42d51f8e1741154bee04cf43c (commit)


- Log -----------------------------------------------------------------
commit 7c92dbc155ef9206826494d0c4efbb1b586ca091
Merge: 33ed48e 1710ead
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Fri Feb 22 22:27:59 2019 +0200

Merge branch 'master' of vocs.unideb.hu:/home/git/openbiomaps

commit 33ed48e63290b4a4b41263da70e4314942361c84
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Fri Feb 22 22:24:20 2019 +0200

manually merging new boxfilter branch

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

Summary of changes:
 resources/libs/afuncs.php                          |   2 +
 resources/libs/common_pg_funcs.php                 | 127 ++++
 resources/libs/default_modules.php                 |  46 +-
 resources/libs/map-page.php                        |  12 +
 resources/libs/modules.js.php                      |   2 +-
 resources/libs/modules/box_filter                  | 310 ++++++++
 resources/libs/modules/box_filter.php              |   1 +
 resources/libs/modules/custom_admin_pages.php      |  15 -
 resources/libs/modules/text_filter2.js             | 310 ++++++++
 .../modules/{box_filter.php => text_filter2.php}   | 776 ++++++++++++++-------
 resources/libs/project_admin.php                   |  18 +-
 resources/libs/query_builder.php                   |   2 +-
 12 files changed, 1329 insertions(+), 292 deletions(-)
 create mode 100644 resources/libs/modules/box_filter
 create mode 100644 resources/libs/modules/text_filter2.js
 copy resources/libs/modules/{box_filter.php => text_filter2.php} (59%)

-- 
OpenBioMaps GIT repository