xiez
|
e60a421728
|
Merge pull request #558 from haiwen/fix-mvcp
Fix mvcp bug
|
2015-05-07 14:51:58 +08:00 |
|
xiez
|
ee74d86fbd
|
Merge pull request #555 from haiwen/fix-format-contacts-list
Fix xss in formating people list in sharing dialog
|
2015-05-07 14:51:27 +08:00 |
|
xiez
|
db4ca84d2a
|
Merge pull request #553 from haiwen/org-url
[organization] new org url
|
2015-05-07 14:51:02 +08:00 |
|
Daniel Pan
|
b8e51bf916
|
Fix mvcp bug in Firefox
|
2015-05-07 14:44:26 +08:00 |
|
Daniel Pan
|
e702c61172
|
Merge pull request #554 from haiwen/user-add
[user-admin] add try-exception when fail to add a user
|
2015-05-07 11:46:35 +08:00 |
|
Daniel Pan
|
74b7428d21
|
Fix xss in formating people list in sharing dialog
|
2015-05-07 11:45:04 +08:00 |
|
lian
|
9bfebfb2b6
|
[user-admin] add try-exception when fail to add a user
|
2015-05-07 11:38:29 +08:00 |
|
lian
|
08df85cc18
|
[organization] new org url
|
2015-05-07 10:47:05 +08:00 |
|
zhengxie
|
756177c952
|
[dist] Update dist files
|
2015-05-07 10:14:34 +08:00 |
|
zhengxie
|
5d145075d6
|
Merge branch 'dist'
|
2015-05-07 10:13:06 +08:00 |
|
xiez
|
1a30f4fe59
|
Merge pull request #531 from haiwen/client-login
support logging in from desktop client directly
|
2015-05-07 10:11:38 +08:00 |
|
Shuai Lin
|
6f5b329f65
|
do not update sudo mode ts if loggin in from client
|
2015-05-06 14:39:14 +08:00 |
|
Shuai Lin
|
89bff04eb8
|
update comment on ClientLoginTokenView
|
2015-05-06 14:28:00 +08:00 |
|
Shuai Lin
|
9b3d989b3c
|
only login the session when necessary
|
2015-05-06 14:28:00 +08:00 |
|
Shuai Lin
|
c63f68dfc5
|
support logging in from desktop client directly
|
2015-05-06 14:28:00 +08:00 |
|
Daniel Pan
|
247c6d5e31
|
Merge pull request #550 from haiwen/dir_op_bar
[dir view] fix 'op bar' when scroll
|
2015-05-06 13:26:59 +08:00 |
|
llj
|
2ff000a42b
|
[dir view] fix 'op bar' when scroll
|
2015-05-06 11:59:44 +08:00 |
|
Daniel Pan
|
22b6dac332
|
Merge pull request #549 from haiwen/upload_menu_position
[dir view] bugfix for '#upload-menu' ui
|
2015-05-05 17:39:25 +08:00 |
|
llj
|
ea355f0327
|
[dir view] bugfix for '#upload-menu' ui
|
2015-05-05 17:29:31 +08:00 |
|
xiez
|
9e6d2f2e4e
|
Merge pull request #544 from haiwen/sudo-mode
add "sudo mode": confirm password before doing sysadmin work
|
2015-05-05 15:41:10 +08:00 |
|
Daniel Pan
|
c67e089713
|
Merge pull request #545 from haiwen/star
starred file page
|
2015-05-05 15:37:56 +08:00 |
|
Daniel Pan
|
3f1780097a
|
Merge pull request #548 from haiwen/outline
[doc view] removed 'outline'
|
2015-05-05 15:29:31 +08:00 |
|
llj
|
f48b1d5772
|
[doc view] removed 'outline'
|
2015-05-05 14:50:42 +08:00 |
|
Shuai Lin
|
8473e78327
|
sudo mode: improve wording
|
2015-05-05 13:49:49 +08:00 |
|
Shuai Lin
|
120d094b1b
|
sudo mode: handle shibboleth login
|
2015-05-05 13:42:03 +08:00 |
|
Shuai Lin
|
942f7d765f
|
only update sudo mode ts if the user is an admin
|
2015-05-05 13:35:04 +08:00 |
|
Shuai Lin
|
1ad6c30b35
|
sudo mode: fix bugs in the code
|
2015-05-05 13:34:03 +08:00 |
|
Daniel Pan
|
1108ba1fe6
|
Merge pull request #547 from haiwen/select2
[select2] modified styles of 'input'
|
2015-05-05 12:10:11 +08:00 |
|
llj
|
b2e5db1153
|
[select2] modified styles of 'input'
|
2015-05-05 12:02:51 +08:00 |
|
Daniel Pan
|
ccac0ddbcb
|
Merge pull request #543 from haiwen/folder-perm
[folder perm, share] select contacts: enable search contact name
|
2015-05-05 11:38:35 +08:00 |
|
llj
|
a4509d30fe
|
[folder perm, share] contacts input: improvement
|
2015-05-05 11:10:56 +08:00 |
|
lian
|
2ea8eb6324
|
starred file page
|
2015-05-04 17:02:20 +08:00 |
|
Shuai Lin
|
763e760c7e
|
sudo mode: allow the tests to fail before we figure out how to test it
|
2015-05-04 15:52:28 +08:00 |
|
Shuai Lin
|
fd5eea7949
|
add an option to disable sudo mode (default is enabled)
|
2015-05-04 15:38:53 +08:00 |
|
Shuai Lin
|
c6ae62f4e0
|
require phantomjs to be installed
|
2015-05-04 15:01:08 +08:00 |
|
Shuai Lin
|
c449e3842c
|
add "sudo mode": confirm password before doing sysadmin work
|
2015-05-04 13:57:10 +08:00 |
|
llj
|
70315404b3
|
[folder perm, share] select contacts: enable search contact name
|
2015-04-30 21:19:35 +08:00 |
|
Daniel Pan
|
09ab163f7f
|
Merge pull request #542 from haiwen/view_file_bug
Fix onetime token bug in video/audio bug
|
2015-04-30 14:40:27 +08:00 |
|
Daniel Pan
|
282690d6f5
|
Merge pull request #538 from haiwen/folder-perm
[folder perm] modified 'user perm'
|
2015-04-30 14:40:08 +08:00 |
|
Daniel Pan
|
30cf8ef2eb
|
Merge pull request #540 from haiwen/sort
sort repo/dirent by name
|
2015-04-30 14:23:16 +08:00 |
|
llj
|
3934bb18ab
|
[user perm] improvement
|
2015-04-30 13:54:57 +08:00 |
|
lian
|
ca8a449d5a
|
enable sort repo/dirent by Chinese word
|
2015-04-30 11:59:09 +08:00 |
|
zhengxie
|
ded441bdce
|
Fix onetime token bug in video/audio bug
|
2015-04-30 11:01:41 +08:00 |
|
llj
|
92ec6f94d4
|
[folder perm] enable add perm for multi users & groups
|
2015-04-29 20:35:02 +08:00 |
|
Daniel Pan
|
801abe9026
|
Merge pull request #541 from haiwen/contact
User nickname in contact list
|
2015-04-29 19:58:17 +08:00 |
|
zhengxie
|
bac472f248
|
User nickname in contact list
|
2015-04-29 16:23:20 +08:00 |
|
llj
|
fb0c5ed09f
|
[share] modified 'contacts' input in file/dir private share
|
2015-04-29 12:04:46 +08:00 |
|
Daniel Pan
|
4cc780a3ad
|
Merge pull request #539 from haiwen/clear_token
Clear token when change user password
|
2015-04-29 10:39:53 +08:00 |
|
zhengxie
|
3edf280898
|
Clear token when change user password
|
2015-04-29 10:24:29 +08:00 |
|
llj
|
2c6994c56a
|
[folder perm] modified 'user perm'
|
2015-04-28 17:18:24 +08:00 |
|