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 |
|
Daniel Pan
|
e1981509c6
|
Merge pull request #984 from haiwen/import-grp-member
ajax import group members
|
2016-01-08 15:49:59 +08:00 |
|
Daniel Pan
|
9ec433555f
|
Merge pull request #980 from haiwen/group_settings
Group settings
|
2016-01-08 15:30:42 +08:00 |
|
lian
|
91211a683b
|
ajax import group members
|
2016-01-08 15:26:15 +08:00 |
|
lian
|
0d1bff5f0a
|
update share link access check
|
2016-01-08 14:38:50 +08:00 |
|
llj
|
bda85406ca
|
[group settings] manage members: added 'add multi members once' and other improvement
|
2016-01-08 12:18:33 +08:00 |
|
Daniel Pan
|
cfcef3d7ad
|
Merge pull request #982 from haiwen/update-search-user-test
update insensitive search user test
|
2016-01-07 11:33:13 +08:00 |
|
lian
|
00444eee9e
|
update insensitive search user test
|
2016-01-07 11:14:09 +08:00 |
|
Daniel Pan
|
7897bf55f6
|
Merge pull request #981 from haiwen/update-grp-api-test
update group api test
|
2016-01-06 20:15:49 +08:00 |
|
lian
|
44d176a45c
|
update group api test
|
2016-01-06 19:12:24 +08:00 |
|
llj
|
e9150cf555
|
add 'group settings'
|
2016-01-06 16:46:25 +08:00 |
|
lian
|
0ee41ce8f3
|
Merge pull request #976 from haiwen/improve-error-message
Improve error message
|
2016-01-06 15:25:46 +08:00 |
|
lian
|
ed1b3204e0
|
Improve error message
Use 404 when repo/group not found
|
2016-01-06 15:25:00 +08:00 |
|
Daniel Pan
|
f2eae5044e
|
Merge pull request #979 from haiwen/grp-perm-check
update perm check of group related api
|
2016-01-06 11:52:28 +08:00 |
|
lian
|
a80126c344
|
update perm check of group related api
|
2016-01-05 17:41:04 +08:00 |
|
zhengxie
|
100e264ec9
|
Enable LOGIN_URL to be configured
|
2016-01-05 12:07:58 +08:00 |
|
lian
|
a792120eb7
|
rm send "file-view" msg
|
2016-01-04 16:41:17 +08:00 |
|
Shuai Lin
|
a56c116451
|
fix travis ci
|
2016-01-04 13:17:13 +08:00 |
|
Daniel Pan
|
f348dfb717
|
Merge pull request #977 from haiwen/update-grp-api
update grp api & add group members api
|
2015-12-31 15:26:24 +08:00 |
|
lian
|
ea963bb531
|
update grp api & add group members api
|
2015-12-31 12:58:48 +08:00 |
|
llj
|
5a167488e7
|
[shared file view] bugfix for path in the download link
|
2015-12-31 10:50:15 +08:00 |
|
Daniel Pan
|
71ed6fb43c
|
Improve error message
|
2015-12-31 10:13:17 +08:00 |
|
Daniel Pan
|
6d18089fda
|
Merge pull request #973 from haiwen/revert
Revert
|
2015-12-28 17:36:42 +08:00 |
|
lian
|
a17025d158
|
Revert "clean code. remove view_repo_file function"
This reverts commit d91bdd6305.
|
2015-12-28 17:33:14 +08:00 |
|
lian
|
cf371d5778
|
Revert "[clean code] remove "repo_view_file""
This reverts commit a2d09980dc.
|
2015-12-28 17:32:41 +08:00 |
|
Daniel Pan
|
063bc3807d
|
Merge pull request #972 from haiwen/view_lib_file
[clean code] remove "repo_view_file"
|
2015-12-28 16:36:54 +08:00 |
|
lian
|
a2d09980dc
|
[clean code] remove "repo_view_file"
|
2015-12-28 16:34:17 +08:00 |
|