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 |
|
lian
|
b0f2ddab00
|
update
|
2017-02-09 18:01:04 +08:00 |
|
lian
|
5743c3879e
|
update admin import user from csv file
|
2017-02-09 17:58:04 +08:00 |
|
Daniel Pan
|
ee4c58955d
|
Merge pull request #1476 from haiwen/magnificPopup-fix
[dir view] bugfix for img view with magnificPopup
|
2017-02-09 16:49:58 +08:00 |
|
llj
|
f85d9e8e67
|
[dir view] bugfix for img view with magnificPopup
|
2017-02-09 16:00:36 +08:00 |
|
lian
|
718bdbb59b
|
update admin manage group page
|
2017-02-09 14:59:49 +08:00 |
|
llj
|
9fc46aa7d4
|
[ODF] modified file view for ODF; fix bugs
|
2017-02-08 17:34:31 +08:00 |
|
lian
|
8a61fbf81a
|
Merge pull request #1465 from haiwen/admin-del-repo
[sysadmin] single user page: delete 'owned' library with ajax
|
2017-02-08 14:52:43 +08:00 |
|
xiez
|
2265dbf08f
|
Merge pull request #1473 from haiwen/inactive
show detailed error msg when user login failed
|
2017-02-08 11:24:18 +08:00 |
|
lian
|
768d93c724
|
show detailed error msg when inactive user login
|
2017-02-08 10:49:06 +08:00 |
|
xiez
|
e14d14f52f
|
Merge pull request #1471 from haiwen/import-user
force change password after batch add user
|
2017-02-07 18:15:33 +08:00 |
|
lian
|
287257dd7c
|
force change password after batch add user
|
2017-02-07 17:45:36 +08:00 |
|
lian
|
bd054efe7f
|
Merge pull request #1464 from haiwen/search-group
admin search group by name
|
2017-02-06 10:29:59 +08:00 |
|
zhengxie
|
b01034e6bb
|
Update LDAP checking
|
2017-01-20 16:07:53 +08:00 |
|