1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 02:42:47 +00:00
Commit Graph

5247 Commits

Author SHA1 Message Date
zhengxie
d6ab969139 [i18n] Update locales 2015-06-18 10:43:07 +08:00
zhengxie
1858854664 [i18n] Update source files 2015-06-18 10:25:58 +08:00
zhengxie
5f2cde49a7 [i18n] Update source files 2015-06-18 10:13:01 +08:00
Daniel Pan
f6a3b05f75 Merge pull request #650 from haiwen/select
global addressbook
2015-06-18 09:57:09 +08:00
llj
6d1e5c4480 [select2] bugfix 2015-06-17 18:41:33 +08:00
lian
be00d946d8 Do not show contacts tab 2015-06-17 18:20:32 +08:00
lian
7d3cadc1e9 Update code of transfer repo at sysadmin page 2015-06-17 16:50:31 +08:00
lian
3a0df405c4 [repo-setting/sysadmin] use Select2 & search-user api
use Select2 & search-user api transfer-repo and share-repo
2015-06-17 14:53:49 +08:00
llj
945648de4c [select2] modification for long name/email 2015-06-17 14:26:31 +08:00
llj
a32ae19a4b [repo setting] modified 'folder perm' 2015-06-17 13:33:40 +08:00
zhengxie
f6fffd6020 [api2] Update file details 2015-06-17 09:56:10 +08:00
lian
eb0bc2d937 Fix bug when share to a unregistered user 2015-06-16 19:39:28 +08:00
llj
8d8f2e3a39 [select2] modified 'placeholder' text 2015-06-16 19:15:56 +08:00
Daniel Pan
47a8a975d6 Merge pull request #648 from haiwen/session-flush
Clear session if user is inactive
2015-06-16 19:03:29 +08:00
lian
a8fb97bda0 enable enter emails 2015-06-16 18:52:31 +08:00
lian
56ce32ab1e fix bug when search by nickname 2015-06-16 18:20:51 +08:00
llj
43d020a0a4 modification 2015-06-16 17:38:09 +08:00
llj
e69b93a1c5 add missing css file 2015-06-16 17:25:22 +08:00
llj
6c3559c2d3 [group manage] modified 'group transfer' 2015-06-16 17:16:32 +08:00
llj
f9b2efbeea [group manage] modified 'add member/admin' 2015-06-16 16:47:09 +08:00
Daniel Pan
864ae081c2 Merge pull request #647 from haiwen/notice-update
[notice] add try-except when get notice's detail
2015-06-16 14:13:56 +08:00
Daniel Pan
1e396ac7a2 Merge pull request #646 from haiwen/ie_tip
Ie tip
2015-06-16 14:11:49 +08:00
lian
46d8b0f00e Clear session if user is inactive 2015-06-16 13:55:59 +08:00
lian
d4a5ac277d [notice] add try-except when get notice's detail 2015-06-16 13:53:13 +08:00
lian
c60676d5dc Seperate DB and LDAP when search users 2015-06-16 10:53:30 +08:00
zhengxie
5e0d106841 Update secret key generator 2015-06-16 10:27:17 +08:00
zhengxie
7cdb70368a Fix auth tokens 2015-06-16 10:27:17 +08:00
zhengxie
ec138440fb Fix encrypt shared dir password loop bug 2015-06-16 10:27:17 +08:00
llj
9b903cbaf2 [repo perm] 'perm add': modification, bugfix, improvement 2015-06-15 18:37:55 +08:00
llj
d496a4f9e6 [file view] removed 'private share' 2015-06-15 10:33:40 +08:00
llj
dbbfd393bb [contact] bugfix, improvement 2015-06-13 18:43:45 +08:00
lian
5442eac171 set ENABLE-GLOBAL-ADDRESSBOOK default True 2015-06-13 17:52:05 +08:00
Daniel Pan
f1864b26ed Merge pull request #642 from haiwen/sub-lib
Do not show sub lib when is pro version
2015-06-13 17:43:56 +08:00
lian
b94a95c2cc Do not show sub lib when is pro version 2015-06-13 17:37:04 +08:00
lian
80523a663a Update pubuser/group-members/profile page
remove add-to-contact btn
2015-06-13 15:39:25 +08:00
Daniel Pan
9d5f49dd03 Merge pull request #640 from haiwen/encrypted-sub-lib
[api] Enable create sub-lib in encrypted repo
2015-06-13 09:55:51 +08:00
lian
2bd2588730 [api] Enable create sub-lib in encrypted repo 2015-06-12 18:33:05 +08:00
lian
6c74c14da4 [global-addressbook]
show contacts tab when is-cloud-mode AND not enabel global addressbook
2015-06-12 17:50:15 +08:00
lian
747b477a1f add cloud address book function 2015-06-12 16:16:49 +08:00
Daniel Pan
8dfa6550db Merge pull request #637 from haiwen/reuse-token
[api] reuse upload token
2015-06-12 11:55:32 +08:00
lian
ddc250ebd8 [api] reuse upload token 2015-06-12 11:16:23 +08:00
llj
8d2054dafd [js] bugfix for object 2015-06-10 13:43:41 +08:00
llj
caaf5d1d5f Merge pull request #633 from haiwen/star-file
[starred-file] fix bug when view starred image file
2015-06-10 11:12:37 +08:00
llj
c45427e46f Merge pull request #627 from haiwen/view_shared_dir
[view shared dir] use 'maganificPopup' for image files
2015-06-09 12:11:35 +08:00
llj
541e3e2bca [view shared dir] use 'maganificPopup' for image files 2015-06-09 12:09:19 +08:00
lian
ffb31e5cb0 [starred-file] fix bug when generate file view url 2015-06-09 11:54:18 +08:00
Daniel Pan
bd52ede970 Merge pull request #628 from haiwen/dir_view
[dir view] modification for image files
2015-06-09 11:48:17 +08:00
Daniel Pan
c72d5582e3 Merge pull request #632 from haiwen/dir-view
[api] add current dir perm when get dir entries
2015-06-08 12:09:24 +08:00
lian
48d1514bf9 [api] add current dir perm when get dir entries 2015-06-08 11:47:18 +08:00
llj
ee816216ea add 'top tip' for IE 2015-06-05 17:49:09 +08:00