1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-06 19:49:29 +00:00
Commit Graph

10326 Commits

Author SHA1 Message Date
王健辉
e37f75d5e0 dtable-asset-file-view (#4094)
* dtable-asset-file-view

* repair code

* modify code

* modify workspace/dtable permission check
2019-09-20 14:20:28 +08:00
Michael An
39e720d375 update seafile-js (#4099) 2019-09-20 11:26:10 +08:00
杨顺强
a1e5e9db8a update dtable module (#4097)
* update dtable module

* optimized code

* optimized code
2019-09-19 15:47:03 +08:00
杨顺强
f7fc757f52 update dtable font (#4096) 2019-09-19 14:44:55 +08:00
Leo
83c091b8cf fix custom nav item (#4095) 2019-09-19 11:04:55 +08:00
杨顺强
baa0ca16c7 update dtable version (#4093) 2019-09-18 18:21:37 +08:00
lian
66da4b790f update office template to remove author 2019-09-18 15:29:09 +08:00
Michael An
1ce9e94117 update dtable to 0.0.162 (#4092)
* update dtable to 0.0.162

* update translation
2019-09-17 18:29:38 +08:00
llj
69645a77c9 added the link to institution admin panel (#4090) 2019-09-17 12:11:45 +08:00
杨顺强
e36c074c47 repair font icon bug (#4088) 2019-09-17 10:32:53 +08:00
杨顺强
a1a128a9f0 update dtable font (#4087) 2019-09-16 19:38:51 +08:00
杨顺强
305dc75eb3 udpate dtable to 160 (#4086) 2019-09-16 18:30:22 +08:00
llj
cbfe203a26 [system notification] fixup (#4084) 2019-09-16 15:36:14 +08:00
Daniel Pan
c7b043320e
Fix test changes (#4079)
* fix drone changes command

* update drone test branch and event
2019-09-12 15:12:42 +08:00
Michael An
7e020d1cb5 update dtable (#4081) 2019-09-12 12:21:39 +08:00
Michael An
a86f3de960 update dtable (#4078) 2019-09-11 18:23:09 +08:00
Leo
d52949da9c custom nav item (#4071)
* custom nav item

* optimize code

* optimize code
2019-09-11 13:39:49 +08:00
plt
c38e86d8a5 Merge branch '7.0' 2019-09-11 12:45:41 +08:00
sniper-py
99a9ece04e Python3 master (#4076)
* delete thridpart/social_django

* delete social_django in seahub/urls.py

* delete social_django in seahub/settings.py

* delete seahub/notifications/management/commands/send_wxwork_notices.py

* delete social_django in code annotation

* delete seahub/social_core

* delete tests/seahub/social_core

* delete social_core in seahub/urls.py

* delete social_core in seahub/settings.py

* change app_label to auth in SocialAuthUser model

* 2to3 asserts

* 2to3 basestring

* 2to3 dict

* 2to3 except

* 2to3 filter

* 2to3 future

* 2to3 has_key

* 2to3 idioms

* 2to3 import

* 2to3 imports

* 2to3 long

* 2to3 map

* 2to3 next

* 2to3 numliterals

* 2to3 print

* 2to3 raise

* 2to3 raw_input

* 2to3 reduce

* 2to3 reload

* 2to3 set_literal

* 2to3 unicode

* 2to3 urllib

* 2to3 ws_comma

* 2to3 xrange

* 2to3 zip

* add pymysql in __init__.py

* fix encode and decode in seahub/cconvert.py

* fix seafserv_rpc.is_passwd_set in seahub/views/__init__.py

* fix smart_unicode to smart_text

* fix force_unicode to force_text

* delete seaserv.get_session_info

* delete seaserv.ccnet_rpc

* fix indent error in seahub/auth/middleware.py

* update dev-requirements

* update test-requirements

* update requirements

* fix StringIO to BytesIO in thumbnail

* fix seaserv.list_inner_pub_repos to seafile_api.get_inner_pub_repo_list

* fix seaserv.list_org_inner_pub_repos to seafile_api.list_org_inner_pub_repos

* add logger in seahub/utils/__init__.py

* fix sort cmp in seahub/views/__init__.py

* fix sort cmp in seahub/base/management/commands/export_file_access_log.py

* fix sort cmp in seahub/api2/endpoints/repo_trash.py

* fix sort cmp in seahub/api2/endpoints/shared_repos.py

* fix sort cmp in seahub/api2/endpoints/shared_folders.py

* fix sort cmp in seahub/wiki/views.py

* fix sort cmp in seahub/api2/endpoints/wiki_pages.py

* fix sort cmp in seahub/api2/endpoints/group_libraries.py

* fix sort cmp in seahub/base/models.py

* fix sort cmp in seahub/api2/endpoints/upload_links.py

* fix sort cmp in seahub/views/ajax.py

* fix sort cmp in seahub/api2/views.py

* fix sort cmp in seahub/views/wiki.py

* fix sort cmp in seahub/api2/endpoints/repos.py

* fix sort cmp in seahub/api2/endpoints/starred_items.py

* fix sort cmp in seahub/views/file.py

* fix sort cmp in seahub/api2/endpoints/dir.py

* fix sort cmp in seahub/api2/endpoints/share_links.py

* fix cmp to cmp_to_key in seahub/api2/endpoints/admin/device_trusted_ip.py

* fix cmp to cmp_to_key in tests/api/endpoints/admin/test_device_trusted_ip.py

* delete encode('utf-8') in seafile_api.list_dir_by_commit_and_path

* delete encode('utf-8') in is_file_starred

* delete encode('utf-8') in seafile_api.list_dir_by_path

* delete path.encode('utf-8') in seahub/views/file.py

* fix os.write to add encode('utf-8')

* add encode('utf-8') for hashlib

* add encode('utf-8') for hmac

* fix with open(file, 'wb') for binary file

* fix encode and decode in seahub/utils/hasher.py

* fix next in thirdpart/shibboleth/views.py

* fix next in seahub/profile/views.py

* fix next in seahub/notifications/views.py

* fix next in seahub/institutions/views.py

* fix next in seahub/options/views.py

* fix next in seahub/share/views.py

* fix next in seahub/avatar/views.py

* fix next in seahub/views/__init__.py

* fix next in seahub/group/views.py

* fix next in seahub/views/wiki.py

* fix next in seahub/views/sysadmin.py

* fix next in seahub/views/file.py

* fix string.lowercase to string.ascii_lowercase in test

* fix open file add 'rb' in test

* fix self.user.username in test

* add migrations in file_participants

* fix list_org_inner_pub_repos to list_org_inner_pub_repos_by_owner

* fix from seaserv import is_passwd_set to seafile_api.is_password_set

* fix assert bytes resp.content in test

* fix seafile_api.get_inner_pub_repo_list to seafile_api.list_inner_pub_repos_by_owner

* fix seafile_api.is_passwd_set to seafile_api.is_password_set

* fix AccountsApiTest assert length

* rewrite sort_devices cmp to operator.lt

* fix bytes + str in seahub/api2/views.py

* fix assert bytes resp.content in test

* fix hashlib encode in seahub/thirdpart/registration/models.py

* change app_label to base in SocialAuthUser

* fix base64 encode in seahub/base/database_storage/database_storage.py

* fix assert bytes resp.content

* remove path.decode in def mkstemp()

* remove path.decode in FpathToLinkTest

* remove str decode in FileTagTest

* remove mock_write_xls.assert_called_once() in SysUserAdminExportExcelTest

* fix urllib assert in FilesApiTest

* fix link fields in FileCommentsTest

* fix get_related_users_by_repo()

* fix assert list in GetRepoSharedUsersTest

* fix create user in AccountTest

* fix repeated key in dict seahub/api2/views.py

* add drone.yml

* update nginx conf in test

* update test conf in test

* update dist and push after test success

* update drone conf to dist and push

* fix assert in BeSharedReposTest

* fix seafile_api.list_org_inner_pub_repos_by_owner(org_id, username) to seafile_api.list_org_inner_pub_repos(org_id)

* fix seafile_api.list_inner_pub_repos_by_owner(username) to seafile_api.get_inner_pub_repo_list()

* update pyjwt requirement

* update dist branch in drone

* add SKIP in dist and push

* fix StringIO to BytesIO in seahub/avatar/models.py

* fix if org_id > 0 to if org_id and org_id > 0

* remove payment

* fix StringIO to BytesIO in seahub/base/database_storage/database_storage.py

* fix send_message to seafile_api.publish_event in seahub/drafts/utils.py

* fix send_message to seafile_api.publish_event in seahub/api2/views.py

* fix send_message to seafile_api.publish_event in seahub/api2/endpoints/repos.py

* fix send_message to seafile_api.publish_event in seahub/views/file.py

* fix send_message to seafile_api.publish_event in seahub/utils/__init__.py

* fix image_file.read encode in seahub/base/database_storage/database_storage.py

* fix DatabaseStorageTest

* remove .travis.yml

* drone branch include master
2019-09-11 11:46:43 +08:00
zxj96
835015c3a8 translation-optimization (#4064) 2019-09-10 12:19:47 +08:00
Michael An
c1ead65a6f update dtable translation (#4073) 2019-09-10 10:47:59 +08:00
Michael An
baaed836c6 update dtable (#4072) 2019-09-10 09:49:13 +08:00
Leo
3fa9f80432 add setting ENABLE_FORCE_2FA_TO_ALL_USERS (#4070) 2019-09-09 16:12:05 +08:00
杨顺强
0232b5cfb5 repair mutiple download bug (#4069) 2019-09-09 13:46:28 +08:00
Leo
0a6f724a96 non-display last update time, if mtime == 0 (#4068) 2019-09-09 11:34:12 +08:00
Michael An
eda09f3572 update dtable icon (#4063) 2019-09-06 17:05:53 +08:00
杨顺强
ada1145445 update dtale version to 0.0.156 (#4062) 2019-09-06 16:38:14 +08:00
杨顺强
57acbaf52b update dtable version to 0.0.155 (#4061) 2019-09-06 12:00:38 +08:00
Michael An
b4c5048218 update dtable (#4060) 2019-09-06 10:04:18 +08:00
Michael An
6c0488f7eb update dtable (#4058) 2019-09-05 18:07:58 +08:00
llj
552f7125da [system admin] info: refactored it (#4057) 2019-09-05 15:06:06 +08:00
Michael An
ab1a9de5e7 update dtable (#4056) 2019-09-05 10:38:31 +08:00
zxj96
6da679a973 translation (#4054)
* translation

* optimization code
2019-09-05 09:42:07 +08:00
llj
53221cf3ab [system admin] side nav: click & highlight current nav item (#4055) 2019-09-04 17:47:56 +08:00
杨顺强
bce32fb11d repair group-settings show bug (#4052)
* repair group-settings show bug

* optimized code
2019-09-04 15:52:24 +08:00
plt
955c715868 Merge branch '7.0' 2019-09-04 15:15:47 +08:00
llj
0975fc064f [side nav] fixed 'scroll' problem for mobile (#4053) 2019-09-04 15:14:46 +08:00
plt
648b07049f Merge branch '7.0' 2019-09-04 14:39:54 +08:00
Michael An
2d4604e71e update seafile-js version (#4050) 2019-09-04 14:35:05 +08:00
llj
5c7c13c478 [dir view] updated 'top operation list' for current active dirent (#4046)
* [dir view] updated 'top operation list' for current active dirent

* added `getDirentOperationList` to utils.js
* improved code

* [dir view] added operations for current active dirent; bugfix &
improvement

* [utils] rewrote 'get dirent operation list' & bugfix
2019-09-04 14:21:57 +08:00
杨顺强
1170facb7d update dtable version (#4049) 2019-09-03 21:00:55 +08:00
杨顺强
beba11a90f update version (#4048)
* update version

* update version
2019-09-03 18:28:23 +08:00
Leo
0cbabf5c6c sysadmin reconstruct settings api (#3974) 2019-09-03 17:02:46 +08:00
plt
e5c6ceb35e Merge branch '7.0' 2019-09-03 13:40:10 +08:00
llj
169ee131c9 fixed '.sf-heading' UI (#4047) 2019-09-03 10:40:19 +08:00
王健辉
5a97b20065 file uuid map use origin repo_id (#4045)
* file_uuid_map_use_origin_repo_id

* fix test error
2019-09-02 18:11:05 +08:00
杨顺强
64b7222bd2 Optimized translate module (#4044)
* combine dtable translate

* update cdoc html

* optimized code
2019-09-02 15:11:37 +08:00
Michael An
14e4cc27d5 change wiki left border (#4043) 2019-09-02 10:54:01 +08:00
杨顺强
54b8044056 update seafile editor version (#4041) 2019-09-01 10:14:51 +08:00
杨顺强
1def2509e8 update seafile-editor&seafile-cdoc translate (#4040) 2019-08-31 22:58:38 +08:00