[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  ea9202996aa714074b4a64bed7558fc6c1b617b6 (commit)
       via  1e66f157c031560940d917a6537e19389a6ca5ec (commit)
       via  cf1a39579aeefb8d8ff92c767824319f0028af6f (commit)
       via  307457f03274e54d7631f3104ac3a44d7e848b1d (commit)
       via  cf077021e8f0cfd08c117193ab2ded2b097f0dc7 (commit)
       via  f2ea09c04f14ebef657d3e796a5361be0dd175a1 (commit)
       via  cf0ad9da3f8172a75e5393523554c62656071ae6 (commit)
       via  fb67f984c53630fafe0d97bed47eed9dd8d2e126 (commit)
       via  7117d3e7238b49e8accbd0072952d701cac072b5 (commit)
      from  aa4027998dda5e3a69360764d9162dcfd0182391 (commit)


- Log -----------------------------------------------------------------
commit ea9202996aa714074b4a64bed7558fc6c1b617b6
Merge: 1e66f157 cf1a3957
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon May 28 15:36:13 2018 +0200

Merge branch 'uploading-roles' of vocsi:/home/git/openbiomaps into uploading-roles

commit 1e66f157c031560940d917a6537e19389a6ca5ec
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon May 28 15:15:52 2018 +0200

privacy and terms update alert and agree window

Every users must read agree the updates terms and privacy policy...

commit cf1a39579aeefb8d8ff92c767824319f0028af6f
Merge: 307457f0 cf0ad9da
Author: Bóné Gábor <gabor.bone at milvus.ro>
Date:   Mon May 28 13:19:34 2018 +0300

rebase with master

commit 307457f03274e54d7631f3104ac3a44d7e848b1d
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon May 28 10:45:20 2018 +0200

Some updates related to roleid <- userid changes

commit cf077021e8f0cfd08c117193ab2ded2b097f0dc7
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Sun May 27 23:23:35 2018 +0200

user_id -> role_id updates

commit f2ea09c04f14ebef657d3e796a5361be0dd175a1
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Sun May 27 17:22:25 2018 +0200

role_id / user_id bug fix

Previously user_id was the uploader_id in uploadings table which was
wrong, because in the access right check functions assumed that this id
is role_id. It caused access conflicts in those databases where there
are lots of new user from the introduction of project_roles table.

uploadings table and _rules tables should be updated!!
uploader_id <- role_id
read, write <- role_id

commit cf0ad9da3f8172a75e5393523554c62656071ae6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon May 28 10:45:20 2018 +0200

Some updates related to roleid <- userid changes

commit fb67f984c53630fafe0d97bed47eed9dd8d2e126
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Sun May 27 23:23:35 2018 +0200

user_id -> role_id updates

commit 7117d3e7238b49e8accbd0072952d701cac072b5
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Sun May 27 17:22:25 2018 +0200

role_id / user_id bug fix

Previously user_id was the uploader_id in uploadings table which was
wrong, because in the access right check functions assumed that this id
is role_id. It caused access conflicts in those databases where there
are lots of new user from the introduction of project_roles table.

uploadings table and _rules tables should be updated!!
uploader_id <- role_id
read, write <- role_id

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

Summary of changes:
 libs/afuncs.php                 |  13 +++++
 libs/common_pg_funcs.php        | 109 ++++++++++++++++++++++++++++++++------
 libs/db_funcs.php               |  12 +----
 libs/evaluation.php             |   6 ++-
 libs/interface.php              |  94 ++++++++++++++++++++++++---------
 libs/js/admin.js                |   6 +++
 libs/js/main.js                 |   7 +--
 libs/languages/en.php           |   6 +++
 libs/languages/hu.php           |   7 +++
 libs/languages/ro.php           |   8 ++-
 libs/modules/results_asList.php |   2 +-
 libs/profile.php                | 112 ++++++++++++++++++----------------------
 libs/upload_funcs.php           |   2 +-
 13 files changed, 262 insertions(+), 122 deletions(-)

-- 
OpenBioMaps GIT repository