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

199 Commits

Author SHA1 Message Date
lian
949bdce5c1
encode("iso-8859-1") for shibboleth login (#4667)
Co-authored-by: lian <lian@seafile.com>
2020-09-09 10:36:27 +08:00
llj
389f8befee
[terms] rewrote 'terms view' with react (#4589) 2020-06-15 16:27:00 +08:00
lian
9500ac647a Merge branch '7.0' 2020-02-28 13:00:23 +08:00
lian
28bd2c4f87 fix bug when user login via shib (#4416) 2020-01-15 14:06:46 +08:00
王健辉
5dd0586c2b use new sys_search_users page (#4400) 2020-01-09 17:41:01 +08:00
lian
dcb871c957 Merge branch '7.0' 2020-01-06 16:25:55 +08:00
lian
69a482df9f only check local user when login via shib (#4357) 2019-12-13 21:44:54 +08:00
llj
c399879011 [terms & conditions] accept: rewrote it with React (#4279) 2019-11-21 11:34:08 +08:00
王健辉
d2555ab137 use customized constance (#4191) 2019-10-25 15:01: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
zhengxie
fd21d7838e Update social_django and profile 2019-01-30 17:36:46 +08:00
zhengxie
0efcbb10a3 [social auth & notification] Add wechat work notification 2019-01-28 11:36:00 +08:00
zhengxie
a45e6b5cdd [shibboleth] Only apply middleware to certain url 2018-09-15 16:13:07 +08:00
zhengxie
70ff50b30f [shibboleth] Fix multiple emails sending issue.
issue: https://forum.seafile.com/t/seahub-not-sending-mail-invitations/7150/6
2018-09-15 11:32:06 +08:00
llj
435ced05f5 [register] redesigned it 2018-06-14 16:51:13 +08:00
ilearnit
116f6c45d8 fix terms 2018-06-09 15:58:55 +08:00
ilearnit
3cc68f5b6d Add terms to web settings 2018-06-09 11:17:04 +08:00
zhengxie
fd1b30d160 Add cas login/logout 2018-06-04 14:07:19 +08:00
zhengxie
f6460759bb Remove captcha from thirdpart, update requirements 2018-05-11 11:59:17 +08:00
zhengxie
02c0d2834d [sql] Update mysql/sqlite 2018-04-26 16:02:38 +08:00
zhengxie
acd4c2456d Add user deleted signal 2018-04-26 15:00:18 +08:00
zhengxie
9b16ba0e8f [Django 1.11] Feature removed in Django 1.9. Update template settings and test 2018-03-19 15:33:25 +08:00
zhengxie
553d9b3df3 [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site, and update urls 2018-03-19 13:49:01 +08:00
zhengxie
4a498c15f8 [Django 1.11] Feature removed in Django 1.9, request.REQUEST -> request.GET/POST. Remove {% load url from future %} 2018-03-19 13:37:57 +08:00
zhengxie
663eebc8ed [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site 2018-03-16 13:23:53 +08:00
ilearnit
3526b2b5cf FIx feature removed issue in Django1.10. render_to_response() -> render(), remove context_instance arg in `render_to_string()' 2018-03-16 10:33:54 +08:00
zhengxie
06ee26e7d3 [i18n] Update source string 2018-01-12 18:06:42 +08:00
zhengxie
ed8a549458 Notify admins after register 2018-01-06 16:53:48 +08:00
zhengxie
318c7de424 [auth, api, shibboleth] Use primary id in login 2017-08-26 14:54:48 +08:00
zhengxie
f15aa06978 [two factor] Refactor code 2017-08-23 14:46:02 +08:00
zming
d0975c7836 migrate two-factor 2017-08-21 14:02:57 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +08:00
zhengxie
9a5aae50ab [shibboleth] Add joker * in affiliation role map 2017-08-02 18:31:15 +08:00
zming
6cb50b9c0c [captcha] fixed size 2017-07-13 14:31:46 +08:00
zhengxie
e30d19c791 [shibboleth] Fix empty role quota issue which will cause page unavailable 2017-06-26 10:33:54 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
922148a1b0 Add terms&conditions config 2016-08-02 15:03:19 +08:00
Daniel Pan
26d2a4d774 Merge pull request #1299 from haiwen/terms
Terms
2016-07-27 13:54:04 +08:00
zhengxie
c675497336 Add licenses 2016-07-25 11:12:40 +08:00
zhengxie
0f73921205 Update T&C
Conflicts:
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/sysadmin/base.html
	seahub/urls.py
	seahub/views/sysadmin.py
2016-07-22 16:39:05 +08:00
zhengxie
41f9a3950c Add ToC 2016-07-22 16:34:09 +08:00
Shuai Lin
3d04bfea6d support two factor authentication 2016-06-14 14:26:22 +08:00
zhengxie
f12215ec5e
[shib] Fix shib complete url bug 2016-05-17 17:48:57 +08:00
zhengxie
f43cdb3f35 [tests] Make shib test pass 2016-03-24 16:58:55 +08:00
zhengxie
65a336f573 [shib] Add shibboleth complete page 2016-03-24 16:25:45 +08:00
zhengxie
42c90bda2e Fix activate request email not sent bug on registration, and apply to shibboleth login 2016-03-24 15:21:11 +08:00
Daniel Pan
b75e8e8d9c clean code and icons 2016-03-09 15:12:53 +08:00
zhengxie
72d30b2495 Merge branch '5.0'
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
2016-03-07 16:04:36 +08:00