1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00
Commit Graph

42 Commits

Author SHA1 Message Date
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
zhengxie
0efcbb10a3 [social auth & notification] Add wechat work notification 2019-01-28 11:36:00 +08:00
zhengxie
8e1d52ce10 Merge branch '6.3' 2018-12-07 14:59:14 +08:00
zhengxie
65a9fb8273 [requirements] Upgrade requests 2018-12-07 13:14:40 +08:00
zhengxie
242846eb3b Add futures requirement 2018-12-06 14:58:08 +08:00
zhengxie
f423f62b8e Add webdav secret api 2018-11-24 11:07:54 +08:00
zhengxie
a306737700 Fix post office connection and handle invitation error 2018-10-13 15:08:35 +08:00
zhengxie
ddcd19a4a6 Upgrade rest_framework to 3.3.3 to fix html render error in web api
ref: https://forum.seafile.com/t/6-3-6-pro-api-broken-user-feedback-as-i-go/7356/5
2018-10-08 10:58:50 +08:00
zhengxie
efbfbb42c7 [requirements] Update django to 1.11.15 2018-08-07 10:19:57 +08:00
zhengxie
fd1b30d160 Add cas login/logout 2018-06-04 14:07:19 +08:00
ilearnit
b01eb64a1f seafile-editor-master-dist 2018-05-25 13:47:30 +08:00
zhengxie
7557929c50 Update requirements 2018-05-21 15:57:58 +08:00
zhengxie
f6460759bb Remove captcha from thirdpart, update requirements 2018-05-11 11:59:17 +08:00
zhengxie
091b4d1933 Add dev requirements 2018-04-27 16:26:29 +08:00
zhengxie
a4f6d65c55 [requirements] Add mysqlclient 2018-04-19 15:25:16 +08:00
zhengxie
aa689f9bfe [Django 1.11] Update requirements and tests 2018-04-18 11:11:23 +08:00
zhengxie
bba9fb7254 [Django 1.11] Feature removed in Django 1.9. Update django constance to remove get_cache 2018-03-19 13:38:35 +08:00
zhengxie
90d4cafd5b [requirements] Update pillow to 4.3.0 2018-01-29 10:37:44 +08:00
lian
50ccccfcb4 add oauth support 2017-11-14 11:53:41 +08:00
zhengxie
12e0617b58 Update requirements.txt 2017-10-14 17:02:12 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +08:00
Shuai Lin
e57a92107d 2fa: added dependencies in requirements.txt 2016-06-14 14:26:22 +08:00
zhengxie
1b9b18c2cb
Add setting to enable/disable constance(web settings) 2016-05-26 15:57:37 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
zhengxie
762852a560 Upgrade django version 2016-03-04 17:22:54 +08:00
zhengxie
9404af609d Add post_office app, and send async email to imported csv users 2015-12-15 11:32:34 +08:00
zhengxie
83d7e8b404 Update rest framework to latest (v3.3.1) 2015-12-05 16:35:51 +08:00
zhengxie
333c0a9966 Upgrade rest framwork, check memcached at startup 2015-12-05 16:35:51 +08:00
zhengxie
887b6bbe03 Fix tests and replace mimetype with content_type 2015-12-05 16:35:50 +08:00
zhengxie
68efe49481 [django 1.8] WIP 2015-12-05 16:32:01 +08:00
lian
4bccc4abac udpate export excel 2015-11-24 13:19:58 +08:00
zhengxie
501fa793b1 Use custom django-constance 2015-10-27 16:03:08 +08:00
zhengxie
88dc4c8e4d Use contance 1.0.1 instead of latest
refer to http://django-constance.readthedocs.org/en/latest/changes.html#v1-0-1-2015-01-07
2015-10-13 15:24:17 +08:00
zhengxie
d1bd4bd7cf Remove constance from thirdpart 2015-10-13 11:58:47 +08:00
zhengxie
18baf34f0e Add django constance to thirdpart to void dependency 2015-10-10 10:51:38 +08:00
zhengxie
49fb5ca174 Add admin settings page to edit some configurations. Install django constance by pip install 'django-constance[database]' 2015-09-21 11:07:42 +08:00
zhengxie
3f66a3932b [i18n] Offline js i18n 2015-04-22 15:31:51 +08:00
zhengxie
c709eab594 Use django compressor to compress css 2015-04-22 15:31:48 +08:00
zhengxie
f580ffb5e2 Update requirements and readme 2015-04-02 16:07:43 +08:00
lins05
aebba20a97 dump seahub logs when test failed 2014-09-06 12:37:52 +08:00
Chilledheart
a882caec03 replace casperjs with selenium 2014-09-05 13:51:44 +08:00
lins05
e45f0da330 updated test configs and scripts 2014-09-05 13:51:43 +08:00