haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 19:05:16 +00:00
Code Issues Releases Wiki Activity
4,437 Commits 128 Branches 443 Tags 1.4 GiB
887b6bbe03
Commit Graph

4437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
887b6bbe03 Fix tests and replace mimetype with content_type 2015-12-05 16:35:50 +08:00
zhengxie
68efe49481 [django 1.8] WIP 2015-12-05 16:32:01 +08:00
zhengxie
cf1d719ecf Merge branch '5.0' 2015-12-05 16:30:56 +08:00
zhengxie
0023d93aad [share] Update share link passwd 2015-12-05 16:29:31 +08:00
zhengxie
238d3d28d4 [api2] Support username login 2015-12-05 16:29:19 +08:00
zhengxie
b316c4decc [api2] Add more attributes to search-user and account info 2015-12-05 12:24:51 +08:00
zhengxie
8410afdba2 Fix api mkdir error when parent dir is nonexistent, and clean duplicated code in account 2015-12-05 11:46:08 +08:00
zhengxie
107f383bc1 Merge branch '5.0' 2015-12-04 16:25:10 +08:00
xiez
612abc605d Merge pull request #924 from haiwen/sysadmin-repo 
update sys admin repo view
 2015-12-04 16:20:52 +08:00
lian
c8b84eb47f update sys admin repo view & user info test 2015-12-04 16:19:32 +08:00
zhengxie
e91e796efc [api2] Fix create dir shared item bug 2015-12-04 16:17:13 +08:00
llj
2cb64b9e92 Merge pull request #923 from haiwen/user-info-groups 
update trans & groups tab ID in user info page
 2015-12-04 14:38:42 +08:00
lian
1c4780c5c0 update trans & groups tab ID in user info page 2015-12-04 14:33:33 +08:00
xiez
698bfc4e09 Merge pull request #922 from haiwen/grp-avatar-cache 
[api2.1] update groups api when get group avatar url
 2015-12-04 14:07:26 +08:00
lian
a084916cf8 [api2.1] update groups api when get group avatar url 2015-12-04 13:59:25 +08:00
zhengxie
7c06cbd76f [avatar] Fix cache bug in api_grp_avatar_url 2015-12-04 13:55:00 +08:00
zhengxie
5c3de620f8 Merge branch '5.0' 2015-12-04 11:57:53 +08:00
zhengxie
02bef78f7f [tests] Add user options tests 2015-12-04 11:25:26 +08:00
zhengxie
b080acc716 Handle case when commit in an event is None 2015-12-04 11:22:09 +08:00
zhengxie
f3732d87b6 Fix multiple user options bug, handle the case repo is None when delete 2015-12-04 11:15:34 +08:00
zhengxie
4a5f27052a [i18n] Update locales 2015-12-04 10:46:15 +08:00
zhengxie
cc1e0d0ba1 [i18n] Update 2015-12-03 18:26:03 +08:00
xiez
266dc106a8 Merge pull request #920 from haiwen/translate 
update translate
 2015-12-03 18:06:31 +08:00
lian
7998a6e405 update translate 2015-12-03 18:05:20 +08:00
zhengxie
e74b7b4d2a [i18n] Update source files 2015-12-03 17:59:33 +08:00
xiez
25ce157a7f Merge pull request #919 from haiwen/trans 
update translate
 2015-12-03 17:58:21 +08:00
lian
8e2a744db6 update translate 2015-12-03 17:56:28 +08:00
llj
bd72a97c85 [groups] show error msg for 'add new group' 2015-12-03 17:35:13 +08:00
zhengxie
3b23cfd26a [i18n] Update source files to 5.0 2015-12-03 16:58:31 +08:00
xiez
97fa71b176 Merge pull request #914 from haiwen/new-groups-api 
[api] new groups api
 2015-12-03 16:50:06 +08:00
lian
e146e92331 [api2.1] new groups api 2015-12-03 16:45:08 +08:00
Daniel Pan
ea4a0b1cfe Merge pull request #918 from haiwen/avatar-url 
[api] return absolute avatar url
 2015-12-03 14:08:43 +08:00
llj
32b8164347 Merge pull request #917 from haiwen/file_access_ui 
[file access] modified UI
 2015-12-03 12:04:59 +08:00
lian
ad37820ea7 [api] return absolute avatar url 2015-12-03 12:04:15 +08:00
llj
a11cb6d32f [file access] modified UI 2015-12-03 11:56:43 +08:00
Daniel Pan
b1ac1d1391 Merge pull request #916 from haiwen/search-user 
[api] return avatar url when search user
 2015-12-03 11:03:33 +08:00
lian
2b5d444e60 [api] return avatar url when search user 2015-12-03 11:00:34 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
 2015-12-02 17:37:50 +08:00
llj
99fbdab5fd Merge pull request #913 from haiwen/import-grp-member 
[group] import members from csv file
 2015-12-02 14:16:01 +08:00
lian
577c27c9d2 [group] import members from csv file 2015-12-02 14:10:32 +08:00
Daniel Pan
70429bafe4 Merge pull request #915 from haiwen/groups 
Groups
 2015-12-02 12:17:06 +08:00
llj
51b44c40a3 [groups] use new collection url 2015-12-02 11:39:36 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
Daniel Pan
53ba4f2fd6 Merge pull request #909 from haiwen/file-access 
add new file access log page
 2015-11-27 10:56:27 +08:00
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
xiez
8b55b2ffaf Merge pull request #904 from haiwen/userinfo-groups 
[user admin] add "groups" tab at user info page
 2015-11-24 19:10:24 +08:00
lian
427b51ae23 [user admin] add "groups" tab at user info page 2015-11-24 19:02:30 +08:00
zhengxie
479889c9a5 [sysadmin] Fix search repo error when name is None 2015-11-24 14:45:46 +08:00
xiez
ea53755e93 Merge pull request #903 from haiwen/export-excel 
Export excel
 2015-11-24 13:29:09 +08:00
zhengxie
6aa5b4fadd [tests] Update user export excel 2015-11-24 13:28:46 +08:00