1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 15:35:35 +00:00
Commit Graph

5247 Commits

Author SHA1 Message Date
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
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
lian
b53764a24a [api2] fix repo owner check when org user share dir 2015-12-23 13:35:22 +08:00
Daniel Pan
a7a5592640 Merge pull request #954 from haiwen/thumbnail-fix
generate real image path when get thumbnail from share link
2015-12-23 10:50:01 +08:00
lian
a116cfaf99 generate real image path when get thumbnail from share link 2015-12-22 13:57:51 +08:00
lian
d91bdd6305 clean code. remove view_repo_file function 2015-12-21 14:13:45 +08:00
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd
[sysadmin] Force passwd change when add/reset user
2015-12-20 11:19:24 +08:00
Daniel Pan
9e855459eb Merge pull request #930 from haiwen/post_office
Add post_office app, and send async email to imported csv users
2015-12-20 11:17:41 +08:00
Daniel Pan
d9f73f8610 Merge pull request #952 from haiwen/view-raw-file
add comment for view_raw_file function
2015-12-19 14:54:22 +08:00
lian
4f18dd71d3 add comment for view_raw_file function 2015-12-19 14:39:13 +08:00
llj
800856e305 [backbone] remove unused code and files 2015-12-19 13:51:38 +08:00
llj
13486afe57 [add group] fix: modified param name according to the api 2015-12-19 10:29:05 +08:00