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 |
|
Daniel Pan
|
9e956826d1
|
Merge pull request #1366 from haiwen/group_wiki-fix
[group wiki] fix UI
|
2016-09-24 16:27:24 +08:00 |
|
llj
|
eb7312904b
|
[group wiki] fix UI
|
2016-09-24 15:53:53 +08:00 |
|
Daniel Pan
|
d629e24369
|
Merge pull request #1364 from haiwen/sub-repo
filter out sub repos
|
2016-09-22 11:42:54 +08:00 |
|
lian
|
74b5e840db
|
filter out sub repos
|
2016-09-22 11:32:21 +08:00 |
|
xiez
|
2e8f406302
|
Merge pull request #1363 from haiwen/handler
NOT use is_pro_version in seahub/handler
|
2016-09-21 17:11:54 +08:00 |
|
lian
|
9a8be38362
|
NOT use is_pro_version in seahub/handler
|
2016-09-21 17:09:51 +08:00 |
|
xiez
|
9bdd8b1f75
|
Merge pull request #1351 from haiwen/revert-file
update revert file/dir
|
2016-09-20 14:07:32 +08:00 |
|
Daniel Pan
|
5c6dcb1888
|
Merge pull request #1362 from haiwen/profile
[user profile] modified UI
|
2016-09-20 13:25:12 +08:00 |
|
llj
|
405e6b7e2c
|
[user profile] modified UI
|
2016-09-20 13:19:09 +08:00 |
|
Daniel Pan
|
b1778698b9
|
Merge pull request #1354 from haiwen/repo-pattern
add library pattern feature
|
2016-09-19 13:57:02 +08:00 |
|
lian
|
b23fc5dbf3
|
udpate repo_created_cb
|
2016-09-19 13:54:17 +08:00 |
|
llj
|
3834245dce
|
[library templates] fix
|
2016-09-19 11:13:01 +08:00 |
|
Daniel Pan
|
a2434f7e4b
|
Merge pull request #1359 from haiwen/unlink-device
delete device token when mark device remoted wiped failed
|
2016-09-18 18:21:43 +08:00 |
|
lian
|
c8cf40309d
|
delete device token when mark device remoted wiped failed
|
2016-09-18 18:07:51 +08:00 |
|
Daniel Pan
|
5ed52bb292
|
Merge pull request #1358 from haiwen/ui-fix
[password change done] fixed UI
|
2016-09-18 14:33:41 +08:00 |
|
llj
|
f6efedd510
|
[password change done] fixed UI
|
2016-09-18 13:59:49 +08:00 |
|
lian
|
2e098b628e
|
enable library template when create group/pub repo
|
2016-09-18 11:58:14 +08:00 |
|
lian
|
dd2b8ca290
|
update convert datetime/timestamp to isoformat time string
|
2016-09-17 16:15:00 +08:00 |
|
Daniel Pan
|
eae6bf90fe
|
Merge pull request #1356 from haiwen/get-exif
update get image exif info
|
2016-09-17 15:43:50 +08:00 |
|
lian
|
e0b3764dfe
|
update get image exif info
|
2016-09-17 13:41:40 +08:00 |
|
lian
|
4d8383c82a
|
Merge pull request #1355 from haiwen/max_number_of_files
[fileupload] modified 'maxNumberOfFiles'
|
2016-09-17 13:37:40 +08:00 |
|
llj
|
fb6430b027
|
[fileupload] modified 'maxNumberOfFiles'
|
2016-09-14 17:35:42 +08:00 |
|