haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-15 23:00:57 +00:00
Code Issues Releases Wiki Activity
12,694 Commits 146 Branches 460 Tags
f947eca8b51f9a7ce94eaa4e255b457b96985fa8
Commit Graph

1285 Commits

Author SHA1 Message Date
llj
237455f1a8 [favorites] rewrote it with React (#2417) 2018-10-08 15:33:40 +08:00
shanshuirenjia
3a67d78016 clean package.json and repair code style (#2411) 
* clean package.json and repair code style

* update css style

* repair bug
 2018-09-29 18:32:53 +08:00
shanshuirenjia
3ab4cbff4f Wiki optimized third (#2406) 2018-09-29 15:47:53 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
llj
4d97d37a6c [file view] office file: added 'open via client' (#2376) 2018-09-25 13:33:43 +08:00
shanshuirenjia
5ce1b15fb2 Style bug repair (#2394) 
* optimized css code

* repair search module

* repair response bug

* repair notificition bug

* repair file-history bug

* repair search info bug

* optimized code
 2018-09-25 09:13:06 +08:00
shanshuirenjia
490a15deed Code optimized (#2388) 2018-09-21 14:16:15 +08:00
shanshuirenjia
ba583d6efd Draft dashboard optimized (#2384) 
* create a common toolbar component

* optimized code

* combine side-panel

* add change state
 2018-09-20 10:19:11 +08:00
shanshuirenjia
db47fb34a7 Wiki coding style improve (#2380) 2018-09-19 09:57:17 +08:00
shanshuirenjia
180f388af1 Clean css (#2377) 2018-09-15 17:47:09 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +08:00
llj
ffce0e0778 [system admin, org admin] file access/update, permission: modified ui (#2370) 2018-09-15 08:14:15 +08:00
shanshuirenjia
d6d037afbc change font style lib (#2366) 2018-09-13 14:26:39 +08:00
ilearnit
5a4df40b92 Merge branch '6.3' 2018-09-12 18:04:30 +08:00
llj
b14ddfeb31 Traffic fe (#2363) 
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
 2018-09-12 17:41:59 +08:00
shanshuirenjia
ca0110e996 New file history (#2359) 2018-09-12 17:01:48 +08:00
ilearnit
15b5be489d Merge branch '6.3' 
Conflicts:
	frontend/build/frontend/js/main.js
	frontend/build/frontend/js/main.js.map
	frontend/build/frontend/js/wiki.js
	frontend/build/frontend/js/wiki.js.map
	frontend/src/components/constance.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
 2018-09-12 12:03:07 +08:00
C_Q
7bd50ad009 view repo via wiki (#2354) 
* view repo via wiki

* Modify details

* add list/grid mode

* [dist]
 2018-09-12 10:32:31 +08:00
llj
94368c5af9 [dir view] fileupload: added support for IE9 2018-09-07 15:17:46 +08:00
ilearnit
2e01046493 Merge branch '6.3' 
Conflicts:
	frontend/src/components/MainPanel.js
	frontend/src/components/account.js
	frontend/src/components/main-panel.js
	frontend/src/components/search.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
 2018-09-04 18:15:48 +08:00
llj
094871b45f [share popup] share link: new design 2018-09-03 18:51:54 +08:00
zhengxie
5ec002c98a Merge branch '6.3' 2018-09-01 15:34:31 +08:00
llj
0aeab05ecf [share popup] modified UI 2018-09-01 14:22:12 +08:00
shanshuirenjia
31461b0040 repair wiki-list rename bug (#2324) 2018-09-01 11:34:47 +08:00
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