zhengxie 8d10466ce9 Merge branch '6.2' ...

Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py

2018-04-27 11:00:43 +08:00

..

dialogs

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

widgets

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

account.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

activities.js

new design

2017-12-05 17:53:45 +08:00

activity-item.js

trash event

2018-03-13 18:31:01 +08:00

add-group-repo.js

update multi storages backend

2018-04-13 13:27:05 +08:00

add-pub-repo.js

redesigned all checkbox; bugfix & improvement; removed unused code & file

2016-04-07 11:06:48 +08:00

add-pubrepo-item.js

redesigned all checkbox; bugfix & improvement; removed unused code & file

2016-04-07 11:06:48 +08:00

add-repo.js

multi storage backend

2017-12-19 15:41:36 +08:00

create-pub-repo.js

update multi storages backend

2018-04-13 13:27:05 +08:00

deleted-repo.js

[lib icons] use new lib icons

2017-08-26 11:07:12 +08:00

details.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

device.js

rm synced repos at devices page (#1285)

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

devices.js

new design

2017-12-05 17:53:45 +08:00

dir.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

dirent-details.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

dirent-grid.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

dirent.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

file-comment.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

file-comments.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

fileupload.js

Merge branch '6.2'

2018-03-15 11:26:02 +08:00

folder-perm.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

folder-share-item.js

[API] share to groups, add test

2017-09-06 16:02:12 +08:00

group-discussion.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

group-discussions.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

group-item.js

modified 'group-repo'

2017-09-06 16:14:27 +08:00

group-manage-member.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

group-manage-members.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

group-member.js

Fix group transfer

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

group-members.js

[group discussion] fixup for 'enable' option

2018-04-18 16:39:20 +08:00

group-repo.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

group-settings.js

Merge branch '6.2'

2018-04-27 11:00:43 +08:00

group.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

groups.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

invitation.js

[invite people] enable to invite multiple guests at one time

2017-12-19 12:05:51 +08:00

invitations.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

my-deleted-repos.js

new design

2017-12-05 17:53:45 +08:00

myhome-repos.js

[my libs] fixed js

2018-03-16 14:55:00 +08:00

myhome-shared-repos.js

new design

2017-12-05 17:53:45 +08:00

notifications.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

organization-repo.js

[lib icons] use new lib icons

2017-08-26 11:07:12 +08:00

organization.js

new design

2017-12-05 17:53:45 +08:00

repo-details.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

repo-folder-perm-item.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

repo-shared-link.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

repo.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

share-admin-folder.js

new share admin page (#1233)

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

share-admin-folders.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

share-admin-repo.js

share permission refactor (#1843)

2017-11-01 18:13:51 +08:00

share-admin-repos.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

share-admin-share-link.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

share-admin-share-links.js

new design

2017-12-05 17:53:45 +08:00

share-admin-upload-link.js

[upgrade jquery] modifications, & cleaned up code & files

2018-02-05 16:47:56 +08:00

share-admin-upload-links.js

new design

2017-12-05 17:53:45 +08:00

share.js

Merge branch '6.2'

2018-03-15 11:26:02 +08:00

shared-repo.js

[share] share repo to group with 'admin' perm: fix

2017-09-06 16:02:12 +08:00

side-nav.js

[wiki] modification

2018-04-17 16:57:59 +08:00

starred-file-item.js

[favourites] modified file icon

2017-09-18 15:38:26 +08:00

starred-file.js

new design

2017-12-05 17:53:45 +08:00