lian
5ccd21c718
update new office file
2016-12-15 13:50:04 +08:00
llj
13fac0efa0
[dir view] redesigned 'new folder/file'
2016-12-15 12:12:30 +08:00
Daniel Pan
92e9d6cb9a
Merge pull request #1402 from haiwen/show-logout
...
Show logout
2016-12-06 10:20:32 +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
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
llj
25a2fd91c4
[dir view] fix for dirs with more than 100 dirents
2016-11-01 18:01:41 +08:00
lian
7a2ad81be2
fix bug when admin searching unexisting user
2016-11-01 11:45:32 +08:00
Daniel Pan
2f5e58a4ac
Merge pull request #1380 from haiwen/broken-lib
...
[sort libs] fix for broken libraries
2016-11-01 11:28:38 +08:00
Daniel Pan
5e63501675
Merge pull request #1382 from haiwen/folder-perm
...
rm unused perm when get all folder perm
2016-10-28 16:37:01 +08:00
lian
7aac0745fa
not show invalid perm when get all folder perm
2016-10-28 16:34:07 +08:00
llj
65405ad84f
[sort libs] fix for broken libraries
2016-10-25 18:21:48 +08:00
llj
6e0e306f93
[markdown edit] added 'add a file'; fixed UI for 'link', 'image' popup
2016-10-25 12:05:46 +08:00
llj
0128cc25ad
[jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix
2016-10-25 11:39:52 +08:00
zhengxie
ee3d19ff73
[sql] Update oracle
2016-10-20 17:45:11 +08:00
xiez
5d46d40652
Merge pull request #1378 from haiwen/oracle-sql
...
Add oracle init sql
2016-10-19 17:43:49 +08:00
Daniel Pan
acebee3e72
Merge pull request #1377 from haiwen/permission
...
Not allowed to set folder perm if repo not shared out
2016-10-18 13:47:47 +08:00
