haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 04:10:47 +00:00
Code Issues Releases Wiki Activity
7,016 Commits 144 Branches 460 Tags
d69e700fb6cda99a2cee63ed76dea99c54ca15e8
Commit Graph

647 Commits

Author SHA1 Message Date
cainiao222
1cf9becf2c fix smart-link 2018-07-17 18:54:59 +08:00
lian
82658abbe0 update share.js 
request groups web api to get group list when share repo to group
 2018-07-17 13:47:24 +08:00
cainiao222
349ea9368c frontend add smart-link 2018-07-11 17:44:32 +08:00
lian
e976b6107f convert repo path 2018-07-11 17:23:34 +08:00
llj
040348e6f4 [address book] group: show repo owner and etc. 2018-06-15 14:22:10 +08:00
llj
ce23a58edf [group owned repo] share: enable 'share to user/group' 2018-06-15 14:22:10 +08:00
zMingGit
e387c92b99 can set sub-path permission with admin (#1962) 
* can set sub-path permission with admin

* fixup after rebase
 2018-05-18 13:46:43 +08:00
llj
8bf23d9e88 [address book] added 'rename', 'set perm', 'details' for group owned library, and etc. 
* added feedback for invalid quota input
    * modified empty tips for group
    * added 'New Department Library'
    * [group owned repo] added 'rename', 'set permission', 'details'
 2018-05-18 12:12:01 +08:00
llj
8ae359afbe [address book] fixup & improvement 2018-05-18 12:12:01 +08:00
llj
b0df96a948 [user panel] group owned library: enable group admin to set folder perm 2018-05-18 12:12:01 +08:00
llj
97b0e98c7d [address book] modified group quota shown and etc. 2018-05-10 12:13:47 +08:00
llj
266b6330b1 [address book] added check for invalid input when set group quota 2018-05-09 18:01:02 +08:00
llj
c0c449db48 [group] removed arrows in 'group setting' & 'group members' popups 2018-05-09 11:24:08 +08:00
llj
4a761aac0f added 'invite people' link to 'share' & 'group manage members' popup 2018-05-08 16:12:04 +08:00
Daniel Pan
38a902b22d Merge pull request #2099 from haiwen/address-book-group-lj0507 
Address book group
 2018-05-08 10:39:36 +08:00
lian
1fd1f43177 filter out address book group when: (#2092) 
1. share library/folder
2. set folder permission
 2018-05-08 10:24:58 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +08:00
llj
1b6a8479da [user panel] added 'group owned library' function 2018-05-04 14:43:17 +08:00
llj
b87f0312d7 [js] use uncompressed js.cookie.js, for the sake of 'dist' 2018-04-28 15:11:33 +08:00
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
llj
0ed1dd4c58 Merge pull request #1973 from haiwen/address-book 
Address book
 2018-04-25 16:26:12 +08:00
llj
5e5813072c [address book] modification 2018-04-25 16:19:15 +08:00
llj
f1a24470ad [address book] add 'show/set group quota', 'list/create/delete group libraries' functions 2018-04-24 20:08:20 +08:00
llj
30c0636791 [address book] modification: nav icon, group owner 2018-04-20 12:04:48 +08:00
llj
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
llj
9306c4762f [wiki] modification 2018-04-17 16:57:59 +08:00
haiwen
3a82e7694e Merge branch '6.2' 2018-04-14 03:00:03 +00:00
lian
488c8802a3 update multi storages backend 
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
 2018-04-13 13:27:05 +08:00
xiez
2ade5eb2de Merge pull request #2049 from haiwen/stop-zip-process 
cancel zip task
 2018-03-30 15:19:37 +08:00
llj
26dd0baff4 [cancel zip task] fixup & improvement; also added it for 'shared dir view' page 2018-03-30 14:53:20 +08:00
ilearnit
d29ab8a9ac if close query zip window then stop zip process 2018-03-30 12:24:40 +08:00
llj
cd0c7a1170 [wiki] added 'wiki list' and 'wiki' pages 
Conflicts:
	seahub/wiki/urls.py
	static/scripts/app/views/side-nav.js
 2018-03-26 13:31:41 +08:00
llj
a6026628fb [my libs] fixed js 2018-03-16 14:55:00 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
llj
4fd7b7acd7 [share] fix 2018-01-30 18:04:50 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
llj
5d2aa8af05 [system admin] added 'address book' 2018-01-04 18:06:05 +08:00
zhengxie
d37144ef75 Merge branch '6.2' 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
 2017-12-28 15:47:18 +08:00
llj
32019fe305 Merge pull request #1963 from haiwen/mv-multi-fix 
[dir view] mv multi: fix
 2017-12-27 16:53:18 +08:00
llj
f88c9c5f74 [dir view] mv multi: fix 2017-12-27 16:49:11 +08:00
lian
2fe5db8c76 update lock feature 
Don't allow delete/rename/move a file when it is locked
 2017-12-27 15:03:47 +08:00
xiez
baeb8ccacf Merge pull request #1952 from haiwen/invite-multi 
[invite people] enable to invite multiple guests at one time
 2017-12-25 13:32:42 +08:00
lian
d4cf67e324 multi storage backend 
1. add multi storage backend support
2. add 'storage_ids' user role
 2017-12-19 15:41:36 +08:00
llj
d621e79bba [invite people] enable to invite multiple guests at one time 2017-12-19 12:05:51 +08:00
llj
a3600ff488 [fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page 2017-12-14 17:23:01 +08:00
Daniel Pan
0dac3d38ca Merge pull request #1941 from haiwen/feedback 
added transition to show/hide of feedback messages
 2017-12-13 18:15:47 +08:00