Daniel Pan
|
cf41dd6be2
|
Merge pull request #1057 from haiwen/5.0-owa-api
5.0 owa api
|
2016-03-10 10:55:35 +08:00 |
|
lian
|
d750019b84
|
[api2] update err msg of owa api
|
2016-03-10 10:46:51 +08:00 |
|
lian
|
9642fd129d
|
[api2] add new owa file api
|
2016-03-10 10:46:42 +08:00 |
|
Daniel Pan
|
8f368f3231
|
Merge pull request #1036 from haiwen/restore-file-dir-api
add dir revert api & update file revert api
|
2016-03-10 10:36:24 +08:00 |
|
xiez
|
969537931b
|
Merge pull request #1052 from haiwen/user-options
update get user option
|
2016-03-08 11:01:29 +08:00 |
|
zhengxie
|
e844735cc2
|
[tests] Update tests
|
2016-03-08 10:59:46 +08:00 |
|
lian
|
4197393268
|
update user options
|
2016-03-07 18:14:35 +08:00 |
|
lian
|
7823d500e5
|
add dir revert api & update file revert api
|
2016-03-07 15:30:28 +08:00 |
|
xiez
|
cf3619bf92
|
Merge pull request #1047 from haiwen/email
[api2] add send share/upload link api
|
2016-03-07 13:31:57 +08:00 |
|
lian
|
0f311f0c4e
|
[api2] add send share/upload link api
|
2016-03-07 13:23:11 +08:00 |
|
Daniel Pan
|
255c3657f3
|
Merge pull request #1045 from haiwen/5.0-is_safe_url
[utils] Update is_safe_url
|
2016-03-04 17:17:52 +08:00 |
|
zhengxie
|
4d0ac16a47
|
[utils] Update is_safe_url
|
2016-03-04 16:17:47 +08:00 |
|
Daniel Pan
|
c28fe89d4e
|
Merge pull request #1042 from haiwen/5.0-user_reset
Update init user reset password, and clean code
|
2016-03-01 21:09:30 +08:00 |
|
zhengxie
|
a14c10a8fc
|
Update init user reset password, and clean code
|
2016-03-01 16:56:24 +08:00 |
|
Daniel Pan
|
d6d514f7e3
|
Merge pull request #1039 from haiwen/default-lib
update admin repo view check
|
2016-02-29 17:27:34 +08:00 |
|
lian
|
9e88a7281b
|
update admin repo view check
|
2016-02-29 17:20:32 +08:00 |
|
Daniel Pan
|
1aedc8f495
|
Merge pull request #1031 from haiwen/5.0-share-quota
Remove share quota
|
2016-02-24 16:37:24 +08:00 |
|
Daniel Pan
|
8a4e107044
|
Merge pull request #1032 from haiwen/share-repo-api
[share] show error msg for every failed item
|
2016-02-24 16:24:24 +08:00 |
|
llj
|
51f47662d6
|
[share] show error msg for every failed item
|
2016-02-24 16:11:45 +08:00 |
|
lian
|
62979d9af6
|
add err msg detail when share repo/folder failed
|
2016-02-24 15:02:01 +08:00 |
|
zhengxie
|
b41e87efea
|
Remove share quota
|
2016-02-24 14:20:28 +08:00 |
|
Daniel Pan
|
101670f701
|
Merge pull request #1030 from haiwen/5.0-quota
Use GB instead of GiB in filesizeformat and quota calculation
|
2016-02-24 12:01:33 +08:00 |
|
zhengxie
|
acb1a5e51e
|
Use GB instead of GiB in filesizeformat and quota calculation
|
2016-02-24 11:53:32 +08:00 |
|
Daniel Pan
|
fa24c0c5d1
|
Merge pull request #1028 from haiwen/5.0-shib-nickname
[shib] Use display_name in shib_meta as nickname, fallback to givenna…
|
2016-02-23 16:11:33 +08:00 |
|
Daniel Pan
|
eb0f749b82
|
Merge pull request #1029 from haiwen/5.0-email2nickname
[seahub tags] Handle empty nickname in email2nickname
|
2016-02-23 16:10:26 +08:00 |
|
zhengxie
|
d01c21a9cc
|
[test] Update shib test
|
2016-02-23 15:23:45 +08:00 |
|
zhengxie
|
f98b97b60b
|
[seahub tags] Handle empty nickname in email2nickname
|
2016-02-23 15:13:12 +08:00 |
|
zhengxie
|
11e645cae0
|
[shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing
|
2016-02-23 14:26:10 +08:00 |
|
Daniel Pan
|
663a00e8ab
|
Merge pull request #1025 from haiwen/5.0-virus-fix
5.0 virus fix
|
2016-02-23 13:49:55 +08:00 |
|
zhengxie
|
a5f262b1a6
|
[test] Workaround for virus scan test
|
2016-02-23 13:38:22 +08:00 |
|
zhengxie
|
ebcd7ed44d
|
[virus] Fix url error when records number more than 9
|
2016-02-23 11:53:16 +08:00 |
|
Daniel Pan
|
08813c6ee6
|
Merge pull request #1020 from haiwen/default-repo
update admin repo view page
|
2016-02-23 10:33:06 +08:00 |
|
lian
|
fe593accf7
|
[seafadmin] not show system default repo at "all" tab page
|
2016-02-22 16:16:50 +08:00 |
|
llj
|
262fae0590
|
[system repo view] bugfix & improvement; rm unused files
|
2016-02-22 15:44:23 +08:00 |
|
lian
|
8124fa4a79
|
update admin default repo view page & rm unused code
|
2016-02-19 15:47:04 +08:00 |
|
Daniel Pan
|
a5056c7a67
|
Merge pull request #1021 from haiwen/5.0-notice
[notice] Fix notification email bug
|
2016-02-18 23:04:22 +08:00 |
|
zhengxie
|
a355d40135
|
[notice] Update logger level
|
2016-02-18 22:02:29 +08:00 |
|
Daniel Pan
|
f2e51ac488
|
Merge pull request #1022 from haiwen/5.0-settings
[settings] Update pub repo creation and sync with folder
|
2016-02-18 18:32:01 +08:00 |
|
zhengxie
|
7e81ad7356
|
[tests] Fix tests
|
2016-02-17 16:17:00 +08:00 |
|
zhengxie
|
ae1c8f0a0a
|
[notice] Fix notification email bug
|
2016-02-17 16:01:54 +08:00 |
|
zhengxie
|
602355381f
|
[settings] Update pub repo creation and sync with folder
|
2016-02-17 16:00:53 +08:00 |
|
zhengxie
|
7ec15def66
|
[travis] Fix error
|
2016-02-17 15:40:25 +08:00 |
|
Daniel Pan
|
f2b4cdad3d
|
Merge pull request #1016 from haiwen/5.0-default_repo
Fix default repo re-creation bug when web login after desktop
|
2016-02-01 14:10:29 +08:00 |
|
zhengxie
|
52b661147e
|
Fix default repo re-creation bug when web login after desktop
|
2016-02-01 11:54:02 +08:00 |
|
Daniel Pan
|
5f462a5f63
|
Merge pull request #1013 from haiwen/sub-repo
not show sub repo at some page
|
2016-02-01 11:47:00 +08:00 |
|
Daniel Pan
|
d1912a6d4d
|
Merge pull request #1012 from haiwen/revert-file-dir
refresh current page when revert file/dir
|
2016-02-01 11:45:53 +08:00 |
|
lian
|
905c81a57b
|
not show sub-repo at web front page
|
2016-02-01 11:21:05 +08:00 |
|
lian
|
07ef3f7e73
|
refresh current page when revert file/dir
|
2016-01-29 16:45:24 +08:00 |
|
Daniel Pan
|
55a23c6926
|
Merge pull request #1011 from haiwen/view-trash-file
update trash file view page
|
2016-01-29 14:33:34 +08:00 |
|
lian
|
0756c56e32
|
update trash file view page
|
2016-01-29 14:20:46 +08:00 |
|