3 files changed, 52 insertions, 47 deletions

diff --git a/www/seahub/Makefile b/www/seahub/Makefile
index c6de89471185..c8f8d1fd6543 100644
--- a/www/seahub/Makefile
+++ b/www/seahub/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	seahub
 PORTVERSION=	${SEAHUB_VER}
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-pro
 CATEGORIES=	www
diff --git a/www/seahub/distinfo b/www/seahub/distinfo
index bae34d3ee40c..467ad8b2e9cb 100644
--- a/www/seahub/distinfo
+++ b/www/seahub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498236985
-SHA256 (haiwen-seahub-v6.1.1-pro_GH0.tar.gz) = 2cba452f391321c71745b4ee901230ffa3a3f3ecd791c2713616333af2be8339
-SIZE (haiwen-seahub-v6.1.1-pro_GH0.tar.gz) = 8941954
+TIMESTAMP = 1499060581
+SHA256 (haiwen-seahub-v6.1.2-pro_GH0.tar.gz) = 1a9b946917d5516bab05bd46bc3fcc9428114053fb2a541fb38e272428dcde55
+SIZE (haiwen-seahub-v6.1.2-pro_GH0.tar.gz) = 8952287
diff --git a/www/seahub/pkg-plist b/www/seahub/pkg-plist
index ee203e7e466c..889174d9b0d0 100644
--- a/www/seahub/pkg-plist
+++ b/www/seahub/pkg-plist
@@ -247,7 +247,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitation.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitations.35464fc14b02.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitations.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.9a1073b2b8fe.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.ed56cd55c4a9.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-shared-repos.31e9a0699bee.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-shared-repos.js
@@ -257,11 +257,13 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization.279bfd4a6bf5.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/repo-details.5ff6aea701e1.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/repo-details.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-folder-perm-item.bbe385d95fb6.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-folder-perm-item.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-shared-link.b7ec2564223e.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-shared-link.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/repo.9727ecfa9f10.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/repo.d185b288cd44.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/share-admin-folder.b1e05de56a32.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/share-admin-folder.js
@@ -297,79 +299,73 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/widgets/popover.js
 %%SEAHUBDIR%%/media/assets/scripts/build.a0552a4ed8dc.js
 %%SEAHUBDIR%%/media/assets/scripts/build.js
-%%SEAHUBDIR%%/media/assets/scripts/common.9ad182d5354c.js
+%%SEAHUBDIR%%/media/assets/scripts/common.08c32a532bf7.js
 %%SEAHUBDIR%%/media/assets/scripts/common.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/build.d9508a510082.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/build.fc96f6ef28f1.txt
+%%SEAHUBDIR%%/media/assets/scripts/dist/build.d41d8cd98f00.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/build.f574a7185be6.txt
 %%SEAHUBDIR%%/media/assets/scripts/dist/build.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/build.txt
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ar/djangojs.42d7fca23fd4.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ar/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.c2528b8e21fb.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.43d3fa05da34.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.60e44dbed55b.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.c11c44a5f194.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/de/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/el/djangojs.cbf55d8ba714.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/el/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.7d3052cf2fbf.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.0cfe5efbf7c3.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/en/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.fcfe6788392f.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.a68f0e720545.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-ar/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.5dcdfaf67a7f.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.ff54ce1cdeac.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.a07b2b70fbfa.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.ac4137666d37.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.3a52c64c31bf.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.c1b2cb826bb3.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.a74d8ba43e70.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.a29f783f813d.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.648b3fd2ae90.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.40f8706153d5.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.a143fd85f0fa.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.36e4cffb4d3d.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/hu/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.7c474b58871c.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.7fa2faccd1d1.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/is/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.d0d40722ab7b.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.017a18aacb79.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/it/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.63f51f39597d.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.40bc6381f2d9.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ja/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.304dff70ffde.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.969338a15d36.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ko/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.9c3fdaf77b4b.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.0e6f1cb217d0.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/lv/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.8153d62922f5.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.f4e2913f7a78.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/nl/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.05646003e192.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.08feb41d8471.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pl/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.9a3a4088c97e.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.e173220a3f0d.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/pt-br/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.68cc5d3199f1.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.d0802c7dfe72.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ru/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.a30e59df1a2b.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.b8059241294f.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sk/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.6e392445dc33.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.591adbc5da06.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sl/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.88b23a7490d9.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.d281eed53eaa.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/sv/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.8815c1a5874e.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.68bfa3e8cb4f.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/th/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.dd3ba3c51a97.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.6b8a66c4d803.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/tr/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.e7963bbebfbf.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.8a3cf6b90108.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/uk/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/vi/djangojs.16ee075a0783.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/vi/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.3c70e7c81127.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.dab3b79551ea.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-cn/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.cabe6dd3f54d.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.f9941a040e37.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/lib/jquery.iframe-transport.87a72434af00.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/lib/jquery.iframe-transport.f220863ba60c.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/lib/jquery.iframe-transport.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.75e6d0132deb.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.603390194f29.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/main.2a228bc174f5.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/main.09afd4f75b92.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/main.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.d9babd6bcdb6.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.f26a8f95dae0.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.js
 %%SEAHUBDIR%%/media/assets/scripts/file-tree.ef8a19e97e35.js
 %%SEAHUBDIR%%/media/assets/scripts/file-tree.js
@@ -790,10 +786,12 @@
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/logs.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/org_users.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/perm_audit.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/admin/share_links.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/shares.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/sysinfo.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/system_library.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/trash_libraries.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/admin/upload_links.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/users_batch.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/utils.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/be_shared_repo.py
@@ -817,6 +815,7 @@
 %%SEAHUBDIR%%/seahub/api2/endpoints/repo_history.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/repo_set_password.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/repo_trash.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/repos.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/repos_batch.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/search_group.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/search_user.py
@@ -1363,6 +1362,7 @@
 %%SEAHUBDIR%%/static/scripts/app/views/notifications.js
 %%SEAHUBDIR%%/static/scripts/app/views/organization-repo.js
 %%SEAHUBDIR%%/static/scripts/app/views/organization.js
+%%SEAHUBDIR%%/static/scripts/app/views/repo-details.js
 %%SEAHUBDIR%%/static/scripts/app/views/repo-folder-perm-item.js
 %%SEAHUBDIR%%/static/scripts/app/views/repo-shared-link.js
 %%SEAHUBDIR%%/static/scripts/app/views/repo.js
@@ -1514,8 +1514,10 @@
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_logs.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_org_users.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_perm_audit_log.py
+%%SEAHUBDIR%%/tests/api/endpoints/admin/test_share_links.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_shares.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_sysinfo.py
+%%SEAHUBDIR%%/tests/api/endpoints/admin/test_upload_links.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_account.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_be_shared_repo.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_dir_shared_items.py
@@ -1535,6 +1537,7 @@
 %%SEAHUBDIR%%/tests/api/endpoints/test_repo_history.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_repo_set_password.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_repo_trash.py
+%%SEAHUBDIR%%/tests/api/endpoints/test_repos.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_repos_batch.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_search_group.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_search_user.py
@@ -1628,16 +1631,19 @@
 %%SEAHUBDIR%%/tests/seahub/test_accounts.py
 %%SEAHUBDIR%%/tests/seahub/thirdpart/shibboleth/test_backends.py
 %%SEAHUBDIR%%/tests/seahub/thirdpart/shibboleth/test_middleware.py
+%%SEAHUBDIR%%/tests/seahub/utils/__init__.py
 %%SEAHUBDIR%%/tests/seahub/utils/%%USERS%%-license.txt
 %%SEAHUBDIR%%/tests/seahub/utils/test_file_size.py
+%%SEAHUBDIR%%/tests/seahub/utils/test_get_conf_test_ext.py
 %%SEAHUBDIR%%/tests/seahub/utils/test_license_parse.py
+%%SEAHUBDIR%%/tests/seahub/utils/test_normalize_dir_path.py
+%%SEAHUBDIR%%/tests/seahub/utils/test_normalize_file_path.py
 %%SEAHUBDIR%%/tests/seahub/utils/test_repo.py
 %%SEAHUBDIR%%/tests/seahub/utils/test_user_permissions.py
 %%SEAHUBDIR%%/tests/seahub/views/__init__.py
 %%SEAHUBDIR%%/tests/seahub/views/ajax/test_get_dirents.py
 %%SEAHUBDIR%%/tests/seahub/views/ajax/test_get_file_upload_url_ul.py
 %%SEAHUBDIR%%/tests/seahub/views/ajax/test_get_unenc_group_repos.py
-%%SEAHUBDIR%%/tests/seahub/views/file/test_constance_text_conf.py
 %%SEAHUBDIR%%/tests/seahub/views/file/test_download_file.py
 %%SEAHUBDIR%%/tests/seahub/views/file/test_file.py
 %%SEAHUBDIR%%/tests/seahub/views/file/test_get_file_content_by_commit_and_path.py