haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-02 07:47:32 +00:00
Code Issues Releases Wiki Activity
5,702 Commits 136 Branches 455 Tags 2.5 GiB
c93d7a8736
Commit Graph

5702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
Daniel Pan
4ff85e26dc Merge pull request #1557 from haiwen/rename-fix-6.0 
[dir view] rename: fix
 2017-04-22 17:49:24 +08:00
llj
7c82cada60 [dir view] rename: fix 2017-04-22 16:40:05 +08:00
xiez
6ea2858f64 Merge pull request #1548 from haiwen/is-admin 
use true/false as the return value of "is_admin" field
 2017-04-18 15:30:48 +08:00
lian
6922c8fa0d use true/false as the return value of "is_admin" field 2017-04-17 14:57:46 +08:00
xiez
3d662c3fdb Merge pull request #1547 from haiwen/pic-rotate 
update pic rotation when generate thumbnail
 2017-04-14 16:46:26 +08:00
lian
b594025f2b update pic rotation when generate thumbnail 2017-04-14 14:43:11 +08:00
llj
33eedef917 Merge pull request #1544 from haiwen/repo-name 
update name check when create repo
 2017-04-14 14:31:32 +08:00
lian
534272ecd2 add name check at front end by js 2017-04-14 14:03:25 +08:00
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
b0754e31bb Merge pull request #1546 from haiwen/search-api 
check if repo exists before search file
 2017-04-14 10:45:50 +08:00
lian
927527c8de check if repo exists before search file 2017-04-13 16:40:29 +08:00
Daniel Pan
91d9619b26 Merge pull request #1542 from haiwen/favorites-magnificPopup-fix 
[favorites] fixed magnificPopup
 2017-04-12 10:27:38 +08:00
llj
6706bbce89 [favorites] fixed magnificPopup 2017-04-11 18:09:45 +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