Daniel Pan
|
c042f4ba2c
|
Merge pull request #1006 from haiwen/repo-folder-perm
[api] add repo user/group folder perm api
|
2016-01-27 11:24:14 +08:00 |
|
lian
|
08f929eb35
|
[api] add repo user/group folder perm api
|
2016-01-27 09:58:20 +08:00 |
|
Daniel Pan
|
d8a4b16a5b
|
Merge pull request #1000 from haiwen/repo-share-link-api
[api] add repo share link api
|
2016-01-23 13:20:20 +08:00 |
|
xiez
|
9455f3a03f
|
Merge pull request #997 from haiwen/remove-pubfile
Remove group pub file
|
2016-01-22 10:54:47 +08:00 |
|
lian
|
a84c603168
|
[api] add repo share link api
|
2016-01-20 16:29:46 +08:00 |
|
Daniel Pan
|
06a8426f67
|
Merge pull request #1002 from haiwen/update-repo-history-limit
[api2] update repo history limit
|
2016-01-20 12:09:41 +08:00 |
|
lian
|
fd01c06802
|
[api2] update repo history limit
still can get limit days if history limit setting not enabled
|
2016-01-20 11:46:17 +08:00 |
|
Daniel Pan
|
5ee27c138b
|
Merge pull request #1001 from haiwen/useradmin
show broken repo at user admin page
|
2016-01-19 20:26:10 +08:00 |
|
lian
|
a21a0840e1
|
show broken repo at user admin page
|
2016-01-19 16:35:12 +08:00 |
|
Daniel Pan
|
cac889406a
|
Merge pull request #996 from haiwen/repo-history-limit-api
[api] add repo history limit api
|
2016-01-16 14:57:57 +08:00 |
|
Daniel Pan
|
624cc00133
|
Merge pull request #998 from haiwen/update-err-msg
update err msg of share dir item endpoint
|
2016-01-16 14:44:26 +08:00 |
|
lian
|
c7c05ee1be
|
update err msg of share dir item endpoint
|
2016-01-15 13:32:59 +08:00 |
|
zhengxie
|
f18e4c133f
|
[api2] Remove some fields from token v2
|
2016-01-15 13:28:37 +08:00 |
|
zhengxie
|
6d1e5e9884
|
Fix tokenv2 error when platform_version is empty
|
2016-01-15 12:27:38 +08:00 |
|
Daniel Pan
|
f9ffaab4be
|
Merge pull request #945 from haiwen/search-user
Search user
|
2016-01-14 13:36:40 +08:00 |
|
lian
|
0e43a099ff
|
[api] update search user api
|
2016-01-14 13:10:24 +08:00 |
|
llj
|
5f3c030a52
|
['search user'] select2: enable 'directly enter email'
* the separator is 'Enter', i.e., clicking the Enter key
|
2016-01-14 11:42:28 +08:00 |
|
lian
|
267798b3f1
|
[api] add repo history limit api
|
2016-01-14 11:35:15 +08:00 |
|
Daniel Pan
|
d88d93cc99
|
Remove group pub file
|
2016-01-14 10:41:24 +08:00 |
|
Daniel Pan
|
2fe8ed0cfb
|
Merge pull request #988 from haiwen/transfer-repo-api
[api2] add transfer repo api
|
2016-01-13 18:11:54 +08:00 |
|
lian
|
3c21b354be
|
[api] add transfer repo api
|
2016-01-13 17:58:59 +08:00 |
|
Daniel Pan
|
feb6f783a9
|
Merge pull request #992 from haiwen/group_info
[group info] remove unused code & files, and other modification
|
2016-01-13 16:25:08 +08:00 |
|
Daniel Pan
|
35bec4b59f
|
Merge pull request #995 from haiwen/group_fix
show group name in path for 'group dir view'; fix updateGroups in sid…
|
2016-01-13 16:24:22 +08:00 |
|
llj
|
53fddee277
|
[group dir view] modification
|
2016-01-13 16:04:04 +08:00 |
|
llj
|
13ea3fcb6a
|
show group name in path for 'group dir view'; fix updateGroups in side-nav.js
|
2016-01-13 14:54:46 +08:00 |
|
zhengxie
|
5cc1c14e5e
|
[api2] Use custom UserRateThrottle
|
2016-01-13 10:37:11 +08:00 |
|
zhengxie
|
cf3d96b46a
|
Merge branch '5.0'
Conflicts:
media/css/sf_font2/seafile-font2.eot
media/css/sf_font2/seafile-font2.ttf
media/css/sf_font2/seafile-font2.woff
requirements.txt
seahub/api2/endpoints/dir_shared_items.py
seahub/templates/js/templates.html
seahub/views/ajax.py
static/scripts/app/views/group-repo.js
|
2016-01-13 10:19:56 +08:00 |
|
llj
|
bf26f9c2a3
|
Merge pull request #983 from haiwen/repo-trash
batch load repo/dir trash
|
2016-01-12 17:44:50 +08:00 |
|
lian
|
9907b3b875
|
use include repo_dir_trash_tr.html
|
2016-01-12 17:33:38 +08:00 |
|
llj
|
198c563387
|
fix for 'trash view' & 'repo history view', modified 'view shared dir'
Conflicts:
seahub/templates/repo_dir_recycle_view.html
|
2016-01-12 16:43:23 +08:00 |
|
lian
|
43a73813a6
|
update batch get repo/dir trash file
|
2016-01-12 14:40:50 +08:00 |
|
lian
|
e75b1891e2
|
batch load repo/dir trash
|
2016-01-12 10:19:34 +08:00 |
|
Daniel Pan
|
e669b7e7e8
|
Merge pull request #989 from haiwen/remove-unused-api
Remove unused APIs
|
2016-01-11 20:08:28 +08:00 |
|
lian
|
115bcfb54c
|
[api] remove more unused group/user messages code
|
2016-01-11 18:23:44 +08:00 |
|
Daniel Pan
|
5093cd5638
|
Merge pull request #991 from haiwen/clean-geturl
Clean getUrl() in common.js
|
2016-01-11 16:35:49 +08:00 |
|
Daniel Pan
|
6592cfa747
|
Clean getUrl() in common.js
|
2016-01-11 16:12:30 +08:00 |
|
Daniel Pan
|
b9eba9f1d2
|
Merge pull request #993 from haiwen/font_icon
[seafile-font2] update icon files
|
2016-01-11 16:01:13 +08:00 |
|
llj
|
4624a3a1a1
|
[seafile-font2] update icon files
|
2016-01-11 15:20:10 +08:00 |
|
llj
|
5afb6c56b6
|
[group info] remove unused code & files, and other modification
|
2016-01-11 14:42:25 +08:00 |
|
Daniel Pan
|
eb3ee08905
|
Merge pull request #990 from haiwen/group_settings
Group settings
|
2016-01-11 12:15:48 +08:00 |
|
llj
|
8337812bae
|
[group manage] remove unused code and file
|
2016-01-11 11:58:16 +08:00 |
|
Daniel Pan
|
af0ab3e221
|
Remove unused APIs
Group messages and personal messages related API is no longer used
|
2016-01-11 00:02:17 +08:00 |
|
Daniel Pan
|
356fced992
|
Merge pull request #987 from haiwen/rm-file-view-msg
rm send "file-view" msg
|
2016-01-09 18:04:50 +08:00 |
|
Daniel Pan
|
c9fc63ae02
|
Merge pull request #986 from haiwen/check-audit-conf
check if audit enabled
|
2016-01-09 17:02:05 +08:00 |
|
llj
|
0c86fb539c
|
[group settings] complete 'import members'
|
2016-01-09 16:50:46 +08:00 |
|
lian
|
a7458622b7
|
check if audit enabled
|
2016-01-09 16:40:39 +08:00 |
|
Daniel Pan
|
fcfb24445e
|
Merge pull request #985 from haiwen/update-grp-api-err-msg
update new group api err msg
|
2016-01-09 15:00:24 +08:00 |
|
lian
|
49ead4e079
|
update new group api err msg
|
2016-01-09 14:36:42 +08:00 |
|
llj
|
ec6679e448
|
add 'updateGroups' for side-nav, and other improvement
|
2016-01-09 14:35:16 +08:00 |
|
xiez
|
5910dd6653
|
Merge pull request #967 from haiwen/check-share-link-passwd
update share link access check
|
2016-01-09 11:23:16 +08:00 |
|