haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Code Issues Releases Wiki Activity
6,461 Commits 142 Branches 460 Tags
42cae42380c53e4290672bed3e8b4773c8acfcea
Commit Graph

6461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
42cae42380 Update i18n.sh 2017-11-14 16:49:01 +08:00
xiez
b50144761b Merge pull request #1900 from haiwen/oauth-import 
update importing requests_oauthlib
 2017-11-14 16:37:39 +08:00
xiez
50dfa96e0f Merge pull request #1901 from haiwen/update-test 
update tests of shared repos
 2017-11-14 16:37:20 +08:00
llj
9ac06c5365 Merge pull request #1902 from haiwen/nav-fix 
[sysadmin] fixed 'nav jumps in IE10' problem
 2017-11-14 16:12:25 +08:00
llj
ba084afb2a [sysadmin] fixed 'nav jumps in IE10' problem 2017-11-14 16:02:36 +08:00
lian
2a680b83c6 update tests of shared repos 2017-11-14 16:01:31 +08:00
zhengxie
e6eaa07871 Fix ccnet api 2017-11-14 14:54:41 +08:00
zhengxie
fb6070c274 Update travis 2017-11-14 14:41:41 +08:00
lian
158824ae53 update importing requests_oauthlib 2017-11-14 14:39:15 +08:00
zMingGit
05caf621f1 Userinfo contactemail (#1894) 
* Show contact_email on user profile

I think it would be good to have the edit functionality for that
attribute, too, but I did not implement that right now.
It's marked with TODO though.

* update api and tests

* review
 2017-11-14 14:12:27 +08:00
xiez
ecd6ccfe20 Merge pull request #1892 from haiwen/oauth 
add oauth support
 2017-11-14 13:54:12 +08:00
lian
50ccccfcb4 add oauth support 2017-11-14 11:53:41 +08:00
Daniel Pan
3436096f3e Merge pull request #1897 from haiwen/fix-text 
fixed text
 2017-11-14 11:46:39 +08:00
llj
f6ce790d18 fixed text 2017-11-14 11:28:11 +08:00
Daniel Pan
c35ca85e1f Merge pull request #1895 from haiwen/click-to-select 
[share.js] download/upload link: added 'click to select' feature
 2017-11-14 10:29:58 +08:00
llj
c4f3d040f0 Merge pull request #1896 from haiwen/group-fix 
[group] fix
 2017-11-13 14:32:15 +08:00
llj
fbbfebe09a [group] fix 2017-11-13 14:28:21 +08:00
llj
ac18d5ee85 [share.js] download/upload link: added 'click to select' feature 2017-11-13 13:45:40 +08:00
zMingGit
3661c701f8 admin panel. upload link (#1866) 
* admin panel. upload link

* review
 2017-11-08 18:33:12 +08:00
xiez
29bdd3ba98 Merge pull request #1890 from haiwen/group-repos 
optimize getting group repos
 2017-11-08 10:25:36 +08:00
lian
50a6d0172f optimize getting group repos 2017-11-06 16:31:47 +08:00
xiez
8eb9604146 Merge pull request #1888 from haiwen/shib_login_redirect 
Fix shibboleth login redirect issue, see https://forum.seafile.com/t/…
 2017-11-06 10:20:37 +08:00
lian
c88ff295c1 add new group libraries api (#1835) 2017-11-03 12:04:07 +08:00
zMingGit
f5d1be1f59 share permission refactor (#1843) 
* rebuild

* share admin

* use seafile_api

* rebase 6.2

* complete test

* api changed

* some error

* break up to two method

* review

* js review
 2017-11-01 18:13:51 +08:00
llj
a28b1f05c4 Merge pull request #1884 from haiwen/fix 
small fix
 2017-11-01 15:51:19 +08:00
llj
1577275095 small fix 2017-11-01 15:42:03 +08:00
Daniel Pan
8e4f65fef3 Merge pull request #1883 from haiwen/folder-icon 
[icon] new folder icons
 2017-11-01 15:08:19 +08:00
llj
a8985984c5 [icon] new folder icons 2017-11-01 14:35:19 +08:00
zhengxie
bdde049a4e Fix shibboleth login redirect issue, see https://forum.seafile.com/t/shared-links-via-shibboleth/4067/11 2017-10-31 13:32:54 +08:00
Daniel Pan
f44da1afdd Merge pull request #1882 from haiwen/update-file 
use use_onetime=False when get update link
 2017-10-31 13:28:01 +08:00
lian
61c4903624 use use_onetime=False when get update link 2017-10-31 13:24:23 +08:00
zhengxie
4275447d09 [locale] Add two factor source strings 2017-10-30 15:04:11 +08:00
Daniel Pan
ad8aa9ebea Merge pull request #1881 from haiwen/oos-language 
update get user current language code for wopi
 2017-10-30 11:56:33 +08:00
lian
c056ebdd0d update get user current language code for wopi 2017-10-30 11:52:07 +08:00
Daniel Pan
aa580c7008 Merge pull request #1880 from haiwen/timestamp 
update timeutil: global variable
 2017-10-28 16:18:20 +08:00
lian
5f33ebafeb update timeutil: global variable 2017-10-28 16:15:48 +08:00
zming
c1d7b588e3 update notification 2017-10-26 10:04:16 +08:00
Daniel Pan
350bb28168 Merge pull request #1868 from haiwen/shib_logout 
[shib] Add local logout for shibboleth
 2017-10-25 17:11:32 +08:00
lian
6590262cb2 Merge pull request #1869 from haiwen/admin-library 
add admin api for get info of a single repo
 2017-10-24 17:58:37 +08:00
xiez
a3d848284b Merge pull request #1872 from haiwen/notification-fix 
update notification
 2017-10-24 17:57:35 +08:00
zming
2ea7a4ae49 update notification 2017-10-24 17:50:29 +08:00
lian
36cdff75aa add admin api for get info of a single repo 2017-10-21 04:33:48 -07:00
zhengxie
484e1a8a75 [shib] Add local logout for shibboleth 2017-10-20 11:34:51 +08:00
zMingGit
58ca1084ac comment paging (#1867) 
* comment paging

* test
 2017-10-19 15:24:59 +08:00
xiez
b52d7131a0 Merge pull request #1864 from haiwen/org-repo-owner 
update get repo owner in org mode
 2017-10-16 13:10:44 +08:00
lian
37e73b7fa8 update get repo owner in org mode 2017-10-14 19:08:02 +08:00
zhengxie
742e0d5c88 Update test requirements 2017-10-14 18:08:26 +08:00
zhengxie
51ed98a869 Update debug context processor 2017-10-14 17:23:49 +08:00
zhengxie
12e0617b58 Update requirements.txt 2017-10-14 17:02:12 +08:00
zhengxie
49f8917046 [base] Extend django.debug context processor 2017-10-14 16:47:13 +08:00