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

651 Commits

Author SHA1 Message Date
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
zhengxie
f1aaea96f1 [api2] Add "created at" field in token V2 2016-07-20 16:02:17 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
lian
efdc55ffd3 rm joined groups from middleware (#1287)
* rm joined groups from middleware

* rm "base_template" code from context_processors.py

* clean unused group add code
2016-07-18 18:30:50 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
lian
fe236eca03 [api] rm virtual repo related code (#1279) 2016-07-13 17:34:16 +08:00
lian
fcd3e836e3 [api] return licensed to info when get sysinfo 2016-07-13 16:31:05 +08:00
lian
70adf6d552 [sysadmin] add search user by name & contact email 2016-07-13 11:22:36 +08:00
lian
8f1dbb7ea3 update search user api 2016-07-12 15:04:36 +08:00
lian
4f43f31468 [api] update license info 2016-07-11 12:08:44 +08:00
lian
d89c3bd906 update create dir sub repo api 2016-07-08 10:15:13 +08:00
zhengxie
decb3615ed Enable institution admin to toggle user status 2016-07-06 15:57:41 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
lian
369c9f3bf8 update share/upload link test 2016-07-01 17:06:27 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
lian
ed10512a53 update repo share
1. reshare repo after user/admin transfer repo
2. show org repo share out list at share popup in org mode
2016-06-28 16:49:41 +08:00
zhengxie
528b33ec0e Add role permissions 2016-06-27 16:41:55 +08:00
lian
38c5485dd5 update admin device test 2016-06-27 11:59:01 +08:00
lian
2f35cd01a9 update ajax get download link & update test (#1259) 2016-06-25 15:54:06 +08:00
zhengxie
7b3f3a429b Fix tests 2016-06-25 12:02:09 +08:00
Daniel Pan
cf1017513a Code clean (#1217)
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
lian
8de5551991 update file api
1. return checked file name when creat a new file
2. update test
2016-06-20 18:19:53 +08:00
lian
3716c76750 [api-2.1] update file/dir api 2016-06-17 18:26:35 +08:00
zhengxie
798a69d6db Fix invalid email in register issue, https://github.com/haiwen/seafile/issues/1672 2016-06-14 14:22:59 +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
2e5016b1a3 [test] Update dir_shared_items 2016-06-13 10:50:26 +08:00
Daniel Pan
ad47cedfd8 Merge pull request #1232 from haiwen/enhancement/inst_admin
[inst] Add search user and list admins
2016-06-12 17:12:00 +08:00
zhengxie
3fac2a79c2 [inst] Add search user and list admins 2016-06-08 16:56:52 +08:00
Daniel Pan
6e2a275762 Merge pull request #1227 from haiwen/fix/add_group_member_notice
Nofity user when add group member
2016-06-07 11:32:23 +08:00
zhengxie
43e1136896 Fix anonymous user issue in get repos 2016-06-07 11:10:21 +08:00
zhengxie
4281f0ec57 Nofity user when add group member 2016-06-06 15:06:05 +08:00
zhengxie
00661b9be1 Add notification when comment a file 2016-06-04 17:25:27 +08:00
lian
8b5446c05d update test 2016-05-30 18:14:21 +08:00
lian
cb7414be67 update permission check when set an exist repo as personal/gorup wiki repo 2016-05-30 10:53:23 +08:00
lian
3ae74298b3 update permission check of share/upload link 2016-05-30 10:52:58 +08:00
Daniel Pan
f2e1ebcb26 Merge pull request #1212 from haiwen/enhancement/constance
Add setting to enable/disable constance(web settings)
2016-05-27 11:11:34 +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
zhengxie
0936f360bd Fix clear login attempts bug, and update login tests 2016-05-26 11:38:49 +08:00
zhengxie
2f3091093c Fix comment author issue 2016-05-25 11:48:09 +08:00
zhengxie
fe999b7559 [api2] Add user info to file comment obj 2016-05-23 17:51:23 +08:00
zhengxie
c19b781713 [file comment] Fix hash bug and improve sql 2016-05-23 17:51:23 +08:00
zhengxie
e8579d0742 [api] Add file comment endpoints 2016-05-23 17:51:23 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1'
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
2016-05-21 13:42:04 +08:00
lian
e4ac653e34 return head commit id info from repos api 2016-05-21 12:12:01 +08:00
lian
160963c272 update audit when view file via shared dir 2016-05-18 17:11:56 +08:00
zhengxie
c4fb7d51b4 [tests] Update tests 2016-05-17 18:14:17 +08:00
zhengxie
f12215ec5e [shib] Fix shib complete url bug 2016-05-17 17:48:57 +08:00