Daniel Pan
|
cd4b108f87
|
Merge pull request #2225 from haiwen/wikis-time
[wiki list] modified 'time'
|
2018-07-24 18:06:16 +08:00 |
|
llj
|
bc465f8096
|
[wiki list] modified 'time'
|
2018-07-24 17:41:43 +08:00 |
|
zhengxie
|
78d3f246c2
|
Redirect /shib-login to /sso
|
2018-07-24 16:10:56 +08:00 |
|
Daniel Pan
|
2d39cfd6bf
|
Merge pull request #2220 from haiwen/parent-group-id
update admin groups api
|
2018-07-23 16:08:47 +08:00 |
|
lian
|
9ffa9e7a8d
|
update admin groups api
always return `quota` and `parent_group_id` field no matter if is pro
|
2018-07-23 12:10:55 +08:00 |
|
Daniel Pan
|
134c072ff3
|
Merge pull request #2185 from haiwen/new-activity
new activity
|
2018-07-21 14:34:31 +08:00 |
|
Hu
|
b5c54917fd
|
remove _same_activities func
|
2018-07-21 14:15:28 +08:00 |
|
Hu
|
bdedc98faf
|
remove get_org_user_activities
|
2018-07-21 14:08:42 +08:00 |
|
Hu
|
8b0cba48db
|
the relationship of page and per_page
|
2018-07-21 14:08:42 +08:00 |
|
Hu
|
08db8cc957
|
remove total_count and links from activities api
|
2018-07-21 14:08:42 +08:00 |
|
Hu
|
cf8cbff719
|
new activity
|
2018-07-21 14:08:42 +08:00 |
|
zhengxie
|
84a9c1237c
|
[frontend] build assets
|
2018-07-20 17:35:21 +08:00 |
|
zhengxie
|
5a14db0325
|
[locale] Update locales
|
2018-07-20 17:32:17 +08:00 |
|
zheng xie
|
1b5821a419
|
Merge pull request #2210 from haiwen/markdown-file-save
[frontend] Fix file save success issue when the file is deleted
|
2018-07-20 17:26:41 +08:00 |
|
zhengxie
|
bd3be00cfe
|
[locale] Update source code
|
2018-07-20 11:23:49 +08:00 |
|
Daniel Pan
|
20b00f8300
|
Merge pull request #2216 from haiwen/online-office-lock
add try-exception when OnlineOffice lock file
|
2018-07-19 16:58:49 +08:00 |
|
lian
|
34c8dc3e38
|
add try-exception when OnlineOffice lock file
|
2018-07-19 16:50:56 +08:00 |
|
Daniel Pan
|
6db978f9b2
|
Merge pull request #2215 from haiwen/repo-owner
return owner name and contact email when get mine/shared repo list
|
2018-07-19 16:24:32 +08:00 |
|
Daniel Pan
|
2dba05b35f
|
Merge pull request #2213 from haiwen/remove-share
update shared out repos api
|
2018-07-19 16:21:09 +08:00 |
|
lian
|
d69e700fb6
|
return owner name and contact email when get mine/shared repo list
|
2018-07-19 15:56:38 +08:00 |
|
Daniel Pan
|
9b653bdbcd
|
Merge pull request #2214 from haiwen/file-detail-star
update file detail api
|
2018-07-19 14:35:59 +08:00 |
|
lian
|
c00b71630a
|
update file detail api
fix bug when starred file table has more than one records
|
2018-07-19 14:02:35 +08:00 |
|
lian
|
8fb794602f
|
update shared out repos api
do not remove share if user/group not found
|
2018-07-19 13:46:19 +08:00 |
|
Daniel Pan
|
eae6a735e7
|
Merge pull request #2211 from haiwen/file-detail-perm
update file detail api
|
2018-07-19 12:36:32 +08:00 |
|
zhengxie
|
87e41d787b
|
[frontend] Fix file save success issue when the file is deleted
|
2018-07-18 18:06:44 +08:00 |
|
lian
|
0d8e7ed41d
|
update file detail api
return permission field & refactor code
|
2018-07-18 14:35:38 +08:00 |
|
zheng xie
|
5bd895f360
|
Merge pull request #2209 from haiwen/file-detail
update file detail api
|
2018-07-18 13:42:12 +08:00 |
|
lian
|
54ab3952cb
|
update file detail api
add permission check
|
2018-07-18 12:40:28 +08:00 |
|
zheng xie
|
82e130fdb9
|
Merge pull request #2208 from haiwen/share-from
update api2/repos api
|
2018-07-18 11:32:30 +08:00 |
|
lian
|
edf49639d0
|
update api2/repos api
add share_from(name/contact_email) field when get group/public repos
|
2018-07-18 11:17:40 +08:00 |
|
Daniel Pan
|
0d4390f29d
|
Merge pull request #2207 from haiwen/smart-link-fix
fix smart-link
|
2018-07-18 09:49:29 +08:00 |
|
cainiao222
|
1cf9becf2c
|
fix smart-link
|
2018-07-17 18:54:59 +08:00 |
|
Daniel Pan
|
89cd206071
|
Merge pull request #2205 from haiwen/list-lib-dir
update ajax list lib dir
|
2018-07-17 14:22:57 +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 |
|
lian
|
b80f9faf93
|
update ajax list lib dir
optimize get file type and thumbnail
|
2018-07-16 13:34:00 +08:00 |
|
Daniel Pan
|
d9fbe44381
|
Merge pull request #2169 from haiwen/smart-link
support smart link
|
2018-07-11 20:57:07 +08:00 |
|
lian
|
c04102f1cc
|
convert repo path
add function when has no permission to view file/folder
|
2018-07-11 19:09:11 +08:00 |
|
cainiao222
|
349ea9368c
|
frontend add smart-link
|
2018-07-11 17:44:32 +08:00 |
|
lian
|
f03727a82c
|
support smart link
|
2018-07-11 17:36:21 +08:00 |
|
lian
|
e976b6107f
|
convert repo path
|
2018-07-11 17:23:34 +08:00 |
|
Daniel Pan
|
a3f1654352
|
Merge pull request #2201 from haiwen/fix-subdir-sharing
Fix encrypted library subdir sharing
|
2018-07-11 11:35:24 +08:00 |
|
ilearnit
|
144c7c050d
|
Fix encrypted library subdir sharing
|
2018-07-11 11:17:07 +08:00 |
|
Daniel Pan
|
a4288d29f1
|
Merge pull request #2189 from rene-s/two-factor-input-autofocus
Set autofocus in two factor form with single input field
|
2018-07-11 08:46:37 +08:00 |
|
zheng xie
|
7d147c3b31
|
Update .travis.yml
|
2018-07-10 17:47:46 +08:00 |
|
zhengxie
|
857af596c3
|
[base] Add new migration for reposecretkey
|
2018-07-10 17:34:11 +08:00 |
|
zheng xie
|
bf8557abaf
|
Merge pull request #2200 from haiwen/group_name
add group name field when create group owned library
|
2018-07-09 15:33:37 +08:00 |
|
lian
|
b5aad0880d
|
add group name field when create group owned library
|
2018-07-09 15:20:39 +08:00 |
|
zhengxie
|
7d12a43f3b
|
Merge branch '6.3'
|
2018-07-09 13:29:50 +08:00 |
|
zhengxie
|
b51477aea5
|
Merge branch '6.2' into 6.3
Conflicts:
seahub/api2/views.py
seahub/utils/repo.py
|
2018-07-09 13:13:59 +08:00 |
|
lian
|
5d65842bca
|
Merge pull request #2190 from haiwen/Delete-old-department
Delete all department fields in the old version of the web page
|
2018-07-09 10:28:53 +08:00 |
|