1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Commit Graph

767 Commits

Author SHA1 Message Date
lian
0bff0c1104 Merge branch '7.1' into master 2020-09-30 11:05:44 +08:00
llj
39078da3f9 [Linked Devices] added confirmation for 'unlink device' (#4683) 2020-09-28 10:44:12 +08:00
llj
b86f0af855 [system admin / logs / Permission] fixup for 'Share To' (#4680) 2020-09-24 16:54:49 +08:00
llj
44c20e5bc7 [org admin / users] fixup for sort by 'Space Used' (#4682) 2020-09-24 16:53:55 +08:00
Leo
267e9f525c Ocm (#4640)
* ocm share local and inter-server api, ocm share page (#4335)

* ocm share

* optimize code

* ocm repo (#4341)

* ocm repo

* hide share if not repo owner

* optimize code

* fix All refresh page, hide upload if is r perm

* update permission check

* update return status code

* update code

* add receive user drop share
2020-09-24 10:57:45 +08:00
llj
7474616129 [system admin] statistic/traffic: fixed sort for users/orgs traffic (#4677) 2020-09-22 14:03:58 +08:00
杨顺强
aea4e3c042 update copyright (#4672) 2020-09-17 14:48:29 +08:00
lian
141121f5af Merge branch '7.1' into master 2020-09-10 16:37:31 +08:00
Leo
d5f578318f repo_files_auto_del (#4626)
* repo_files_auto_del

* repo_files_auto_del

* update code
2020-09-07 12:03:05 +08:00
llj
2f49e2605b [group] fixup (#4655) 2020-08-25 14:54:19 +08:00
lian
6ed24ef254 Merge branch '7.1' into master 2020-08-19 14:01:17 +08:00
llj
483c6fc5c3 [group] added 'load more repos' (#4649) 2020-08-17 11:53:33 +08:00
杨顺强
f762b1a311 Optimize repo delete 2 (#4628)
* optimzie group repo delete logic

* repair code bug

* optimize repo delete code
2020-07-27 11:06:59 +08:00
llj
e55a602d57 Merge branch '7.1'
Conflicts:
	frontend/src/pages/search/advanced-search.js
2020-07-22 10:59:53 +08:00
llj
3a5d6ba3fb [advanced search] fixed and improved 'date picker' (#4614)
* fixed UI
* added 'clear', 'disabledDate', 'click outside to close'
* allow user to choose the same day for start & end date
2020-07-21 11:17:09 +08:00
Alex Happy
8c093b25d9 FIX: org department no-name-member bug (#4616)
* FIX: org department no-name-member bug

* filter empty-owner in department
2020-07-09 16:15:11 +08:00
llj
fa3964332f Virus scan frontend (#4574)
* ignore virus scan record

* get virus record by has_handle

* add has_next_page

* change has_handle to has_deleted

* change url and view name

* delete or ignore virus files in batch

* rebase master

* add cancel-ignore

* optimize code

* add translate

* [virus scan] added 'All' and 'Unhandled' tabs

* rewrote 'all' page (previous 'virus-scan-records')
* added 'unhandled' page

* [virus scan] 'unhandled' tab: added 'delete & ignore selected items'

* [virus scan] 'unhandled' tab: added 'handle selected items'

Co-authored-by: 王健辉 <40563566+jianhw@users.noreply.github.com>
2020-07-09 14:15:17 +08:00
songjiaqi1
bd5cf9e579 Markdown editor update (#4604)
* update markdown editor

* update markdown editor

* delete cdoc files
2020-06-30 21:10:47 +08:00
llj
20bf64a4d5 [system admin] org/members: fixed 'create time' (#4608) 2020-06-28 14:43:56 +08:00
杨顺强
66300cf07b update readonly toolbar effect (#4605) 2020-06-24 18:35:38 +08:00
Daniel Pan
73c9e967c1 Revert "Update menu permission valid (#4602)" (#4603)
This reverts commit 3d52a272ae.
2020-06-24 16:11:53 +08:00
杨顺强
3d52a272ae Update menu permission valid (#4602)
* repair menu permission valid bug

* improve toolbar loading effect
2020-06-24 16:08:59 +08:00
llj
ea8e61d250 [share/upload links] show exact expiration time (#4570) 2020-05-25 17:29:16 +08:00
llj
072637de5b [system admin] share links: added 'sort by ctime/view_cnt' (#4560) 2020-05-21 11:35:49 +08:00
llj
1f08158663 [share dialog] share link / upload link: enable user to choose expira… (#4557)
* [share dialog] share link / upload link: enable user to choose expiration time

* fixup & improvement for 'share link / upload link'

* fixup for pages in which there is no 'share'

* for pages in which the variables are not returned

* [date-and-time picker] fixed UI.

* updated version of '@seafile/seafile-calendar' to fix its 'selected time' UI problem

* [share dialog] expiration time: improved 'disabledDate'

* update create share/upload link api

handle expiration_time parameter

* update

* update

* update

Co-authored-by: lian <lian@seafile.com>
2020-05-21 11:32:02 +08:00
llj
a707d4adb7 [system admin] enable 'invitations' & 'unlink device' only in pro version (#4563) 2020-05-14 16:16:50 +08:00
llj
6f1a8cd350 [system admin] orgs, inst: use '24 hour time' for pages (#4550) 2020-04-28 18:21:00 +08:00
llj
744eca3a7c [org admin] added sort for 'libraries/users' (#4548)
* users: split 'all' & 'admin'
* bugfix & improvement for pages
2020-04-27 14:46:41 +08:00
llj
b399dc70e4 [system admin] modified empty tip (#4520) 2020-04-14 14:44:00 +08:00
lian
92f9f3689c show expiration in sysadmin links page (#4525)
Co-authored-by: lian <lian@seafile.com>
2020-04-14 12:43:28 +08:00
shanshuirenjia
c7bafc48ac Merge branch '7.0' 2020-04-11 18:12:47 +08:00
shanshuirenjia
488c4c51b6 repair code bug 2020-04-11 18:09:39 +08:00
shanshuirenjia
03a88f7f47 repair code bug 2020-04-11 18:03:45 +08:00
shanshuirenjia
138814464f Merge branch '7.0' 2020-04-11 17:58:52 +08:00
杨顺强
1f1b58f1db improve move copy code (#4522) 2020-04-11 17:54:52 +08:00
shanshuirenjia
9c8347f1a3 Merge branch '7.0' 2020-04-10 18:22:52 +08:00
杨顺强
5591bbd1d6 repair bug&improve code (#4521)
* repair bug&improve code

* delete test code
2020-04-10 18:08:27 +08:00
llj
0949e72400 [system admin] settings: only enable 'T&C' setting in Pro (#4515) 2020-04-04 14:33:17 +08:00
shanshuirenjia
91ef56e516 Merge branch '7.0' 2020-04-02 15:56:19 +08:00
杨顺强
11a0d0fc3c Repair move copy bug 2 (#4511)
* optimize code

* optimize code

* add copy tip
2020-04-02 15:45:33 +08:00
shanshuirenjia
e9f3f8ed2e conflict fixed 2020-04-01 11:19:09 +08:00
杨顺强
54621adb8a improve move&copy interactive (#4495)
* improve move&copy  interactive

* optimize code

* optimize code
2020-03-31 13:45:36 +08:00
llj
fc330d1e58 [system admin] added 'waiting tip' for 'delete user/org' (#4506) 2020-03-26 18:11:14 +08:00
Leo
18aab110ce fix-text (#4503) 2020-03-26 09:55:55 +08:00
llj
53776a3fc5 [system admin] libraries: added 'initial sort icon' for 'Files/Size' (#4501) 2020-03-25 17:34:56 +08:00
llj
4fe04d80bd [system admin] users: added 'initial sort icon' for 'space used' (#4499) 2020-03-25 16:13:18 +08:00
llj
5e515605ab [system admin] orgs: fixed 'org delete' dialog (#4498) 2020-03-25 11:21:50 +08:00
llj
0ac9ec7c1f [file history] hide 'Diff' for text files (#4493) 2020-03-23 11:19:29 +08:00
Leo
412aff80c7 delete-org-tip (#4492) 2020-03-20 16:53:36 +08:00
llj
ebe4625d4b [my libs] enable 'reset password' only in Pro (#4490) 2020-03-20 13:29:00 +08:00