zhengxie e6e6e82b82 Merge branch '6.0' ...

Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js

2017-04-17 16:21:22 +08:00

..

dialogs

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

widgets

[mobile] my libs: redesigned it

2017-01-04 17:19:57 +08:00

account.js

…

activities.js

…

activity-item.js

…

add-group-repo.js

enable library template when create group/pub repo

2016-09-18 11:58:14 +08:00

add-pub-repo.js

…

add-pubrepo-item.js

…

add-repo.js

add library pattern feature

2016-09-14 13:47:12 +08:00

create-pub-repo.js

enable library template when create group/pub repo

2016-09-18 11:58:14 +08:00

details.js

…

device.js

rm synced repos at devices page (#1285)

2016-07-14 13:54:17 +08:00

devices.js

…

dir.js

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

dirent-grid.js

[dir view] bugfix for 'magnificPopup' & 'grid-item download'

2017-02-25 17:36:07 +08:00

dirent.js

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

fileupload.js

Merge branch '6.0'

2017-03-27 13:53:35 +08:00

folder-perm.js

update rm ajax

2017-02-07 16:03:46 +08:00

folder-share-item.js

update rm ajax

2017-02-07 16:03:46 +08:00

group-discussion.js

accessibility improvement; bugfix & clean up

2016-05-04 11:51:56 +08:00

group-discussions.js

[file view] add 'discussion'

2016-05-24 17:53:29 +08:00

group-item.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

group-manage-member.js

…

group-manage-members.js

update admin manage group page

2017-02-09 14:59:49 +08:00

group-member.js

Fix group transfer

2016-05-06 14:48:48 +08:00

group-members.js

Merge branch '5.1'

2016-05-21 13:42:04 +08:00

group-repo.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

group-settings.js

Merge branch '6.0'

2017-02-17 17:11:33 +08:00

group.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

groups.js

[misc] fix

2016-07-20 14:20:19 +08:00

invitation.js

[invitations] bugfix & improvment

2016-07-20 15:45:05 +08:00

invitations.js

add ENABLE_GUEST_INVITATION setting

2016-07-20 15:45:38 +08:00

myhome-repos.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

myhome-shared-repos.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

notifications.js

update rm ajax

2017-02-07 16:03:46 +08:00

organization-repo.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

organization.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

repo-folder-perm-item.js

update rm ajax

2017-02-07 16:03:46 +08:00

repo-shared-link.js

…

repo.js

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

share-admin-folder.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-folders.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-repo.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-repos.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-share-link.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-share-links.js

update user permission

2016-08-22 11:20:48 +08:00

share-admin-upload-link.js

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

share-admin-upload-links.js

update user permission

2016-08-22 11:20:48 +08:00

share.js

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

shared-repo.js

[mobile] redesigned 'libs list' UI for shared/org/groups/group

2017-01-04 17:19:57 +08:00

side-nav.js

update rm ajax

2017-02-07 16:03:46 +08:00

starred-file-item.js

[favorites] show thumbnail for image files

2017-04-01 16:59:17 +08:00

starred-file.js

Merge branch '6.0'

2017-04-17 16:21:22 +08:00