haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-31 22:57:47 +00:00
Code Issues Releases Wiki Activity
9,020 Commits 138 Branches 455 Tags 2.5 GiB
31a5e955cc
Commit Graph

692 Commits

Author SHA1 Message Date
lian
9bdbb1671a Add ENABLE_ADDRESSBOOK_OPT_IN setting 
Enable user to choose if show himself in global address book
 2017-09-11 11:13:59 +08:00
zming
74673d92b1 add unique reference and test 2017-09-09 18:00:22 +08:00
llj
45fb407368 Merge pull request #1784 from haiwen/admin-role-log 
add admin role/login feature
 2017-09-09 16:19:38 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
zMingGit
f9c16e95e1 performance, funciton name (#1795) 
* performance, funciton name

* middle

* depend with_repos, modify test
 2017-09-09 11:10:34 +08:00
xiez
0b973d854d Merge pull request #1789 from haiwen/ReferenceID 
[API] add user reference id
 2017-09-07 17:49:43 +08:00
zming
669beb936e add unique reference and test 2017-09-07 17:38:41 +08:00
zming
1044f11aea [API] add user reference id 2017-09-07 15:22:15 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00
zMingGit
24232c85f7 Profile default (#1793) 
* profile -> institution test

* fix
 2017-09-06 15:35:23 +08:00
zhengxie
c004100a8a Merge branch '6.1' 
Conflicts:
	seahub/urls.py
 2017-09-04 17:07:02 +08:00
lian
6ebbce5b76 use custom logo when send email 2017-08-31 14:43:25 +08:00
lian
1266e1b237 add admin users api 2017-08-28 14:52:28 +08:00
zming
160e0b3027 [API] share to admin permission 2017-08-26 10:38:12 +08:00
zming
b460d89f5a [test] pro -> master 2017-08-23 16:28:51 +08:00
zhengxie
21701ef3b3 Merge branch 'setLibHistory' 
Conflicts:
	seahub/urls.py
 2017-08-23 15:37:29 +08:00
zhengxie
60da1ed10a Merge branch '6.1' 2017-08-23 14:51:56 +08:00
zming
d0975c7836 migrate two-factor 2017-08-21 14:02:57 +08:00
zming
4133d33854 [api] fix setting don't work 2017-08-16 18:48:37 +08:00
zming
9dc68b75d0 [api] fix share to all groups test 2017-08-16 17:55:52 +08:00
zming
897eced17f restore-library test 2017-08-15 11:43:05 +08:00
Daniel Pan
d99e7b6270 Merge pull request #1738 from haiwen/restore-repo 
permission check, check whether repo is exists
 2017-08-14 15:09:25 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +08:00
lian
057b6960be check if is group member when share repo to group 2017-08-11 16:11:35 +08:00
zming
71976f998d [share-group] add judege of global config 2017-08-11 15:51:03 +08:00
xiez
49605e79ff Merge pull request #1743 from haiwen/master-sharing-groups 
[ share-repo ] can share repo to any groups
 2017-08-11 13:32:12 +08:00
zming
5d04ce0de2 [ share-repo ] can share repo to any groups 2017-08-10 17:35:39 +08:00
zming
9766983ae0 check permission 2017-08-10 15:47:43 +08:00
zMingGit
60c78adc44 [api2] stat_file (#1690) 
* [api2] stat_file

* [send message] update last login info

* datetime->data, return number to int

* fill data

* modify func args

* modify algorithm
 2017-08-09 18:14:00 +08:00
lian
630bc43136 batch mkdir 2017-08-08 16:39:53 +08:00
lian
45f0d9cd9a update parameter and tests 2017-08-04 15:01:55 +08:00
lian
e15f6c6737 batch copy folders 2017-08-04 10:55:33 +08:00
lian
44e2889abf update account test 2017-08-03 18:06:08 +08:00
xiez
2eb27af57f Merge pull request #1734 from haiwen/modify-tag-model 
modify tag model
 2017-08-03 17:38:06 +08:00
zming
0b3977a02e add unit test 2017-08-03 16:24:09 +08:00
xiez
622931dec4 Merge pull request #1739 from haiwen/shib_role_map 
[shibboleth] Add joker * in affiliation role map
 2017-08-02 18:32:22 +08:00
zhengxie
9a5aae50ab [shibboleth] Add joker * in affiliation role map 2017-08-02 18:31:15 +08:00
zming
5298d25b46 update response 2017-08-02 11:48:15 +08:00
zming
3ab3593fe9 permission check&check whether repo is exists 2017-08-01 15:37:09 +08:00
zming
466ef48116 [api] admin library history limit 2017-08-01 10:17:38 +08:00
zming
2164b717f6 [API2] RevisionTag 2017-07-31 10:54:46 +08:00
lian
259655b6bd update clear token 
clear token when inactive user, delete user, change user password
 2017-07-28 16:37:11 +08:00
zming
d597623b14 update test_get_enabled_role_permissions_by_role 2017-07-28 11:17:24 +08:00
zming
d28e597921 [API2] ReversionTag 2017-07-21 12:30:55 +08:00
Daniel Pan
4c776b0f17 Merge pull request #1705 from haiwen/org-user-info 
update admin org user api
 2017-07-20 14:07:48 +08:00
zming
423a3f0e25 Merge branch 'clear-invitations' into 6.1 2017-07-15 17:52:08 +08:00
zming
9e1fb76166 update invalid args 2017-07-15 17:46:46 +08:00
lian
f62a206ed8 update admin org user api 2017-07-15 16:00:30 +08:00
xiez
64832adc03 Merge pull request #1674 from haiwen/license 
license
 2017-07-15 15:37:06 +08:00
zhengxie
b1e9f5beb3 reload license when updated and update tests 2017-07-15 15:28:41 +08:00
xiez
0de932bec9 Merge pull request #1703 from haiwen/two-factor-auth 
Two factor auth
 2017-07-15 13:48:33 +08:00
zming
c0f512aca6 update test 2017-07-15 12:24:52 +08:00
zming
f51d8122e9 rm expire invitations 2017-07-13 15:41:30 +08:00
zming
c2873b9112 two-factor-auth 2017-07-13 10:55:10 +08:00
zming
b8a4a12880 file tag 2017-07-11 17:45:39 +08:00
lian
a77ab79e91 add size when admin get file share link info 2017-07-10 11:22:39 +08:00
zhengxie
f55d23b095 Merge branch '6.1' 2017-07-06 10:47:39 +08:00
lian
3e81a5b8a8 add dir detail api 2017-07-04 14:07:26 +08:00
xiez
1c08c67d24 Merge pull request #1672 from haiwen/system-lib 
add admin system library upload api
 2017-07-03 14:55:45 +08:00
lian
46a5473326 add amdin system library upload api 2017-07-03 14:42:12 +08:00
xiez
0100d6da8b Merge pull request #1675 from haiwen/multi-copy-move 
update multi copy/move dirents api
 2017-07-03 13:12:51 +08:00
lian
0f32bf26fe update multi copy/move dirents api 2017-07-03 12:24:07 +08:00
zhengxie
da4918d7a9 [tests] Update phantomjs installation 2017-07-03 11:22:59 +08:00
zming
734766391a [api2] get deleted-repos,and restore deleted-repos 2017-06-30 16:22:29 +08:00
fanghao
3149a4d49d license 2017-06-30 15:35:31 +08:00
zhengxie
bb8f04993d Merge branch '6.1' 
Conflicts:
	seahub/api2/views.py
 2017-06-30 14:27:07 +08:00
xiez
1ef77ef036 Merge pull request #1661 from haiwen/normalize_path 
normalize file/dir path
 2017-06-27 18:08:10 +08:00
lian
070f68e3e4 add get repo info api for v2.1 2017-06-27 17:23:10 +08:00
lian
2e5d8bc1ed update get repo info api 
add `file_count` and rm `desc`
 2017-06-27 16:32:19 +08:00
lian
68c5e764d6 normalize file/dir path 
1. Add '/' at the end of directory path if necessary.
1. And make sure path starts with '/'
 2017-06-27 11:34:09 +08:00
zhengxie
eb2719fc59 [api] Add repo last modifier and add cache for memcache ops 2017-06-23 11:30:01 +08:00
zhengxie
966e0bcb9c [api] Improve dir list performance 2017-06-22 15:38:59 +08:00
lian
9750e8baaf add admin share/upload links api 
1. get share/upload link info by token
1. get dirents of shared dir
1. get download/upload fileserver url of shared file/dir
1. check share/upload link password
 2017-06-21 15:15:24 +08:00
lian
74b8272047 rm unused info when get repo list via api 2017-06-20 11:08:26 +08:00
lian
179e2ebc72 update mkdir api 2017-06-20 10:51:45 +08:00
xiez
b487ca463b Merge pull request #1636 from haiwen/file-modifier 
[api] file modifier
 2017-06-19 15:38:39 +08:00
zhengxie
e939f942e3 Fix travis test 2017-06-19 15:30:22 +08:00
zming
3edfe92f60 [api] file modifier 2017-06-19 14:52:16 +08:00
zhengxie
e5747a1e67 Fix permission in shared file 2017-06-17 16:19:46 +08:00
zhengxie
5e20cd58fa Update share file permissions 2017-06-17 15:50:17 +08:00
zhengxie
12940b3219 Merge branch '6.1' 2017-06-17 11:07:43 +08:00
xiez
5f666ad754 Merge pull request #1601 from haiwen/share-link 
Share link
 2017-06-17 11:07:02 +08:00
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
xiez
f2fc7a451d Merge pull request #1626 from haiwen/api_whitelist 
Api whitelist
 2017-06-07 16:44:44 +08:00
xiez
4c02004220 Merge pull request #1622 from haiwen/delete-files 
update delete multi file api
 2017-06-07 16:41:55 +08:00
zhengxie
c99d3b4035 [tests] Fix tests 2017-06-06 12:11:05 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
lian
1bd70c2f53 update delete multi file api 2017-06-05 17:17:28 +08:00
zming
e26d5b6aa8 [throtting] Add whitelist of throtting 2017-06-05 15:54:08 +08:00
lian
7c9ff51a65 update test of file history api 2017-06-05 11:41:03 +08:00
zhengxie
e9de086db3 Merge branch '6.1' 2017-06-03 11:21:08 +08:00
llj
f7ed342e2d Merge pull request #1593 from haiwen/custom 
admin update logo/favicon
 2017-05-27 16:50:54 +08:00
lian
e1d0169e64 update admin log 
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
 2017-05-23 16:05:51 +08:00
zhengxie
f79159f9d6 Merge branch '6.0' into 6.1 2017-05-23 11:01:55 +08:00
xiez
df2de123ab Merge pull request #1590 from haiwen/encode-utf-8 
not encode utf-8 when do some file/dir operation
 2017-05-23 11:01:15 +08:00
zhengxie
ecb26403ac Merge branch '6.1' 2017-05-23 10:44:06 +08:00
zhengxie
1f7880ebc1 Merge branch '6.0' into 6.1 
Conflicts:
	seahub/urls.py
 2017-05-23 10:38:49 +08:00
zming
1ed03f96e1 [API2] add login_id field, and test case 
[api] update account and test

[template] increase the function of modifying logind

[review] trans

[review] trans again
 2017-05-22 15:33:50 +08:00
zhengxie
133522487a [api2] Add permissions to share link creation api 2017-05-18 17:32:28 +08:00
lian
0ca018fcf4 add admin create repo api 2017-05-18 10:43:31 +08:00
lian
2b1ae5b921 admin update logo/favicon 2017-05-17 16:59:38 +08:00
lian
0d4bdedb37 update user avatar 2017-05-13 16:16:34 +08:00
lian
610d607846 Revert "add create user avatar api" 
This reverts commit 3483783a28.
 2017-05-13 15:51:48 +08:00
Daniel Pan
2461f86211 Merge pull request #1588 from haiwen/repos-api 
add v2.1 repos api
 2017-05-13 11:04:34 +08:00
lian
f062ed4be4 add v2.1 repos api 
batch share repos to user/group
 2017-05-13 09:43:24 +08:00
lian
52f9a6a82f not encode utf-8 when do some file/dir operation 2017-05-13 07:38:55 +08:00
lian
3483783a28 add create user avatar api 2017-05-12 18:16:59 +08:00
zhengxie
b2b9495a35 [share] Add permission field to FileShare model 2017-05-05 15:35:56 +08:00
zhengxie
0c732638eb Merge branch '6.0' 2017-05-04 10:31:49 +08:00
xiez
d4fc5275e6 Merge pull request #1563 from haiwen/share-test 
update dir share item api test
 2017-04-28 15:16:40 +08:00
zhengxie
5c998cdb03 Merge branch '6.0' 2017-04-28 13:35:49 +08:00
zhengxie
764a63e705 Update sso login 2017-04-26 10:28:33 +08:00
lian
28c7fb5703 update dir share item api test 
test share failed when share the same item to the same user/group
 2017-04-25 16:12:56 +08:00
lian
bd0bbf3121 add test for file ops api 2017-04-25 15:54:42 +08:00
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
zhengxie
0c61a22100 Fix tests 2017-04-17 16:37:23 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +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
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
lian
132d181c3a update repo history api 
add 'name' and 'contact_email' to result
 2017-04-11 17:44:17 +08:00
lian
756ccf1303 add api 
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
 2017-04-10 17:23:34 +08:00
lian
af4b430572 Revert "Fix tests" 
This reverts commit 375b270b53.
 2017-04-07 10:10:17 +08:00
lian
7de34634a0 Revert "Update Django to 1.8.18" 
This reverts commit 928cf4a09c.
 2017-04-07 10:09:59 +08:00
zhengxie
375b270b53 Fix tests 2017-04-06 17:01:58 +08:00
zhengxie
928cf4a09c Update Django to 1.8.18 2017-04-06 14:13:32 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
lian
1f3b597336 add test for admin libraires api 2017-03-27 15:05:40 +08:00
zhengxie
f40aa6341b Update code styles 2017-03-27 13:58:12 +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
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
8286f73331 add api of amdin manage org user 2017-03-09 16:42:09 +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
b7cad9a707 add api of admin create default repo for common user 2017-02-17 11:46:37 +08:00
lian
fefb450b76 update api of out shared repos/folders 
return contact email when get info of out shared repos/folders
 2017-02-15 13:56:41 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00
lian
2b43226d08 Merge pull request #1475 from haiwen/odf-view 
[ODF] modified file view for ODF; fix bugs
 2017-02-13 16:49:12 +08:00
Daniel Pan
f0a610cf69 Merge pull request #1480 from haiwen/search-user 
update search user
 2017-02-13 16:48:26 +08:00
lian
c904884526 update search user 
user can search if he/she has no permission of using global address book
 2017-02-13 16:03:31 +08:00
llj
5802a37628 [ODF] update test 2017-02-13 15:54:14 +08:00
xiez
801ec6455e Merge pull request #1479 from haiwen/virus 
Virus
 2017-02-13 13:36:31 +08:00
zhengxie
2cb9d4c753 [notification] Update virus scan notice 2017-02-13 11:37:53 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group 
udpate admin groups page
 2017-02-09 18:11:09 +08:00
lian
5743c3879e update admin import user from csv file 2017-02-09 17:58:04 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
287257dd7c force change password after batch add user 2017-02-07 17:45:36 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00
lian
9848514e7d update test 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
zhengxie
622fe2705e Fix reset email message 2017-01-17 16:08:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
19beb9a7c8 [tests] Fix user reset 2017-01-17 12:01:03 +08:00
zhengxie
df70fd1b5e Use contact email in password resetting 2017-01-16 15:46:00 +08:00
lian
2ecae4162b update remove folder permission 
not check path existence when delete user/group folder permission
 2017-01-13 16:54:38 +08:00
lian
53d09bae5e update account api 
remove 'note' releated operation
 2017-01-07 17:00:16 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
xiez
9a9b6eb9e1 Merge pull request #1429 from haiwen/useradmin 
Useradmin
 2017-01-06 14:01:59 +08:00
lian
625db696af use api to set user quota/profile 2017-01-05 13:33:12 +08:00
Daniel Pan
65325da7de Merge pull request #1434 from haiwen/fix/group_wiki 
Fix group wiki for system admin
 2016-12-26 14:38:21 +08:00
zhengxie
b92a370658 Fix group wiki for system admin 2016-12-26 14:18:29 +08:00
Daniel Pan
c28f684c22 Merge pull request #1428 from haiwen/enhancement/invitation 
[invitation] Check duplicated accepter and add blocklist for accepter
 2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
xiez
048d6df0ba Merge pull request #1388 from haiwen/new-user 
check if user num exceed limit before add user
 2016-11-05 13:49:23 +08:00
lian
34a350d623 check if user num exceed limit before add user 2016-11-05 12:09:58 +08:00
lian
41dbebaa86 check if repo/folder exist before upload/update file 2016-11-02 18:04:59 +08:00
lian
7a2ad81be2 fix bug when admin searching unexisting user 2016-11-01 11:45:32 +08:00
lian
74b5e840db filter out sub repos 2016-09-22 11:32:21 +08:00
lian
58737d62f7 update revert file/dir 2016-09-13 11:16:12 +08:00
zhengxie
f4253ad806 [role perm] Update settings of role permissions 2016-09-05 15:16:31 +08:00
zhengxie
de9f8a0aea [invitations] Fix mail and role 2016-09-05 10:37:18 +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
lian
b66e1b8364 reshare repo to user/group/pub when admin transfer a repo 2016-08-18 17:49:12 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
xiez
929731ec0d Merge pull request #1318 from haiwen/feature/virus_check 
Add virus check when upload files to upload link
 2016-08-09 11:28:26 +08:00
zhengxie
c255735326 Fix api error when 2fa enabled 2016-08-08 15:59:19 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
zhengxie
bfbd6f05a5 Add virus check when upload files to upload link 2016-08-04 16:09:05 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
Daniel Pan
02a8ae394b Merge pull request #1290 from haiwen/admin-groups 
new admin groups page
 2016-07-26 15:52:42 +08:00
xiez
126da528b5 Merge pull request #1295 from haiwen/fix/api2 
[api2] Add "created at" field in token V2
 2016-07-21 13:23:17 +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
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
Shuai Lin
aa41bb9bc3 travis ci: download phantomjs from bintray instead of bitbucket. 2016-05-17 11:11:18 +08:00
zhengxie
2e4839dcf1
[test] Update test 2016-05-13 16:17:55 +08:00
lian
97a39ead0d remember username when upload file from upload-link 2016-05-13 14:46:20 +08:00
Daniel Pan
671186dd60 Merge pull request #1163 from haiwen/full-screen 
Full screen
 2016-05-12 10:57:20 +08:00
llj
35f7389227 layout: fix pages; rm unused code & files 2016-05-10 17:11:35 +08:00
lian
e71ca6d84b unset admin after transfer success 2016-05-06 14:52:28 +08:00
zhengxie
03ed21d8f4 [tests] Update shared files 2016-04-29 17:41:50 +08:00
lian
65dc2ff54b add admin clean device errors api 2016-04-29 15:32:57 +08:00
lian
419645fdc2 add download multi dirents api 2016-04-28 15:16:58 +08:00