lian
2c2bf4f98f
file lock
2015-07-20 13:50:42 +08:00
patrickgao
7f5a1f012d
generate a random password
2015-07-20 11:15:07 +08:00
llj
d3097a6acf
[fileupload] UI fix for 'file replace confirm popup'
2015-07-17 15:48:00 +08:00
Shuai Lin
5dee3d44dc
handle office convert perm check in cluster mode
2015-07-17 12:20:02 +08:00
zhengxie
c27de9265a
[i18n] Update locales and version
2015-07-17 11:17:05 +08:00
xiez
066314a205
Merge pull request #723 from haiwen/thumbnail
...
update thumbnail
2015-07-17 11:07:32 +08:00
xiez
774688b847
Merge pull request #724 from haiwen/share-link-api
...
[web-api] update path check when generate file share link
2015-07-17 10:44:53 +08:00
lian
da6e97fa1c
update send perm audit msg function
2015-07-16 18:37:48 +08:00
lian
2cc8d42d21
[web-api] update path check when generate file share link
2015-07-16 17:44:05 +08:00
Shuai Lin
fcf2c992ec
handle office preview perm check in file revisions
2015-07-16 15:31:01 +08:00
Shuai Lin
075b0d04f6
handle office preview perm check from shared links
2015-07-16 15:28:35 +08:00
Shuai Lin
23655f298f
handle spreadsheets preview
2015-07-16 15:28:18 +08:00
Shuai Lin
7f73d26339
improve office preview permission check
2015-07-16 15:28:18 +08:00
zhengxie
bc834bd729
[i18n] Update source file
2015-07-16 15:20:47 +08:00
lian
124d7aa91f
update code when set is_img and encoded_thumbnail_src value to file obj
2015-07-16 14:41:13 +08:00
lian
14c264f22a
update & return encoded thumbnail src to web
2015-07-16 13:09:52 +08:00
lian
a5cdd0b0c4
update thumbnail
2015-07-15 17:57:09 +08:00
zhengxie
cc4707f9d1
Merge branch '4.2'
2015-07-15 15:12:42 +08:00
zhengxie
00f64782ad
Merge branch 'dir-share-popup'
...
Conflicts:
seahub/api2/views.py
static/scripts/app/views/share.js
static/scripts/common.js
tests/api/test_shares.py
2015-07-15 15:06:56 +08:00
llj
eaa93960f0
[dir shared items] modification
2015-07-15 14:55:23 +08:00
xiez
1144c15ed7
Merge pull request #721 from haiwen/share-link-api
...
[web-api] update share link api
2015-07-15 11:46:08 +08:00
lian
24ee9fe983
[web-api] update share link api
...
not use 'type' argument when create share download link
2015-07-15 11:30:00 +08:00
zhengxie
986a07d0cf
[tests] Workaround for test_misc failed, seeems django::reverse will cause new settings failed
2015-07-14 18:19:36 +08:00
xiez
91b7b816ed
Merge pull request #710 from haiwen/share-link-api
...
[web-api] update share link api
2015-07-14 17:39:33 +08:00
lian
8b36281eb8
add test for shared link api
2015-07-14 17:05:18 +08:00
lian
7f6c69303c
[web-api] update share link api
...
1. generate upload shared link
2. delete upload shared link
3. set password/expire when generate a shared download/upload link
4. list direnty in shared dir download link
5. password check if file/dir share is encrypted
2015-07-14 17:05:18 +08:00
xiez
aea56e02a3
Merge pull request #718 from haiwen/improve-check-perm
...
improve the performance of check_repo_access_permission
2015-07-14 16:13:25 +08:00
llj
7e325c815a
Merge pull request #720 from haiwen/sort
...
Sort
2015-07-14 14:49:07 +08:00
llj
285f1a6e04
[dir view] bugfix for 'sort by time'
2015-07-14 14:22:12 +08:00
Shuai Lin
538b4ddf35
improve the performance of check_repo_access_permission
...
Reduce unnecessary database reads
2015-07-14 14:12:51 +08:00
zhengxie
0b61259b9d
Add permission check and quota check
2015-07-14 13:26:13 +08:00
llj
b29974901c
[sort] new interaction for 'myhome shared libs'
2015-07-14 11:46:20 +08:00
zhengxie
1c6475d7d1
WIP: finish dir_shared_items
2015-07-14 11:07:05 +08:00
llj
69101f41f6
[dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code
2015-07-14 11:03:59 +08:00
zhengxie
7d6b84ecc5
WIP: update return fields
2015-07-14 11:03:59 +08:00
llj
0a13dd88bb
[dir private share] dir shared items: modified 'list/add', add 'delete'
2015-07-14 11:03:58 +08:00
zhengxie
beee7a8fa6
[api] WIP: add dir shared items endpoint
...
Conflicts:
seahub/test_utils.py
2015-07-14 11:03:58 +08:00
llj
6ff2efb597
[dir private share] split into user/group share
2015-07-14 11:03:05 +08:00
Daniel Pan
0df9194a55
Merge pull request #715 from haiwen/office-preview-xls-embedded-images
...
several improvements to office preview
2015-07-13 22:27:19 +08:00
Shuai Lin
99a1347ade
remove debug print
2015-07-13 13:57:42 +08:00
Shuai Lin
00142ef4ea
improve open documents online preview in pro edition
2015-07-13 13:56:36 +08:00
Shuai Lin
fda0df7f10
[office preview] fix fetching images embedded in xls files
2015-07-13 13:56:35 +08:00
xiez
d0b35a75be
Merge pull request #714 from haiwen/org-activity-api
...
[web-api] add multi-tenancy check when get evnets
2015-07-13 11:58:17 +08:00
zhengxie
61dff076d4
Fix dir/file api path not exists error
2015-07-13 11:56:09 +08:00
lian
a23050be41
[web-api] add multi-tenancy check when get evnets
2015-07-13 10:57:31 +08:00
llj
1a406f9b26
[lib/dir/file sort] bugfix for new interaction
2015-07-11 14:51:26 +08:00
Daniel Pan
3882bc1806
Merge pull request #711 from haiwen/remove-pub-repo
...
remove pub group tab
2015-07-11 14:46:53 +08:00
lian
2b95f4021a
remove pub group tab
2015-07-11 14:26:43 +08:00
llj
e426ba0aa8
Merge pull request #709 from haiwen/file_view
...
[file view] modified shared/history file view ui, cleaned up CSS
2015-07-11 10:39:09 +08:00
llj
94d954eea4
[file view] cleaned up CSS
...
Conflicts:
media/css/seahub.css
2015-07-11 10:24:01 +08:00
