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

5646 Commits

Author SHA1 Message Date
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
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
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
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
llj
75261cfaf6 [settings] modification for custom 2017-03-11 13:43:37 +08:00
lian
c4b527302f admin remove unexisted user's deivce 2017-03-11 11:29:05 +08:00
lian
8286f73331 add api of amdin manage org user 2017-03-09 16:42:09 +08:00
Daniel Pan
4cf035986c Merge pull request #1508 from haiwen/delete-repo
update admin delete repo api
2017-03-09 12:58:58 +08:00
lian
735654d6b9 update admin delete repo api
for case of `seafile-data` has been damaged
no `repo object` will be returned from seafile api
delete the database record anyway
2017-03-08 18:20:49 +08:00
Daniel Pan
fdba056093 Merge pull request #1502 from haiwen/magnific-fix
[dir view] bugfix for 'magnificPopup' & 'grid-item download'
2017-02-28 17:13:00 +08:00
llj
acc1ebb6eb [dir view] bugfix for 'magnificPopup' & 'grid-item download' 2017-02-25 17:36:07 +08:00
xiez
e9035a29f2 Merge pull request #1499 from haiwen/download-file
update permission check when download file from history
2017-02-24 18:14:24 +08:00
lian
f99e53680e update permission check when download file from history 2017-02-24 18:13:20 +08:00
llj
8a113bf1eb Merge pull request #1497 from haiwen/update-fix
[fileupload] update-confirm-popup: fix
2017-02-22 17:05:51 +08:00
llj
e65a95c707 [fileupload] update-confirm-popup: fix 2017-02-22 16:44:14 +08:00
xiez
ff0bc5af47 Merge pull request #1486 from haiwen/import-users
update import users
2017-02-22 10:17:28 +08:00
lian
86b7925d5f update import users 2017-02-21 18:14:04 +08:00
lian
385a2ef096 update import users
fix bug when user upload a invalid csv file
2017-02-21 17:19:20 +08:00
xiez
1d96513cb6 Merge pull request #1488 from haiwen/default-lib
add api of admin create default repo for common user
2017-02-20 12:06:49 +08:00
lian
c396babd67 use "My Library" as default repo name 2017-02-20 11:58:59 +08:00
Daniel Pan
08ce98ec19 Merge pull request #1490 from haiwen/set-quota-ui
[UI] modified <input> ui of set-quota-form
2017-02-17 16:33:54 +08:00
llj
45fd5aa1b2 [UI] modified <input> ui of set-quota-form 2017-02-17 13:59:45 +08:00
lian
b7cad9a707 add api of admin create default repo for common user 2017-02-17 11:46:37 +08:00
zhengxie
5c78328b08 [i18n] Update locales 2017-02-17 10:47:17 +08:00
zhengxie
5b7706e1c1 [i18n] Update source files 2017-02-17 10:30:33 +08:00
xiez
93d62b761f Merge pull request #1483 from haiwen/share-admin
update api of out shared repos/folders
2017-02-16 13:03:49 +08:00
xiez
77d416bd6a Merge pull request #1485 from haiwen/repo_delete
[api2] Send signal when sysadmin delete a repo
2017-02-16 11:42:42 +08:00
zhengxie
e5a841ebf8 [api2] Send signal when sysadmin delete a repo 2017-02-16 11:32:31 +08:00
lian
fefb450b76 update api of out shared repos/folders
return contact email when get info of out shared repos/folders
2017-02-15 13:56:41 +08:00
Daniel Pan
8bfba7b0a2 Merge pull request #1482 from haiwen/search-user
update search user
2017-02-14 20:06:27 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00
xiez
24d63565ef Merge pull request #1481 from haiwen/virus
[notificaion] Handle the case that filename contains :
2017-02-13 16:59:52 +08:00
zhengxie
e52aa50fe6 [notificaion] Handle the case that filename contains : 2017-02-13 16:57:01 +08:00
lian
2b43226d08 Merge pull request #1475 from haiwen/odf-view
[ODF] modified file view for ODF; fix bugs
2017-02-13 16:49:12 +08:00
Daniel Pan
f0a610cf69 Merge pull request #1480 from haiwen/search-user
update search user
2017-02-13 16:48:26 +08:00
lian
c904884526 update search user
user can search if he/she has no permission of using global address book
2017-02-13 16:03:31 +08:00
llj
5802a37628 [ODF] update test 2017-02-13 15:54:14 +08:00
xiez
801ec6455e Merge pull request #1479 from haiwen/virus
Virus
2017-02-13 13:36:31 +08:00
zhengxie
2cb9d4c753 [notification] Update virus scan notice 2017-02-13 11:37:53 +08:00
Daniel Pan
7736ff0893 Merge pull request #1478 from haiwen/group-name
add exception check when get user joined groups
2017-02-10 18:20:24 +08:00
Daniel Pan
08c6cc69ce Merge pull request #1477 from haiwen/dirent-download-api
rm unused dirent download api
2017-02-10 18:19:28 +08:00
lian
edf0707d5b add exception check when get user joined groups 2017-02-10 18:15:58 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
Daniel Pan
4baaa29d17 Merge pull request #1467 from haiwen/ldap
Update LDAP checking
2017-02-10 14:26:04 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group
udpate admin groups page
2017-02-09 18:11:09 +08:00
xiez
94dc6e3488 Merge pull request #1474 from haiwen/update-import-user
update admin import user
2017-02-09 18:04:40 +08:00