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
4b088588d5
Merge pull request #1407 from moschlar/patch-1
...
Update notice_email.html
2016-11-25 21:22:15 +08:00
Moritz Schlarb
6d6a372e7b
Update notice_email.html
...
Also add a real link to the notification list site.
2016-11-25 11:55:48 +01: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
Daniel Pan
45be2d37bd
Merge pull request #1370 from haiwen/mv
...
[dir view] added 'move dirents by drag & drop'
2016-11-18 12:31:59 +08:00
llj
a076a934f9
[dir view] added 'move dirents by drag & drop'
2016-11-18 12:21:11 +08:00
Daniel Pan
aac96ff4e6
Merge pull request #1379 from haiwen/md-add-file
...
Markdown add file
2016-11-18 12:05:45 +08:00
llj
dbd104e7d0
show log-out message
2016-11-18 11:56:11 +08:00
Daniel Pan
fb70983b5b
Merge pull request #1396 from haiwen/doc-fix
...
[doc file view] bugfix
2016-11-18 11:36:58 +08:00
Daniel Pan
8b54e37d1f
Merge pull request #1400 from haiwen/share
...
[share.js] show error msg
2016-11-18 11:36:24 +08:00
Daniel Pan
625573a669
Merge pull request #1361 from haiwen/fileupload
...
Fileupload
2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a
Merge pull request #1337 from haiwen/jstree-update
...
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
2016-11-18 11:27:11 +08:00
llj
9ba72b4b47
[UI] top-bar: bugfix & improvement
2016-11-17 17:51:27 +08:00
llj
2d26c57a66
[share.js] show error msg
2016-11-17 11:53:43 +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
llj
2cfd8c0b7c
[doc file view] bugfix
2016-11-15 13:54:48 +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
xiez
e25b28e8f6
Merge pull request #1393 from haiwen/middleware
...
update InfobarMiddleware
2016-11-14 11:27:42 +08:00
lian
16fa0f5126
update InfobarMiddleware
...
1. filter AJAX request out
2. filter API request out
2016-11-14 10:53:08 +08:00
Daniel Pan
3df35803a5
Merge pull request #1392 from haiwen/video-view
...
Video view
2016-11-12 17:13:45 +08:00
llj
2e565e4434
[history/shared file view] modification for video files
2016-11-11 13:53:47 +08:00
llj
9e48df9ca9
[video file view] use videojs
2016-11-10 17:21:26 +08:00
xiez
05ee191fcb
Merge pull request #1390 from haiwen/max-users
...
set default MaxUsers num to 3
2016-11-07 18:24:20 +08:00
lian
1126bfefb8
set default MaxUsers num to 3
2016-11-07 18:18:06 +08:00
xiez
048d6df0ba
Merge pull request #1388 from haiwen/new-user
...
check if user num exceed limit before add user
2016-11-05 13:49:23 +08:00
lian
34a350d623
check if user num exceed limit before add user
2016-11-05 12:09:58 +08:00
xiez
fb681e38bf
Merge pull request #1383 from haiwen/check-repo
...
check if repo/folder exist before upload/update file
2016-11-02 18:14:11 +08:00
lian
41dbebaa86
check if repo/folder exist before upload/update file
2016-11-02 18:04:59 +08:00
xiez
d00cba5769
Merge pull request #1385 from haiwen/search-user
...
fix bug when admin searching unexisting user
2016-11-02 12:08:33 +08:00
Daniel Pan
5903c7138f
Merge pull request #1386 from haiwen/fix
...
[dir view] fix for dirs with more than 100 dirents
2016-11-01 18:21:41 +08:00
