1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-27 23:56:18 +00:00
Commit Graph

5453 Commits

Author SHA1 Message Date
zhengxie
bd5ebc495c [i18n] Update zh po files 2016-09-01 13:31:16 +08:00
zhengxie
71405f6743 [i18n] Update po files 2016-09-01 11:08:44 +08:00
lian
f45aa40cf2 video and audio file can be previewed always 2016-09-01 10:58:19 +08:00
lian
47c6fd1e81 Merge pull request #1335 from haiwen/head-cmmt-id
return head commit id when create repo via web api
2016-08-23 15:32:22 +08:00
lian
3f7cea8160 return head commit id when create repo via web api 2016-08-23 11:26:11 +08:00
Daniel Pan
799640cc0a Merge pull request #1334 from haiwen/misc
clean CSS
2016-08-22 16:02:01 +08:00
Daniel Pan
ecaae2c8c6 Merge pull request #1333 from haiwen/popup-fix
[share/perm popup] fix
2016-08-22 16:01:39 +08:00
llj
f5042956ce [share/perm popup] fix 2016-08-22 15:19:44 +08:00
llj
83cb128b82 Merge pull request #1327 from haiwen/user-permission
User permission
2016-08-22 11:39:10 +08:00
lian
fd917c0007 update user permission
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
2016-08-22 11:20:48 +08:00
zhengxie
f75d6a0dcb [i18n] Update source files 2016-08-20 18:02:55 +08:00
Daniel Pan
8c0139e106 Merge pull request #1328 from haiwen/uploadlink
[upload link] show specific error msg for fileupload
2016-08-20 15:46:03 +08:00
Daniel Pan
8d0400106d Merge pull request #1332 from haiwen/admin-search-user
remove duplicated emails when sysadmin search user
2016-08-20 15:31:32 +08:00
lian
4b985b09d6 remove duplicated emails when sysadmin search user 2016-08-20 14:23:28 +08:00
xiez
7d79f9b748 Merge pull request #1329 from haiwen/reshare-repo
reshare repo to user/group/pub when admin transfer a repo
2016-08-20 11:14:18 +08:00
lian
0ed0919599 add MULTI_TENANCY check when admin transfer a repo 2016-08-20 11:12:15 +08:00
llj
69caa19832 clean CSS 2016-08-20 10:16:02 +08:00
Daniel Pan
2836931021 Merge pull request #1320 from haiwen/side-nav-fix
[side nav] group list: fix
2016-08-19 18:09:18 +08:00
lian
b66e1b8364 reshare repo to user/group/pub when admin transfer a repo 2016-08-18 17:49:12 +08:00
llj
9c913b525f [upload link] show specific error msg for fileupload 2016-08-18 16:24:32 +08:00
Daniel Pan
d1a2d5c825 Merge pull request #1326 from haiwen/encrypted-share-link
fix bug when create an encrypted share link
2016-08-16 18:21:35 +08:00
lian
7ce3001d67 fix bug when create an encrypted share link 2016-08-16 17:28:49 +08:00
Daniel Pan
16e9f6296e Merge pull request #1325 from haiwen/rename-improvement
[lib/dirent] improved 'rename'
2016-08-16 13:34:19 +08:00
Daniel Pan
8d7c1c7924 Merge pull request #1324 from haiwen/pdf-view-tip
[pdf/doc] added tip for 'only 50 pages shown'
2016-08-16 13:24:01 +08:00
Daniel Pan
1848514294 Merge pull request #1321 from haiwen/repo-create-callback
repo created callback
2016-08-16 13:23:40 +08:00
llj
070d59eb9b Merge pull request #1309 from haiwen/admin-repo-share
admin manage repo share
2016-08-16 11:14:37 +08:00
llj
1e0d94b694 [share] fix 2016-08-16 10:20:05 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
llj
ab380bf361 [lib/dirent] improved 'rename' 2016-08-12 19:10:49 +08:00
llj
e69433e620 [pdf/doc] added tip for 'only 50 pages shown' 2016-08-12 12:05:37 +08:00
Daniel Pan
7c6211efab Merge pull request #1323 from haiwen/pdf-view-fix
[file view] pdf: UI fix for 'use_pdfjs'
2016-08-11 15:24:02 +08:00
llj
949f4e1925 shared/history file view: ui fix for pdf file 2016-08-11 15:12:02 +08:00
llj
9c9dd11db5 [file view] pdf: UI fix for 'use_pdfjs' 2016-08-11 14:53:33 +08:00
Daniel Pan
ece8fc7e5f Merge pull request #1322 from haiwen/tc-markdown
[T&C] show the content in markdown
2016-08-11 12:05:27 +08:00
llj
992c094d55 [T&C] show the content in markdown 2016-08-11 11:32:18 +08:00
lian
67f376002e repo created callback
allow user define repo created callback func at ../conf/seahub_settings.py
2016-08-10 14:50:29 +08:00
llj
70b04525b2 [side nav] group list: fix 2016-08-10 14:22:04 +08:00
llj
a3b15e6f62 [system admin] repo share: fix 2016-08-10 10:21:19 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
Daniel Pan
c4ffca620e Merge pull request #1319 from haiwen/compare-str
modified compare of strings which have digits in them
2016-08-09 17:22:19 +08:00
llj
1bd1aaef91 modified compare of strings which have digits in them 2016-08-09 17:16:06 +08:00
xiez
1fafc7faac Merge pull request #1316 from haiwen/user-admin
[sysadmin] update user admin page
2016-08-09 16:40:10 +08:00
xiez
929731ec0d Merge pull request #1318 from haiwen/feature/virus_check
Add virus check when upload files to upload link
2016-08-09 11:28:26 +08:00
lian
b74bc6fd2a [syadmin] add "Name" and "Contact Email" when export users to excel 2016-08-09 11:17:38 +08:00
zhengxie
e48ae64576 [inst] Update user table 2016-08-08 18:19:54 +08:00
Daniel Pan
648117719d Merge pull request #1317 from haiwen/welcome-msg
update welcome message
2016-08-08 16:18:22 +08:00
lian
a13a75d945 update welcome message
allow user change welcome message by change SITE_NAME setting
2016-08-08 16:15:12 +08:00
zhengxie
c255735326 Fix api error when 2fa enabled 2016-08-08 15:59:19 +08:00
lian
06022c3109 [sysadmin] update user admin page 2016-08-08 14:03:07 +08:00
xiez
c53791f27a Merge pull request #1315 from haiwen/2fa
[2fa] modified UI for 'token input'
2016-08-08 14:00:12 +08:00