zhengxie
|
a8bf96d2e2
|
Disable cache when testing
|
2016-01-21 15:45:35 +08:00 |
|
zhengxie
|
c4d743b134
|
Add setting to enable/disable organization repo creation
|
2016-01-21 13:55:52 +08:00 |
|
zhengxie
|
94b6818475
|
Add trans context in "Organization" string
|
2016-01-15 13:50:33 +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
|
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 |
|
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 |
|
lian
|
a7458622b7
|
check if audit enabled
|
2016-01-09 16:40:39 +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 |
|
lian
|
0d1bff5f0a
|
update share link access check
|
2016-01-08 14:38:50 +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 |
|
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 |
|
llj
|
5a167488e7
|
[shared file view] bugfix for path in the download link
|
2015-12-31 10:50:15 +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 |
|
Daniel Pan
|
32f001d9b1
|
Merge pull request #971 from haiwen/revert-970-view_lib_file
Revert "use "view_lib_file" instead of "view_repo_file""
|
2015-12-28 16:33:22 +08:00 |
|
Daniel Pan
|
4a6f2176c3
|
Revert "use "view_lib_file" instead of "view_repo_file""
|
2015-12-28 16:33:02 +08:00 |
|
Daniel Pan
|
a2d895e556
|
Merge pull request #970 from haiwen/view_lib_file
use "view_lib_file" instead of "view_repo_file"
|
2015-12-28 16:30:01 +08:00 |
|
lian
|
6732b56d3e
|
use "view_lib_file" instead of "view_repo_file"
|
2015-12-28 15:22:33 +08:00 |
|
zhengxie
|
c0d3d02341
|
Merge branch '4.4' into 5.0
|
2015-12-28 10:47:34 +08:00 |
|
xiez
|
9a98ef8f65
|
Merge pull request #966 from haiwen/beshared-api-fix
[api2] fix share type info in "be shared" repos api
|
2015-12-28 10:44:11 +08:00 |
|
zhengxie
|
042956c5a5
|
Merge branch '4.4' into 5.0
|
2015-12-28 10:36:30 +08:00 |
|
Daniel Pan
|
26029be96e
|
Merge pull request #968 from haiwen/search-user-insensitive
[api2] search user insensitive
|
2015-12-26 14:22:20 +08:00 |
|
lian
|
a722448548
|
[api2] search user insensitive
|
2015-12-25 17:35:05 +08:00 |
|
Daniel Pan
|
23dba997f1
|
Merge pull request #956 from haiwen/show-broken-repo
show broken repo at my owned repo list page
|
2015-12-25 17:23:46 +08:00 |
|
lian
|
e81ae994e3
|
show broken repo at my owned repo list page
|
2015-12-25 16:26:06 +08:00 |
|
Daniel Pan
|
79c0628826
|
Merge pull request #955 from haiwen/view_repo_file
[clean code] remove view_repo_file function
|
2015-12-25 16:12:20 +08:00 |
|
lian
|
58550e3e59
|
[api2] fix share type info in "be shared" repos api
|
2015-12-24 14:53:29 +08:00 |
|
llj
|
c05c370e5a
|
[office convert] bugfix for file path
|
2015-12-24 11:54:36 +08:00 |
|
Daniel Pan
|
682980bbb7
|
Merge pull request #965 from haiwen/grid_view_popup
[view shared dir] grid view: show magnificPopup when click images
|
2015-12-23 22:15:58 +08:00 |
|
llj
|
631d6808f7
|
[view shared dir] grid view: show magnificPopup when click images
|
2015-12-23 20:41:53 +08:00 |
|
xiez
|
340d30044d
|
Merge pull request #964 from haiwen/delete-be-shared-repo
[api] add delete be shared repo api
|
2015-12-23 19:05:51 +08:00 |
|
lian
|
bbb9e8664e
|
[api] add delete be shared repo api
|
2015-12-23 18:53:12 +08:00 |
|
xiez
|
f069f06aff
|
Merge pull request #963 from haiwen/add-group-api
[api-v2.1] update add new group api
|
2015-12-23 18:00:20 +08:00 |
|
lian
|
3908593c66
|
[api-v2.1] update add new group api
|
2015-12-23 17:52:57 +08:00 |
|
xiez
|
6dd42d4f7e
|
Merge pull request #962 from haiwen/shared-upload-links
[api2] Add list shared upload links
|
2015-12-23 17:38:33 +08:00 |
|
zhengxie
|
1672bbd5ff
|
[api2] Add list shared upload links
|
2015-12-23 17:31:07 +08:00 |
|
xiez
|
0e9378b9a9
|
Merge pull request #959 from haiwen/share-dir-fix
[api2] fix repo owner check when org user share dir
|
2015-12-23 16:19:52 +08:00 |
|
Daniel Pan
|
7dcd3c20ef
|
Merge pull request #960 from haiwen/font_icon_fix
[seafile-font2] update 'share' icon for windows, and updated 'delete'…
|
2015-12-23 14:51:13 +08:00 |
|
llj
|
03d27d516d
|
[seafile-font2] update 'share' icon for windows, and updated 'delete' & 'download'
|
2015-12-23 14:45:23 +08:00 |
|