haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-11 03:41:12 +00:00
Code Issues Releases Wiki Activity
8,262 Commits 143 Branches 460 Tags
c5cfc2046219bc8eee264b13cf33ffadb3912d3c
Commit Graph

8262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
f6e1c8c03a [travis] Only build master/6.3/6.2 branch 2018-07-30 17:33:25 +08:00
zhengxie
963d532995 [frontend] Update seafile-editor to 0.1.7 2018-07-30 17:17:46 +08:00
zhengxie
e708325a12 [locale] Update .po files 2018-07-30 16:42:57 +08:00
zhengxie
42df563786 [locale] Update .po files 2018-07-30 11:44:57 +08:00
zhengxie
b1e1fa796d [priv] Add new string 2018-07-30 11:35:45 +08:00
llj
4f7f1c166d [group repo] mobile: use dropdown menu for operations 2018-07-30 11:30:33 +08:00
zhengxie
b054441ef9 [frontend] Update seafile-editor to 0.1.6 & dist 2018-07-27 18:35:10 +08:00
cainiao222
c62c728f72 6.3 editor fix (#2239) 
* use new api

* delete useless
 2018-07-27 18:05:58 +08:00
C_Q
e71b411f00 [frontend] fix npm build (#2240) 2018-07-27 17:13:43 +08:00
lian
77b8c1f148 Merge pull request #2237 from haiwen/raw_path2inner_path 
[preview]raw_path -> inner_path
 2018-07-27 16:06:32 +08:00
Hu
5de019688a [preview] internal handler use inner_path 2018-07-27 13:26:57 +08:00
zhengxie
26c57f17bc [frontend] Update seafile-editor to 0.1.5 and clean code 2018-07-27 11:48:47 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
zhengxie
e853708e61 [locale] Add source files 2018-07-26 15:45:37 +08:00
zheng xie
4286742f51 Use contact email instead of username (#2218) 
* Use contact email instead of username

* remove contact email

* username center

* [profile] Clean code
 2018-07-26 10:30:13 +08:00
Daniel Pan
d3337c44c5 Merge pull request #2228 from haiwen/internal-link 
add help of internal-link, change the  name smart-link to internal-link
 2018-07-25 11:27:51 +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
zhengxie
13a04f02d0 [api] Update wiki error msg 2018-07-24 18:09:22 +08:00
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