[Devel] [GIT] OpenBioMaps GIT repository, branch devel_2.2 updated:

[git at vocs.unideb.hu]

    The project "OpenBioMaps GIT repository":

    The branch, devel_2.2 has been updated
       via  d8df2b2316f796a7c5f511eeaeb3110dd3bf258b (commit)
       via  1d76dff5ad084402d24858ac292f2443c592ad15 (commit)
       via  df143c01ec03f5f031f771a15b49fe8dd883bee2 (commit)
       via  07754dde29a31d5bc01f4c37f8bd6debe3da2d63 (commit)
       via  24f9c27219b7d6e16655a752db5e20fd5f5cfdc6 (commit)
       via  9ee687dd61abcaa09a95d6ff766a6cd448b202b1 (commit)
       via  2732ba78816922362cbf0c4d0573924bf26d7e1e (commit)
      from  494f3ebf7a16485f0904bc66d64e06828cf8de1a (commit)


- Log -----------------------------------------------------------------
commit d8df2b2316f796a7c5f511eeaeb3110dd3bf258b
Merge: 1d76dff5 494f3ebf
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 12 03:10:32 2017 +0100

Gábor is, Miki is módosított
Merge branch 'devel_2.2' of vocsi:/home/git/openbiomaps into devel_2.2

commit 1d76dff5ad084402d24858ac292f2443c592ad15
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Tue Dec 12 03:09:26 2017 +0100

paperclip icon position in file upload - attachments column drop: bug
fix

commit df143c01ec03f5f031f771a15b49fe8dd883bee2
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Dec 11 22:35:55 2017 +0100

.

commit 07754dde29a31d5bc01f4c37f8bd6debe3da2d63
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Dec 11 22:32:35 2017 +0100

csv upload metadata fixes

commit 24f9c27219b7d6e16655a752db5e20fd5f5cfdc6
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Dec 11 22:08:18 2017 +0100

language updates,
local lang creating: force right syntax

commit 9ee687dd61abcaa09a95d6ff766a6cd448b202b1
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Dec 11 15:53:49 2017 +0100

language updates

commit 2732ba78816922362cbf0c4d0573924bf26d7e1e
Author: Bán Miklós <banm at vocs.unideb.hu>
Date:   Mon Dec 11 15:39:36 2017 +0100

language updates
system email as sender in system mails

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

Summary of changes:
 libs/afuncs.php                       |   8 +-
 libs/common_pg_funcs.php              |  40 +-
 libs/evaluation.php                   |   7 +-
 libs/js/functions.js                  |   1 -
 libs/languages/admin-en.csv           |  70 ---
 libs/languages/admin-hu.csv           |  70 ---
 libs/languages/admin-ro.php           |   2 +-
 libs/languages/en.csv                 |  23 +-
 libs/languages/en.php                 |  17 +
 libs/languages/{en.php => en.php.bak} |  17 +
 libs/languages/hu.csv                 | 985 +++++++++++++++++-----------------
 libs/languages/hu.php                 |  17 +
 libs/languages/{hu.php => hu.php.bak} |  17 +
 libs/languages/{hu.php => hu.php_ori} |  17 +
 libs/languages/ro.csv                 |  84 +--
 libs/languages/{ro.php => ro.ph.bak}  |  17 +
 libs/languages/ro.php                 |  17 +
 libs/languages/{ro.php => ro.php.bak} |  17 +
 libs/languages/ro_admin.csv           |  70 ---
 libs/modules/results_asCSV.php        |  16 +-
 libs/modules/results_specieslist.php  |  10 +-
 libs/results_builder.php              |   4 +-
 libs/upload_show-table-form.php       |   3 +
 23 files changed, 756 insertions(+), 773 deletions(-)
 delete mode 100644 libs/languages/admin-en.csv
 delete mode 100644 libs/languages/admin-hu.csv
 copy libs/languages/{en.php => en.php.bak} (94%)
 copy libs/languages/{hu.php => hu.php.bak} (94%)
 copy libs/languages/{hu.php => hu.php_ori} (94%)
 copy libs/languages/{ro.php => ro.ph.bak} (94%)
 copy libs/languages/{ro.php => ro.php.bak} (94%)
 delete mode 100644 libs/languages/ro_admin.csv

-- 
OpenBioMaps GIT repository