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
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
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
lian
04f6b71441
Not allowed to set folder perm if repo not shared out
2016-10-18 13:34:36 +08:00
xiez
eaa14449aa
Merge pull request #1376 from haiwen/ldap-imported
...
show name/contact-email info at ldap imported page
2016-10-18 10:46:09 +08:00
zhengxie
4ceddf23ab
Update demo account url
2016-10-18 10:38:25 +08:00
lian
d9fba1ab38
show name/contact-email info at ldap imported page
2016-10-18 10:17:41 +08:00
zhengxie
4939e412ad
Add oracle init sql
2016-10-17 17:10:33 +08:00
Daniel Pan
34640eb3e5
Merge pull request #1374 from haiwen/magnificPopup
...
Magnific popup
2016-10-17 15:13:53 +08:00
Daniel Pan
96e0a06204
Merge pull request #1375 from haiwen/mv-fix
...
[dirent-mvcp] bugfix
2016-10-17 10:14:41 +08:00
llj
90ab3746b3
[dirent-mvcp] bugfix
2016-10-14 16:16:33 +08:00
llj
353d3b77ea
[magnificPopup] handle 'small images with long names' problem
2016-10-14 12:05:25 +08:00
llj
82f3622a29
[dir view] rewrote 'view image file with magnificPopup'
2016-10-13 17:53:31 +08:00
lian
5fab804dd6
Merge pull request #1373 from ni720/patch-1
...
make url clickable link in PWD reset email
2016-10-13 17:39:14 +08:00
ni720
28ad5ab40b
make url clickable link in PWD reset email
2016-10-12 21:45:49 +02:00
xiez
a1d749e312
Merge pull request #1372 from haiwen/folder-perm
...
not allow user to set folder perm in virtual repo
2016-10-10 16:02:20 +08:00
lian
c24f871a7c
not allow user set folder perm in virtual repo
2016-10-10 15:23:01 +08:00
xiez
ca07eb9c44
Merge pull request #1357 from haiwen/timestamp
...
update convert datetime/timestamp to isoformat time string
2016-10-10 15:04:32 +08:00
