haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Code Issues Releases Wiki Activity
9,657 Commits 142 Branches 460 Tags
47a23e23b8e35338fd2db7eea6d2b51b467480d2
Commit Graph

612 Commits

Author SHA1 Message Date
llj
f096ccdf3d [group owned repo] enable dir private share for sub folders 2018-08-08 15:37:11 +08:00
llj
bc7184f75b [folder perm] fixup for 'path' 2018-08-07 12:22:36 +08:00
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0" 
This reverts commit 62c3519e85.
 2018-08-03 16:08:29 +08:00
lian
20cb4ce86f Revert "[select2] fixup after rebase" 
This reverts commit 5fe0865629.
 2018-08-03 16:07:05 +08:00
lian
c736ca1097 Revert "[select2] share: fixup" 
This reverts commit c6152d8f0e.
 2018-08-03 16:06:46 +08:00
lian
85d2812ca6 Merge pull request #2247 from haiwen/document-bug 
repair editor menu style for different device
 2018-08-01 18:32:07 +08:00
llj
c6152d8f0e [select2] share: fixup 2018-08-01 16:50:57 +08:00
llj
5fe0865629 [select2] fixup after rebase 2018-08-01 14:24:14 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
shanshuirenjia
998ca7d675 repair the code style 2018-07-31 16:59:46 +08:00
杨顺强
12fb7a18f0 first : modify the editor to be resposed for pc and mobile; 
second: change the editor menu style for different device;
 2018-07-31 15:40:00 +08:00
lian
9733d50a1a Merge pull request #2235 from haiwen/select2-upgrade 
[select2] upgraded it to v4.0
 2018-07-31 15:14:13 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
cainiao222
e589403bc6 add help of internal-link, change the name smart-link to internal-link 2018-07-25 11:16:33 +08:00
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
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
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
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
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
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +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