[Devel] [GIT] OpenBioMaps GIT repository, branch master_3.0 updated: rebase failed, restored

[git at vocs.unideb.hu]

    The project "OpenBioMaps GIT repository":

    The branch, master_3.0 has been updated
       via  5f8f29983e4d1c659af89db5ef752fbf3f6967ce (commit)
       via  d4582920c375046c25e7ab2e2338faf1be356e1e (commit)
       via  ec52df09301738640702325709a7b09158d4382e (commit)
       via  e24d90a76ecf1ef88cdd239eb1423c80d1cf796b (commit)
       via  d2664d723dfca978b64c3cd88a9fd467d00d07cc (commit)
       via  300afdb17ad332a994b83cff2efaca652abacde9 (commit)
       via  8f645e90fd5cdafc0de61953281e46ca54899bff (commit)
       via  157c77ebd0eb1324260abd68510298024d3fb1e8 (commit)
       via  7a1f360df2ab5e813e0a694cda22b78cb7df3d65 (commit)
       via  6641a014895ac058212d9c7019a628b71817f598 (commit)
       via  94b02d4062569bbeb101f95a285c4193ad422c63 (commit)
       via  a520dca29a6cad9d6aaa93aeb6628120066dae74 (commit)
       via  798bffaf87e22e97c6cfb99e7c359542f892ba6f (commit)
       via  4c5223c94555cd80d952236455f7c98f976adfb4 (commit)
       via  fc856d62dbd07f26ac9e8aaf59fb79887bdb1c15 (commit)
       via  5a0ca8e949e2543b1851a2ffc9fcd2ab48ab213c (commit)
       via  a6df8a3c1e036133673c4ec722628229de8eb2de (commit)
      from  11fa55050f1a09037e76c7e92993b26174fe2594 (commit)


- Log -----------------------------------------------------------------
commit 5f8f29983e4d1c659af89db5ef752fbf3f6967ce
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 16:08:58 2018 +0100

rebase failed, restored

commit d4582920c375046c25e7ab2e2338faf1be356e1e
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 16:00:40 2018 +0100

rebase failed

commit ec52df09301738640702325709a7b09158d4382e
Merge: e24d90a7 11fa5505
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 14:24:21 2018 +0100

Merge branch 'master_3.0' of vocsi:/home/git/openbiomaps into master_3.0

commit e24d90a76ecf1ef88cdd239eb1423c80d1cf796b
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 13:47:37 2018 +0100

allowed columns updated

new function: general restrictions
new parameter settings:
e.g.
for_sensitive_data:faj,obm_geometry,obm_id
for_no-geom_data:faj,obm_geometry,obm_id,egyedszam
for_general:faj

This new parameter style is not backward compatible!!!

commit d2664d723dfca978b64c3cd88a9fd467d00d07cc
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 08:47:34 2018 +0100

some cleaning

commit 300afdb17ad332a994b83cff2efaca652abacde9
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 4 12:09:50 2018 +0100

localhost for OAUTHURL

commit 8f645e90fd5cdafc0de61953281e46ca54899bff
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 4 12:08:11 2018 +0100

optinal OAUTHURL constant added

commit 157c77ebd0eb1324260abd68510298024d3fb1e8
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 4 10:58:18 2018 +0100

OB_LIB_DIR in .htaccess updated

commit 7a1f360df2ab5e813e0a694cda22b78cb7df3d65
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 4 10:36:31 2018 +0100

template project "sablon" updated

commit 6641a014895ac058212d9c7019a628b71817f598
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 4 09:58:13 2018 +0100

separating projects

commit 94b02d4062569bbeb101f95a285c4193ad422c63
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Nov 29 15:42:33 2018 +0100

postgres roles eliminated

commit a520dca29a6cad9d6aaa93aeb6628120066dae74
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Nov 29 14:21:39 2018 +0100

modules to project dirs

commit 798bffaf87e22e97c6cfb99e7c359542f892ba6f
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Nov 29 11:34:02 2018 +0100

server_vars to gitignore

commit 4c5223c94555cd80d952236455f7c98f976adfb4
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Nov 29 11:28:57 2018 +0100

first steps...

commit fc856d62dbd07f26ac9e8aaf59fb79887bdb1c15
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Nov 22 15:58:02 2018 +0100

preparing layered app

commit 5a0ca8e949e2543b1851a2ffc9fcd2ab48ab213c
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 09:38:05 2018 +0100

syntax error fixed

commit a6df8a3c1e036133673c4ec722628229de8eb2de
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Thu Dec 6 09:15:25 2018 +0100

in all mail sending function sender's mail address changed

according to some reports about spam processing of obm mails, I've changed
the sender address in all mail sender functions to use the server's
domain instead of the founder's official mail address.

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

Summary of changes:
 templates/initial/includes/afuncs.php              | 21 +++++++
 templates/initial/includes/common_pg_funcs.php     | 34 ++++++++++
 templates/initial/includes/default_modules.php     |  9 +++
 templates/initial/includes/interface.php           | 32 +++++++++-
 templates/initial/includes/results_builder.php     | 20 +++++-
 templates/initial/modules/allowed_columns.php      | 72 ++++++++++------------
 templates/initial/modules/results_asList.php       | 17 ++++-
 templates/initial/modules/results_asStable.php     | 19 ++++--
 templates/sablon/includes/interface.php            | 32 +++++++++-
 .../includes/mainpage_content1.php~HEAD}           |  0
 ...ntent1.php~template project \"sablon\" updated" |  0
 .../includes/mainpage_content2.php~HEAD}           |  0
 ...ntent2.php~template project \"sablon\" updated" |  0
 .../includes/mainpage_footer.php~HEAD}             |  0
 ...footer.php~template project \"sablon\" updated" |  0
 templates/sablon/includes/results_builder.php      | 20 +++++-
 templates/sablon/modules/allowed_columns.php       | 72 ++++++++++------------
 templates/sablon/modules/results_asList.php        | 17 ++++-
 templates/sablon/modules/results_asStable.php      | 19 ++++--
 19 files changed, 284 insertions(+), 100 deletions(-)
 copy templates/{initial/includes/mainpage_content1.php => sablon/includes/mainpage_content1.php~HEAD} (100%)
 copy templates/initial/includes/mainpage_content1.php => "templates/sablon/includes/mainpage_content1.php~template project \"sablon\" updated" (100%)
 copy templates/{initial/includes/mainpage_content2.php => sablon/includes/mainpage_content2.php~HEAD} (100%)
 copy templates/initial/includes/mainpage_content2.php => "templates/sablon/includes/mainpage_content2.php~template project \"sablon\" updated" (100%)
 copy templates/{initial/includes/mainpage_footer.php => sablon/includes/mainpage_footer.php~HEAD} (100%)
 copy templates/initial/includes/mainpage_footer.php => "templates/sablon/includes/mainpage_footer.php~template project \"sablon\" updated" (100%)

-- 
OpenBioMaps GIT repository