haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 22:01:06 +00:00
Code Issues Releases Wiki Activity
14,483 Commits 144 Branches 460 Tags
add-debug-log-in-shib
Commit Graph

1361 Commits

Author SHA1 Message Date
zhengxie
a3bdae76b2 Merge branch '6.3' 
Conflicts:
	frontend/src/pages/wiki/side-panel.js
 2018-08-31 11:59:19 +08:00
llj
37875256de Squashed commit of the following: 
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
 2018-08-30 16:44:34 +08:00
shanshuirenjia
740d6a86cf React activity (#2315) 2018-08-30 15:10:52 +08:00
zhengxie
29ce466c3c Merge branch '6.3' 2018-08-24 17:43:46 +08:00
shanshuirenjia
5d1fd88da3 Add wiki use lib (#2297) 2018-08-24 14:24:14 +08:00
zhengxie
14ed32c994 Merge branch '6.3' 2018-08-21 13:39:43 +08:00
shanshuirenjia
0105e8e8ef wiki search (#2278) 2018-08-17 12:23:55 +08:00
C_Q
e68efa9a31 Remove user email from the wiki page (#2274) 2018-08-14 12:14:04 +08:00
shanshuirenjia
7bd164f0e1 add wiki outline (#2263) 2018-08-10 17:05:29 +08:00
zhengxie
864b4da11d Merge branch '6.3' 
Conflicts:
	seahub/urls.py
 2018-08-08 10:40:48 +08:00
Daniel Pan
65a659876f Improve css of wiki page 2018-08-06 23:58:23 +08:00
Daniel Pan
fa38dd9151 Rewrite wiki page with react (#2258) 2018-08-06 18:29:12 +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
57e2cef98b Revert "[select2] show 'searching' tip" 
This reverts commit 7daec7d742.
 2018-08-03 16:05:20 +08:00
llj
7daec7d742 [select2] show 'searching' tip 2018-08-02 17:18:53 +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
5fe0865629 [select2] fixup after rebase 2018-08-01 14:24:14 +08:00
shanshuirenjia
d8d7462298 repair mp3 mp4 3d exp. problem 2018-08-01 11:26:56 +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
zheng xie
4286742f51 Use contact email instead of username (#2218) 
* Use contact email instead of username

* remove contact email

* username center

* [profile] Clean code
 2018-07-26 10:30:13 +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
349ea9368c frontend add smart-link 2018-07-11 17:44:32 +08:00
zhengxie
7d12a43f3b Merge branch '6.3' 2018-07-09 13:29:50 +08:00
Norbert Kelemen
4a91663f8a User profile form fix 
User profile form label fix for hungarian language
 2018-07-03 14:10:35 +02:00
llj
c27d131710 [groups, group] use new icon for 'unshare' a repo 2018-06-25 14:42:33 +08:00
llj
f511f240a6 [search] added 'search by time & size' 2018-06-25 10:51:00 +08:00
llj
435ced05f5 [register] redesigned it 2018-06-14 16:51:13 +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
4a761aac0f added 'invite people' link to 'share' & 'group manage members' popup 2018-05-08 16:12:04 +08:00
llj
d31be081b0 [user panel] group: modified color of address book group icon 2018-05-08 10:37:03 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +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
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
Daniel Pan
d3e47f46f8 Merge pull request #2072 from haiwen/wiki 
[wiki] modification
 2018-04-18 10:06:12 +08:00
llj
9306c4762f [wiki] modification 2018-04-17 16:57:59 +08:00
xiez
326eac4a44 Merge pull request #2061 from haiwen/custom-css 
custom css
 2018-04-17 11:29:27 +08:00
llj
5627db0d23 [info bar] fix 2018-04-16 18:39:19 +08:00
llj
366d56dc89 [system admin] settings: fixup & improvement for 'custom CSS' 2018-04-16 16:13:01 +08:00
ilearnit
a3e9dd23b4 custom css 2018-04-10 12:39:23 +08:00
llj
52ec5f5488 [wiki] redesigned UI 2018-03-26 13:31:41 +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
8d6e0ce5fd [file view] pdf: enable text selection 2018-03-17 14:26:51 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00