haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-19 18:00:03 +00:00
Code Issues Releases Wiki Activity
5,689 Commits 118 Branches 466 Tags
fef1d50ecde767637378745c169dcc19fd633932
Commit Graph

5689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
xiez
1a508c78c6 Merge pull request #1540 from haiwen/alpha-api 
Alpha api
 2017-04-11 17:49:59 +08:00
lian
132d181c3a update repo history api 
add 'name' and 'contact_email' to result
 2017-04-11 17:44:17 +08:00
lian
756ccf1303 add api 
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
 2017-04-10 17:23:34 +08:00
lian
0967a35630 udpate code style of url.py 2017-04-08 17:55:12 +08:00
Daniel Pan
478a9fe703 Merge pull request #1536 from haiwen/share-fix 
[file view] share: fix for link with expiration
 2017-04-08 11:10:26 +08:00
llj
c17d72b615 [file view] share: fix for link with expiration 2017-04-08 11:02:19 +08:00
Daniel Pan
994414fab0 Merge pull request #1535 from haiwen/revert 
Revert
 2017-04-07 11:40:21 +08:00
lian
af4b430572 Revert "Fix tests" 
This reverts commit 375b270b53.
 2017-04-07 10:10:17 +08:00
lian
7de34634a0 Revert "Update Django to 1.8.18" 
This reverts commit 928cf4a09c.
 2017-04-07 10:09:59 +08:00
zhengxie
375b270b53 Fix tests 2017-04-06 17:01:58 +08:00
lian
937d839565 update get repo owner 
check if repo exists before get org repo owner
 2017-04-06 16:15:03 +08:00
Daniel Pan
0d8c01c7ce Merge pull request #1534 from haiwen/org-repo-owner 
update get org repo owner
 2017-04-06 16:06:35 +08:00
lian
5a52d4257f update get org repo owner 2017-04-06 14:50:40 +08:00
zhengxie
928cf4a09c Update Django to 1.8.18 2017-04-06 14:13:32 +08:00
xiez
0e025beae2 Merge pull request #1530 from haiwen/top-bar-fix 
[UI] top-bar: bugfix & improvement
 2017-03-30 13:48:34 +08:00
llj
59ff3fb180 [UI] top-bar: bugfix & improvement 2017-03-30 12:12:41 +08:00
xiez
933e1b3ab0 Merge pull request #1529 from haiwen/file-edit-fix 
[file edit] text edit: fixed cursor height bug
 2017-03-30 10:28:32 +08:00
llj
d16fb0d4c0 [file edit] text edit: fixed cursor height bug 2017-03-30 10:20:40 +08:00
xiez
4febac093e Merge pull request #1527 from haiwen/file-edit-fix 
[file edit] fixed 'load draft' popup ui
 2017-03-30 10:03:52 +08:00
xiez
9736e9599a Merge pull request #1528 from haiwen/update-email 
update send email
 2017-03-30 10:02:42 +08:00
lian
3d87f86036 update send email 2017-03-29 20:30:59 +08:00
llj
a2cc9115bc [file edit] fixed 'load draft' popup ui 2017-03-29 20:21:14 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
zhengxie
09fc3259a1 Update locales 2017-03-29 17:54:38 +08:00
xiez
e719c0608c Merge pull request #1526 from haiwen/back-fix 
[back] fix
 2017-03-29 15:14:56 +08:00
llj
d3644c2f69 [back] fix 2017-03-29 14:35:30 +08:00
llj
95c157a0b7 [back] fix 2017-03-29 11:54:18 +08:00
xiez
e83b63d34c Merge pull request #1525 from haiwen/update-api-usage 
update api usage
 2017-03-29 11:41:09 +08:00
xiez
a2965ce149 Merge pull request #1523 from haiwen/share-fix 
[share popup] fixed 'direct download link'
 2017-03-29 11:39:16 +08:00
lian
c2140bc3d7 update ccnet api usage 2017-03-29 10:28:51 +08:00
xiez
a3e009fbe0 Merge pull request #1524 from haiwen/get-repo-info 
Get repo info
 2017-03-27 15:53:17 +08:00
lian
1f3b597336 add test for admin libraires api 2017-03-27 15:05:40 +08:00
lian
82735bad2c update get org repo owner 2017-03-27 15:03:41 +08:00
llj
b9b02cee57 [share popup] fixed 'direct download link' 2017-03-27 12:06:39 +08:00
xiez
d49b7d0e17 Merge pull request #1522 from haiwen/wiki 
added ENABLE_WIKI
 2017-03-25 16:15:11 +08:00
llj
33029ea2ed added ENABLE_WIKI 2017-03-25 14:30:11 +08:00
xiez
16ff47467b Merge pull request #1519 from haiwen/favicon 
[favicon] fix & modification for customization
 2017-03-25 10:23:57 +08:00
xiez
17dc3be012 Merge pull request #1516 from haiwen/repo-owner 
update admin get repo info
 2017-03-24 18:17:03 +08:00
llj
b308f92e53 Merge pull request #1518 from haiwen/restore-fix 
[file revisions, repo snapshot] fix 'restore'
 2017-03-24 10:52:08 +08:00
llj
10e895beaa Merge pull request #1520 from haiwen/logo-title 
[logo title] modification for customization
 2017-03-24 10:35:05 +08:00
llj
377a7f1987 [logo title] modification for customization 2017-03-23 17:43:42 +08:00
llj
2258574c75 Merge pull request #1512 from haiwen/setting-custom 
[settings] modification for custom
 2017-03-23 16:44:09 +08:00
llj
097e337683 [favicon] fix & modification for customization 2017-03-23 16:33:09 +08:00
llj
f9008b41bb [file revisions, repo snapshot] fix 'restore' 2017-03-22 16:28:58 +08:00
lian
f6bd380cda update admin get repo info 
return repo owner if current repo is an org repo
 2017-03-22 16:17:22 +08:00
xiez
d135eed3d1 Merge pull request #1513 from haiwen/email 
update email body message
 2017-03-21 15:47:15 +08:00
lian
e09741c08e update email body 2017-03-21 15:32:50 +08:00
xiez
2a8341e214 Merge pull request #1493 from haiwen/org-user 
add api of amdin manage org user
 2017-03-13 17:45:42 +08:00
lian
4e17d04cb6 use "url" templates tag to generate url 2017-03-13 17:39:36 +08:00