1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Commit Graph

258 Commits

Author SHA1 Message Date
zhengxie
4f1e2b849c Add pagination in institutions 2016-04-09 11:34:35 +08:00
zhengxie
f40c1374b8 [sysadmin] Add force_password_change option on settings 2016-03-29 17:03:50 +08:00
zhengxie
3aa29e5b1f [inst] Add institution feature 2016-03-17 13:57:43 +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
lian
9e88a7281b update admin repo view check 2016-02-29 17:20:32 +08:00
zhengxie
b41e87efea Remove share quota 2016-02-24 14:20:28 +08:00
zhengxie
acb1a5e51e Use GB instead of GiB in filesizeformat and quota calculation 2016-02-24 11:53:32 +08:00
lian
fe593accf7 [seafadmin] not show system default repo at "all" tab page 2016-02-22 16:16:50 +08:00
lian
8124fa4a79 update admin default repo view page & rm unused code 2016-02-19 15:47:04 +08:00
zhengxie
602355381f [settings] Update pub repo creation and sync with folder 2016-02-17 16:00:53 +08:00
zhengxie
cc5af51dec Merge branch '5.0'
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
2016-02-02 12:19:46 +08:00
lian
905c81a57b not show sub-repo at web front page 2016-02-01 11:21:05 +08:00
lian
3d09dd9953 update seahub according to new seafile api 2016-01-27 15:52:33 +08:00
zhengxie
c4d743b134 Add setting to enable/disable organization repo creation 2016-01-21 13:55:52 +08:00
lian
a21a0840e1 show broken repo at user admin page 2016-01-19 16:35:12 +08:00
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd
[sysadmin] Force passwd change when add/reset user
2015-12-20 11:19:24 +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
054ef03687 [sysadmin] Force passwd change when add/reset user 2015-12-08 11:33:26 +08:00
zhengxie
808a5e186d [django1.8] Fix compatibility error in groups api and log export 2015-12-07 10:52:56 +08:00
lian
c8b84eb47f update sys admin repo view & user info test 2015-12-04 16:19:32 +08:00
zhengxie
f3732d87b6 Fix multiple user options bug, handle the case repo is None when delete 2015-12-04 11:15:34 +08:00
lian
7998a6e405 update translate 2015-12-03 18:05:20 +08:00
lian
8e2a744db6 update translate 2015-12-03 17:56:28 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
2015-12-02 17:37:50 +08:00
lian
427b51ae23 [user admin] add "groups" tab at user info page 2015-11-24 19:02:30 +08:00
zhengxie
479889c9a5 [sysadmin] Fix search repo error when name is None 2015-11-24 14:45:46 +08:00
lian
4bccc4abac udpate export excel 2015-11-24 13:19:58 +08:00
lian
97621875ac [sysadmin] export users/groups to excel 2015-11-21 10:49:00 +08:00
lian
61513e16f8 update list virus scan records 2015-11-18 10:18:34 +08:00
zhengxie
77aa0ae82e Merge branch '4.4'
Conflicts:
	seahub/templates/sysadmin/userinfo.html
	seahub/views/sysadmin.py
2015-10-27 11:44:08 +08:00
llj
3fa2ab6a38 Merge pull request #859 from haiwen/license
[sys-admin] check seafile license expiration
2015-10-24 18:27:20 +08:00
llj
96cbd7debc [sys-admin] license expiration: modification 2015-10-24 18:14:58 +08:00
zhengxie
7e42e9b8b2 Update get_emailusers rpc 2015-10-24 17:18:07 +08:00
lian
5d7761ee0f [sys-admin] check seafile license expiration 2015-10-24 15:53:02 +08:00
lian
06ebef7f86 update remove virus file 2015-10-22 15:40:15 +08:00
lian
a65f94656a [sys-admin] change http request from "GET" to "POST" 2015-10-22 10:14:57 +08:00
lian
c41ff45ea2 enable sysadmin view user's repo 2015-10-21 14:05:46 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4'
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
2015-10-20 10:27:27 +08:00
zhengxie
04bb5a60c1 Fix tests and fix bug in sudo mode 2015-10-19 18:34:29 +08:00
lian
4e2a380ac1 update SHARE_LINK_PASSWORD_MIN_LENGTH
1. add SHARE_LINK_PASSWORD_MIN_LENGTH to web setting page
2. update SHARE_LINK_PASSWORD_MIN_LENGTH check
2015-10-19 17:20:15 +08:00
zhengxie
1aa145e181 [share] Add owner checking for private file share 2015-10-14 17:01:28 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00
lian
fa95e64d87 update USER_PASSWORD_STRENGTH_LEVEL setting 2015-10-09 10:33:29 +08:00
zhengxie
2f0cbac7fe [sysadmin] Fix bugs 2015-09-28 15:11:55 +08:00
zhengxie
4ff4def9a6 [sysadmin] Change a few ops to POST 2015-09-28 14:37:42 +08:00
lian
668fdb7215 add ENBALE_ENCRYPT_LIBRARY setting 2015-09-24 17:20:45 +08:00
zhengxie
8fb5cbe5cb [sysadmin] Handle error when list paid users/org 2015-09-21 12:05:06 +08:00
lian
4baf74926b add seahub web settings page 2015-09-21 11:48:07 +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
xiez
74a15b211a Merge pull request #818 from haiwen/org
Org system admin
2015-09-18 13:21:12 +08:00