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 |
|
zhengxie
|
29ce466c3c
|
Merge branch '6.3'
|
2018-08-24 17:43:46 +08:00 |
|
zhengxie
|
142b1e7750
|
[locale] Update .po files
|
2018-08-24 17:43:04 +08:00 |
|
zhengxie
|
054be3b4df
|
[locales] Fix source strings
|
2018-08-24 17:31:14 +08:00 |
|
ilearnit
|
6e9dd2e9bc
|
change trans string
|
2018-08-24 17:29:10 +08:00 |
|
zhengxie
|
914a698513
|
Update dev requirements
|
2018-08-24 17:06:23 +08:00 |
|
zhengxie
|
7b5fa052d8
|
[locale] Update source strings
|
2018-08-24 17:05:03 +08:00 |
|
zhengxie
|
064ac1d246
|
Add extra translation strings
|
2018-08-24 17:03:09 +08:00 |
|
ilearnit
|
d69530690f
|
fix wiki_list.html ajax
|
2018-08-24 14:47:40 +08:00 |
|
shanshuirenjia
|
5d1fd88da3
|
Add wiki use lib (#2297)
|
2018-08-24 14:24:14 +08:00 |
|
zheng xie
|
6d8bfb93f6
|
Merge pull request #2286 from haiwen/user-role-public
add can_add_public_repo user role
|
2018-08-24 10:40:25 +08:00 |
|
lian
|
eaff121ef2
|
add can add public repo user role permission
|
2018-08-23 19:04:33 +08:00 |
|
lian
|
f2e32f3073
|
Merge pull request #2282 from haiwen/copy-file
update copy dirent api
|
2018-08-23 17:57:38 +08:00 |
|
lian
|
f6862359e1
|
Merge pull request #2291 from haiwen/lang-ui
[language selector] modification for customed language selector
|
2018-08-23 16:50:48 +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 |
|
ilearnit
|
5eba3e385e
|
[dist] fix share link and internal link
|
2018-08-23 10:31:56 +08:00 |
|
zheng xie
|
349abf5327
|
Merge pull request #2279 from haiwen/admin-repo-trash
update admin libraries trash page
|
2018-08-22 17:31:01 +08:00 |
|
ilearnit
|
036068b560
|
[dist] frontend
|
2018-08-22 17:21:42 +08:00 |
|
shanshuirenjia
|
00388d3cda
|
Support wiki page create/rename operations (#2295)
|
2018-08-22 16:39:42 +08:00 |
|
llj
|
1b0e3e1264
|
[dir view] enable 'copy file/dir to current folder'
|
2018-08-21 16:58:49 +08:00 |
|
cainiao222
|
41aec504b6
|
modify internal-link explaination (#2293)
|
2018-08-21 14:36:50 +08:00 |
|
zhengxie
|
14ed32c994
|
Merge branch '6.3'
|
2018-08-21 13:39:43 +08:00 |
|
llj
|
9de1ac3a6f
|
[language selector] modification for customed language selector
|
2018-08-21 11:50:05 +08:00 |
|
llj
|
e4a255206f
|
Merge pull request #2287 from haiwen/org-address-book-fix
[org address book] fixup
|
2018-08-20 19:12:31 +08:00 |
|
llj
|
3414cfe10d
|
[org address book] fixup
|
2018-08-20 19:04:24 +08:00 |
|
zhengxie
|
a24264b741
|
[api] Do not list org groups in sysadmin
|
2018-08-20 13:26:01 +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 |
|
zheng xie
|
26b0c6aea5
|
Merge pull request #2262 from haiwen/6.3-org_address_book
[api] Add org address book
|
2018-08-20 13:19:55 +08:00 |
|
llj
|
b5d6439f3f
|
Merge pull request #2284 from haiwen/misc-fix
[misc] fixup
|
2018-08-18 11:12:18 +08:00 |
|
llj
|
5b8dc61e6f
|
[misc] fixup
|
2018-08-18 11:05:08 +08:00 |
|
lian
|
e9dd17f511
|
update copy dirent api
remove same repo_id,path check when copy dirent
|
2018-08-17 16:13:45 +08:00 |
|
zhengxie
|
5452e7d78c
|
[api2] Refactor group owned libraries
|
2018-08-17 14:03:23 +08:00 |
|
llj
|
ff90c7cfb4
|
[org admin] added 'address-book'
|
2018-08-17 14:01:48 +08:00 |
|
shanshuirenjia
|
0105e8e8ef
|
wiki search (#2278)
|
2018-08-17 12:23:55 +08:00 |
|
lian
|
3321285af4
|
update admin libraries trash page
show expire days according to seafile.conf configuration
|
2018-08-17 12:09:27 +08:00 |
|
llj
|
c24d527a03
|
[fileupload] show 'Network error' instead of 'Unknown error' (#2266)
|
2018-08-16 16:46:07 +08:00 |
|
zhengxie
|
be49e73332
|
[api2] Support org address book
Squashed commit of the following:
commit dfee292d8826d9f4b63bde56569151a68574a506
Author: zhengxie <xiez1989@gmail.com>
Date: Thu Aug 16 15:15:06 2018 +0800
Support org for user/group sharing
commit 3176743d3c8ca08934f3af6de4676976f52b082d
Author: llj <lingjun.li1@gmail.com>
Date: Wed Aug 15 18:11:07 2018 +0800
wip: fix for org
commit b784fbca5f363eabb6457d9d2c704bef4caed9aa
Author: zhengxie <xiez1989@gmail.com>
Date: Thu Aug 9 15:01:50 2018 +0800
[api2] Support org in address book
commit 1244088ddd7853edaa3dff9f5c7e90761b3e390a
Author: zhengxie <xiez1989@gmail.com>
Date: Thu Aug 2 18:28:06 2018 +0800
[urls] Add org api url
|
2018-08-16 15:25:31 +08:00 |
|
llj
|
a890471fad
|
Merge pull request #2277 from haiwen/new-owned-repo-fix
[group] fixup for adding a group owned repo
|
2018-08-16 10:58:55 +08:00 |
|
llj
|
3dad80d722
|
[group] fixup for adding a group owned repo
|
2018-08-16 10:56:10 +08:00 |
|
llj
|
bc507bb8aa
|
Merge pull request #2276 from haiwen/fixup
[dir view] fixup for 'group owned repo'
|
2018-08-15 13:43:33 +08:00 |
|
llj
|
3fcfeab7f4
|
[dir view] fixup for 'group owned repo'
|
2018-08-15 12:35:49 +08:00 |
|
zhengxie
|
4b4730cc99
|
[profile] Handle duplicated contact emails
|
2018-08-14 17:35:13 +08:00 |
|
zheng xie
|
2bb23bd1a9
|
Update seafile version to 6.3.3
|
2018-08-14 14:48:29 +08:00 |
|
ilearnit
|
4a4e47efb0
|
[frontend] update seafile-editor 0.1.11
|
2018-08-14 14:40:33 +08:00 |
|
llj
|
e728968be4
|
Merge pull request #2275 from haiwen/ui
[group repo list] for group owned repo: change 'Permission' to 'Folde…
|
2018-08-14 14:20:37 +08:00 |
|
llj
|
5aeca9c986
|
[group repo list] for group owned repo: change 'Permission' to 'Folder Permission'
|
2018-08-14 14:16:37 +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 |
|
C_Q
|
e68efa9a31
|
Remove user email from the wiki page (#2274)
|
2018-08-14 12:14:04 +08:00 |
|
zhengxie
|
0541ea6c16
|
[thumbnail] Ignore file not exists error
|
2018-08-14 10:32:36 +08:00 |
|