1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 07:08:55 +00:00
Commit Graph

6588 Commits

Author SHA1 Message Date
zhengxie
11a77ed611 [locale] Update lt 2017-11-20 18:04:50 +08:00
zhengxie
e5b30bfd2c [locale] Update translations 2017-11-20 17:47:09 +08:00
zhengxie
aed9e3d7d6 [locale] Update source files 2017-11-20 17:44:46 +08:00
zming
756ae08cc3 Quota -> Space Quota 2017-11-20 17:42:26 +08:00
zming
14aaca7e00 update trans 2017-11-20 17:29:00 +08:00
llj
9ee0c56b3e [system admin] remove 'file search' 2017-11-20 16:56:59 +08:00
zMingGit
b5b55b1640 revision delete by name(user) (#1903)
* revision delete by name(user)

* review
2017-11-20 16:37:09 +08:00
Daniel Pan
d97c92bf65 Merge pull request #1906 from haiwen/del-statistics-hour
del statistics by hour(user activity, total storage)
2017-11-20 13:42:30 +08:00
Daniel Pan
fc94f4ce64 Merge pull request #1909 from haiwen/statistic
[system admin] statistic: remove statistic by hour
2017-11-20 11:56:28 +08:00
llj
a526c070e3 [system admin] statistic: remove statistic by hour 2017-11-20 11:27:01 +08:00
zming
3dee753b33 del get_file_ops_status_by_day 2017-11-20 11:09:08 +08:00
Daniel Pan
3499a46f8e Merge pull request #1907 from haiwen/sysadmin
[system admin] 'users' page: rm 'check server version' & 'check license'
2017-11-20 10:42:23 +08:00
zming
2be35db8df del statistics by hour(user activity, total storage) 2017-11-17 17:06:29 +08:00
llj
788813fcb7 [system admin] 'users' page: rm 'check server version' & 'check license' 2017-11-17 16:40:50 +08:00
llj
ed52ab67c3 Merge pull request #1905 from haiwen/login-oauth
[login] modified 'oauth' link
2017-11-17 15:26:41 +08:00
llj
326e3e4136 [login] modified 'oauth' link 2017-11-17 15:21:44 +08:00
Daniel Pan
d9ac19f55a Merge pull request #1904 from haiwen/form
[form] improved accessibility for form elements
2017-11-16 16:26:48 +08:00
llj
44a6399086 [form] improved accessibility for form elements 2017-11-16 15:45:44 +08:00
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
lian
cf480de31b Merge branch '6.2' 2017-11-09 15:27:50 +08:00
Daniel Pan
98a09f8046 Merge pull request #1889 from haiwen/sysinfo-mode
add mode
2017-11-09 11:06:50 +08:00
zming
62e7db3274 add mode 2017-11-09 11:05:39 +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
Daniel Pan
7d0ec1a78c Merge pull request #1818 from haiwen/filecomment-fileuuidmap
add fileuuidmap to filecomment
2017-11-06 21:19:45 +08:00
lian
50a6d0172f optimize getting group repos 2017-11-06 16:31:47 +08:00
zming
f2168d9602 add fileuuidmap to filecomment & del seahub signal 2017-11-06 15:58:41 +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