haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 11:27:18 +00:00
Code Issues Releases Wiki Activity
5,888 Commits 148 Branches 463 Tags
122fbe9ef78eb4abffddb90c467180f58ac9924c
Commit Graph

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhengxie
f40aa6341b Update code styles 2017-03-27 13:58:12 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +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
88c8fe04c2 Merge pull request #1506 from haiwen/admin-log 
add admin operation logs page
 2017-03-24 18:21:42 +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
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +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
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
72ffdd54e6 update admin log 2017-03-22 17:26:42 +08:00
llj
acf79cf1aa [system admin] admin logs: fix 2017-03-22 17:26:42 +08:00
lian
dd88c4e043 add admin operation logs page 2017-03-22 17:26:42 +08:00
llj
893f3db8c0 Merge pull request #1517 from haiwen/batch-update 
update user batch api
 2017-03-22 16:55:48 +08:00
llj
2568d72e15 Merge pull request #1514 from haiwen/user-batch-op 
[system admin] users: added 'set quota / delete users in batch'
 2017-03-22 16:52:57 +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
llj
e2e9e6c127 [system admin] users: added 'set quota / delete users in batch' 2017-03-16 18:02:03 +08:00
lian
0cdbac5192 update user batch api 2017-03-16 17:46:16 +08:00
xiez
5d08286467 Merge pull request #1507 from haiwen/admin-user-batch-api 
admin user batch api
 2017-03-14 16:19:45 +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
xiez
d1f3dd154c Merge pull request #1440 from haiwen/org_user_quota 
Use seafile_api to set/get org user quota
 2017-03-13 17:42:21 +08:00
lian
4e17d04cb6 use "url" templates tag to generate url 2017-03-13 17:39:36 +08:00
xiez
9d85b07b80 Merge pull request #1511 from haiwen/admin-del-device 
admin remove unexisted user's deivce
 2017-03-13 17:33:53 +08:00