haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 07:24:58 +00:00
Code Issues Releases Wiki Activity
7,197 Commits 136 Branches 453 Tags 2.3 GiB
d84bd79d1a
Commit Graph

689 Commits

Author SHA1 Message Date
lian
6313e54dd7 update share link permission (#2328) 
1, download Link -> Share link
2, add can_preview field for file when ajax list lib dir
3, hide preview-only permission if a file can not preview
 2018-09-01 16:07:01 +08:00
zheng xie
e68193c965
Merge pull request #2317 from haiwen/6.3-csrf_cookie 
Use custom csrf cookie name to avoid name conflict
 2018-08-30 18:52:24 +08:00
llj
37875256de Squashed commit of the following: 
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
 2018-08-30 16:44:34 +08:00
zhengxie
0f59f84804 Use custom csrf cookie name to avoid name conflict 2018-08-30 13:37:03 +08:00
lian
c8b51b7bfc update logic of show folder share icon 
if current user has 'is_admin' library permssion, show folder share icon
 2018-08-24 17:54:42 +08:00
lian
f2e32f3073
Merge pull request #2282 from haiwen/copy-file 
update copy dirent api
 2018-08-23 17:57:38 +08:00
llj
ffca232d4d 6.3 perm error (#2294) 
* Add login url to context

* [backbone] turn to login page when 403
 2018-08-23 13:41:17 +08:00
llj
1b0e3e1264 [dir view] enable 'copy file/dir to current folder' 2018-08-21 16:58:49 +08:00
llj
3414cfe10d [org address book] fixup 2018-08-20 19:04:24 +08:00
zheng xie
775d6871f7
Merge pull request #2281 from haiwen/6.3-org_address_book-fe 
[org admin] added 'address-book'
 2018-08-20 13:21:59 +08:00
llj
5b8dc61e6f [misc] fixup 2018-08-18 11:05:08 +08:00
llj
ff90c7cfb4 [org admin] added 'address-book' 2018-08-17 14:01:48 +08:00
llj
c24d527a03 [fileupload] show 'Network error' instead of 'Unknown error' (#2266) 2018-08-16 16:46:07 +08:00
llj
3dad80d722 [group] fixup for adding a group owned repo 2018-08-16 10:56:10 +08:00
llj
3fcfeab7f4 [dir view] fixup for 'group owned repo' 2018-08-15 12:35:49 +08:00
lian
0d4d277361
Merge pull request #2272 from haiwen/share-and-folderPerm 
Share and folder perm
 2018-08-14 14:01:28 +08:00
lian
2ab9b5b900
Merge pull request #2273 from haiwen/new-group-owned-repo-fix 
[group] fixup for adding the first owned repo when there are no repos …
 2018-08-14 13:15:07 +08:00
llj
21c723ecf5 [group] fixup for adding the first owned repo when there is no repos in the group. 2018-08-13 17:30:55 +08:00
llj
cfb9c9b319 [folder perm] modification for group owned repo 2018-08-13 16:28:05 +08:00
llj
76183310e0 [share] share to group: modified group list 2018-08-10 17:32:09 +08:00
llj
d7510c0773 [group repo list, dir view] modification after 'enable users to share personal libraries to departments' 2018-08-10 16:45:20 +08:00
llj
c9053902a8
Merge pull request #2267 from haiwen/address-book-folder-share 
[group owned repo] enable dir private share for sub folders
 2018-08-09 11:49:28 +08:00
lian
8bb7b15082 Folder perm group (#2261) 
* update shareable-groups api

return all groups, include address book groups

* update folder perm select group

send ajax groups request every time set folder perm
 2018-08-08 17:52:16 +08:00
llj
f096ccdf3d [group owned repo] enable dir private share for sub folders 2018-08-08 15:37:11 +08:00
llj
bc7184f75b [folder perm] fixup for 'path' 2018-08-07 12:22:36 +08:00
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0" 
This reverts commit 62c3519e85.
 2018-08-03 16:08:29 +08:00
lian
20cb4ce86f Revert "[select2] fixup after rebase" 
This reverts commit 5fe0865629.
 2018-08-03 16:07:05 +08:00
lian
c736ca1097 Revert "[select2] share: fixup" 
This reverts commit c6152d8f0e.
 2018-08-03 16:06:46 +08:00
lian
57e2cef98b Revert "[select2] show 'searching' tip" 
This reverts commit 7daec7d742.
 2018-08-03 16:05:20 +08:00
lian
4d8b1156e1 Revert "[select2] downgrade it to v4.0.2 to solve the chinese input problem" 
This reverts commit 34caf14b2e.
 2018-08-03 16:05:12 +08:00
llj
34caf14b2e [select2] downgrade it to v4.0.2 to solve the chinese input problem 2018-08-03 11:20:12 +08:00
llj
7daec7d742 [select2] show 'searching' tip 2018-08-02 17:18:53 +08:00
zhengxie
f166271827 [media] Add 6.3.2 media assets 2018-08-02 11:36:54 +08:00
lian
85d2812ca6
Merge pull request #2247 from haiwen/document-bug 
repair editor menu style for different device
 2018-08-01 18:32:07 +08:00
llj
c6152d8f0e [select2] share: fixup 2018-08-01 16:50:57 +08:00
llj
5fe0865629 [select2] fixup after rebase 2018-08-01 14:24:14 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
shanshuirenjia
998ca7d675 repair the code style 2018-07-31 16:59:46 +08:00
杨顺强
12fb7a18f0 first : modify the editor to be resposed for pc and mobile; 
second: change the editor menu style for different device;
 2018-07-31 15:40:00 +08:00
lian
9733d50a1a
Merge pull request #2235 from haiwen/select2-upgrade 
[select2] upgraded it to v4.0
 2018-07-31 15:14:13 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
cainiao222
e589403bc6 add help of internal-link, change the name smart-link to internal-link 2018-07-25 11:16:33 +08:00
cainiao222
1cf9becf2c fix smart-link 2018-07-17 18:54:59 +08:00
lian
82658abbe0 update share.js 
request groups web api to get group list when share repo to group
 2018-07-17 13:47:24 +08:00
cainiao222
349ea9368c frontend add smart-link 2018-07-11 17:44:32 +08:00
lian
e976b6107f convert repo path 2018-07-11 17:23:34 +08:00
llj
040348e6f4 [address book] group: show repo owner and etc. 2018-06-15 14:22:10 +08:00
llj
ce23a58edf [group owned repo] share: enable 'share to user/group' 2018-06-15 14:22:10 +08:00
zMingGit
e387c92b99 can set sub-path permission with admin (#1962) 
* can set sub-path permission with admin

* fixup after rebase
 2018-05-18 13:46:43 +08:00
llj
8bf23d9e88 [address book] added 'rename', 'set perm', 'details' for group owned library, and etc. 
* added feedback for invalid quota input
    * modified empty tips for group
    * added 'New Department Library'
    * [group owned repo] added 'rename', 'set permission', 'details'
 2018-05-18 12:12:01 +08:00