llj
49349c265a
[sys useradmin] added 'set quota' for 'LDAP(imported)'; modified UI for 'LDAP'
2016-12-26 14:55:13 +08:00
Daniel Pan
65325da7de
Merge pull request #1434 from haiwen/fix/group_wiki
...
Fix group wiki for system admin
2016-12-26 14:38:21 +08:00
zhengxie
b92a370658
Fix group wiki for system admin
2016-12-26 14:18:29 +08:00
Daniel Pan
c28f684c22
Merge pull request #1428 from haiwen/enhancement/invitation
...
[invitation] Check duplicated accepter and add blocklist for accepter
2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299
[invitation] Check duplicated accepter and add blocklist for accepter
2016-12-26 11:49:45 +08:00
Daniel Pan
3b9c5dcb54
Merge pull request #1410 from haiwen/admin-create-group
...
admin create group
2016-12-23 15:49:22 +08:00
Daniel Pan
93773f8f2f
Merge pull request #1430 from haiwen/fileupload-fix
...
[fileupload] ui fix
2016-12-23 12:11:35 +08:00
llj
eb82d1a5f9
[fileupload] ui fix
2016-12-23 11:58:03 +08:00
llj
1785171a14
[sysadmin] groups: modification
2016-12-22 19:15:21 +08:00
llj
bb6e1d1419
[sys useradmin] enable 'set quota' for DB useradmin; modified 'set quota' in user info page
2016-12-21 18:24:22 +08:00
llj
d3ab1d76a3
[sys useradmin] enable add 'name, department' when add/import user; enable set 'name, department' in user info page
2016-12-21 11:41:32 +08:00
Daniel Pan
4a99ee32a0
Merge pull request #1427 from haiwen/export-user
...
update sysadmin export user to excel
2016-12-19 11:58:35 +08:00
lian
4d50810189
update sysadmin export user to excel
2016-12-19 11:05:37 +08:00
zhengxie
c64c567f20
[i18n] Update fr locale
2016-12-16 15:19:19 +08:00
lian
d6e216dda5
admin add group
2016-12-16 15:02:21 +08:00
Daniel Pan
24968ae639
Merge pull request #1425 from haiwen/export-excel
...
add space usage/quota info when export user to excel
2016-12-16 13:38:26 +08:00
lian
3f6bca3c0a
add space usage/quota info when export user to excel
2016-12-16 12:15:53 +08:00
Daniel Pan
f49ac5874e
Merge pull request #1420 from haiwen/del-repo
...
Del repo
2016-12-15 16:09:40 +08:00
lian
3aa9b7119c
Merge pull request #1419 from haiwen/back
...
Back
2016-12-14 14:19:43 +08:00
lian
718938a15c
update admin del damaged repo
2016-12-13 15:35:47 +08:00
llj
f2de948f97
[back] added 'back' for pages
2016-12-13 12:16:39 +08:00
llj
e2bd2fdabc
[file revisions] added 'back'
2016-12-12 14:37:20 +08:00
Daniel Pan
a2c69b2d4e
Merge pull request #1417 from haiwen/broken-lib
...
[my libs] don't show operations for broken library
2016-12-10 13:53:43 +08:00
llj
ed939315ef
[repo history] added 'go back'
2016-12-09 11:18:12 +08:00
llj
82f44cc389
[trash] added 'go back'
2016-12-08 18:20:40 +08:00
llj
3a66b713ac
[my libs] don't show operations for broken library
2016-12-08 16:02:42 +08:00
Daniel Pan
5277ddb4be
Merge pull request #1414 from haiwen/encoding
...
update encoding check when edit file
2016-12-03 18:35:48 +08:00
lian
4ec798592c
update encoding check when edit file
2016-12-03 18:08:57 +08:00
Daniel Pan
6eea11ab74
Merge pull request #1413 from haiwen/fix
...
[repo-folder-perm-admin] fix
2016-12-03 16:26:57 +08:00
llj
81bbaace7a
[repo-folder-perm-admin] fix
2016-12-03 14:12:04 +08:00
llj
b2d7536d14
Merge pull request #1412 from haiwen/password
...
update post args when generate encrypted share link
2016-12-02 12:21:49 +08:00
lian
a706bdd439
update post args when generate encrypted share link
2016-12-02 11:20:40 +08:00
Daniel Pan
d3843d684a
Merge pull request #1403 from haiwen/count-users
...
update count active users
2016-11-29 15:21:09 +08:00
Daniel Pan
04885aef6b
Merge pull request #1406 from haiwen/fileupload-fix
...
[fileupload] fix for Firefox 50
2016-11-25 18:29:50 +08:00
llj
3534b5836e
[fileupload] fix for Firefox 50
2016-11-25 16:59:21 +08:00
Daniel Pan
ad67cc22f4
Merge pull request #1405 from haiwen/cloud-mode
...
update cloude mode check
2016-11-22 18:24:59 +08:00
lian
ca8b4b264a
update cloude mode check
...
check if is cloud_mode before use `seafile_api.is_inner_pub_repo()`
2016-11-22 18:19:27 +08:00
Daniel Pan
3ee6d17612
Merge pull request #1404 from haiwen/about-fix
...
[about] fix
2016-11-21 13:27:35 +08:00
llj
b53ca50a0f
[about] fix
2016-11-21 11:03:24 +08:00
lian
10feed4095
update count active users
2016-11-21 10:13:04 +08:00
lian
89b688caa3
Merge pull request #1399 from Xandersoft/patch-1
...
Activation: link as link not Text
2016-11-16 18:17:50 +08:00
lian
722950d33e
Update activation_email.html
2016-11-16 18:17:36 +08:00
lian
274a2f084c
Merge pull request #1398 from Xandersoft/patch-2
...
Reset PWD - Looks like better
2016-11-16 18:15:28 +08:00
lian
550ccb1b02
Update password_reset_email.html
2016-11-16 18:15:16 +08:00
llj
577c4e0550
Merge pull request #1395 from haiwen/guest-share-icon
...
update condition check when display share icon for guest user
2016-11-16 10:16:22 +08:00
Xandersoft
170bc6cc0d
Looks like better
...
My idea was only to set
<code>
</p>
<p>
<a href="{{ url_base }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}">{% trans "Reset Password" %}</a>
</p>
</code>
2016-11-16 00:02:31 +01:00
Xandersoft
b803066654
Link as Link not Text
...
Sending the registration link as real clickable link
2016-11-15 23:58:40 +01:00
lian
f20b90da1f
update condition check when display share icon for guest user
2016-11-15 16:16:12 +08:00
xiez
f75f238b3e
Merge pull request #1394 from haiwen/sub-folder-id
...
fix bug when share sub-folder to user/group
2016-11-15 11:38:21 +08:00
lian
14c556e775
fix bug when share sub-folder to user/group
2016-11-15 11:23:23 +08:00
