haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity
6,618 Commits 145 Branches 460 Tags
f797d2d52359e4529ce7262b818a70a3a14464a2
Commit Graph

282 Commits

Author SHA1 Message Date
zming
11f45979a5 [seahub] Added the ability to modify the format of the text preview suffix 2017-06-12 11:31:51 +08:00
zhengxie
7dbb428c6e Merge branch '6.0' into 6.1 2017-06-09 10:16:34 +08:00
zming
e26d5b6aa8 [throtting] Add whitelist of throtting 2017-06-05 15:54:08 +08:00
llj
8dd8e1e7f0 [thumbnail] added 'thumbnail_size_for_original' 2017-05-31 16:32:00 +08:00
zhengxie
0d65a68892 [thumbnail] Add setting to enable/disable movie thumbnail 2017-05-22 12:15:38 +08:00
zhengxie
efd7e7530f Update settings 2017-05-10 18:44:25 +08:00
lian
352865248a disable wiki 2017-05-09 16:22:59 +08:00
zhengxie
194f219a3c Merge branch '6.0' 2017-05-09 13:13:36 +08:00
zhengxie
a4ead6dc38 Add more avatar size 2017-05-06 10:40:51 +08:00
zhengxie
3ca1e5f042 [locale] Update locales 2017-05-02 12:19:25 +08:00
lian
4a76fc0cbc add wopi app 2017-04-18 15:37:12 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
llj
33029ea2ed added ENABLE_WIKI 2017-03-25 14:30:11 +08:00
llj
097e337683 [favicon] fix & modification for customization 2017-03-23 16:33:09 +08:00
lian
dd88c4e043 add admin operation logs page 2017-03-22 17:26:42 +08:00
llj
6fa7a778d0 modified 'upload folder' 2017-03-09 17:40:57 +08:00
lian
5e70dd8608 Merge pull request #1501 from haiwen/enhancement/share_link 
[share link] Enlarge token length
 2017-02-25 17:28:21 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
7472c03bec rm user message related code 2017-01-19 14:40:49 +08:00
zhengxie
6bf9609ded Update time zone to UTC 2017-01-11 13:57:55 +08:00
Daniel Pan
1273ffa83d Merge pull request #1423 from haiwen/new 
[dir view] redesigned 'new folder/file'
 2017-01-04 13:53:04 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
lian
5ccd21c718 update new office file 2016-12-15 13:50:04 +08:00
llj
405e6b7e2c [user profile] modified UI 2016-09-20 13:19:09 +08:00
llj
fb6430b027 [fileupload] modified 'maxNumberOfFiles' 2016-09-14 17:35:42 +08:00
zhengxie
c0add5e56a [i18n] Add Finnish support 2016-09-09 16:37:25 +08:00
zhengxie
f4253ad806 [role perm] Update settings of role permissions 2016-09-05 15:16:31 +08:00
lian
fd917c0007 update user permission 
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
 2016-08-22 11:20:48 +08:00
zhengxie
bfbd6f05a5 Add virus check when upload files to upload link 2016-08-04 16:09:05 +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
5a2af77d44 Add copyright header 2016-07-26 10:51:29 +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
57cc2b4aba Merge branch '5.1' 
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
 2016-07-21 10:55:50 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
llj
3af253401d [two factor auth] modified UI (#1273) 
* [two factor auth] modified UI

* [2fa] login: modified UI

* WIP: update two-factor auth

* [2fa] improvement
 2016-07-15 14:39:23 +08:00
zhengxie
cc82b46193 Fix unicode error in api response, ref https://forum.seafile.de/t/users-with-umlauts-in-their-display-name-breaks-group-management/4800 2016-06-28 11:09:13 +08:00
zhengxie
528b33ec0e Add role permissions 2016-06-27 16:41:55 +08:00
Shuai Lin
3d04bfea6d support two factor authentication 2016-06-14 14:26:22 +08:00
Daniel Pan
b567379c2c Merge branch '5.1' 
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
 2016-06-13 18:25:20 +08:00
zhengxie
346c228495 Add ENABLE_SETTINGS_VIA_WEB setting and remoke CONSTANCE_ENABLED 2016-05-27 10:33:10 +08:00
zhengxie
1b9b18c2cb Add setting to enable/disable constance(web settings) 2016-05-26 15:57:37 +08:00
Shuai Lin
99cfea5c87 Remove unused code for seafevents in settings.py 2016-04-29 10:40:57 +08:00
Daniel Pan
5a52ad7168 Merge pull request #1145 from haiwen/share_link_audit 
Add share link audit
 2016-04-27 13:27:15 +08:00
zhengxie
bdfc98d41e Add share link audit 2016-04-22 17:07:25 +08:00
zhengxie
fb722accd6 Add option to freeze user account when failed login attemts exceed limit 2016-04-19 15:33:48 +08:00