haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Code Issues Releases Wiki Activity
9,657 Commits 146 Branches 464 Tags
47a23e23b8e35338fd2db7eea6d2b51b467480d2
Commit Graph

1208 Commits

Author SHA1 Message Date
杨顺强
81a656033f looking shared video on mobile is error (#2590) 2018-12-03 15:21:04 +08:00
杨顺强
4880622795 My librarys (#2584) 2018-11-30 17:18:41 +08:00
杨顺强
c00d4f30bd View repo content in list mode (#2579) 2018-11-29 17:55:14 +08:00
杨顺强
9a34b1d1cd Wiki mutiple chioce (#2559) 2018-11-23 20:19:42 +08:00
llj
fb6c097028 [shared with me] rewrote it with react (#2552) 2018-11-22 16:49:48 +08:00
Daniel Pan
fb5d105e6e Wiki mode improve (#2539) 2018-11-22 11:26:00 +08:00
杨顺强
921089bd01 modify table css (#2537) 2018-11-22 11:05:47 +08:00
C_Q
193a635d5f avatar-tips (#2541) 2018-11-19 15:13:38 +08:00
llj
e2dc2d070a [share admin] rewrote it with react (#2538) 2018-11-19 11:53:44 +08:00
杨顺强
360bd739ce Implement file upload (#2506) 2018-11-14 10:55:11 +08:00
WangJianhui666
f50fe8a2bd Show file tags (#2509) 2018-11-13 16:39:13 +08:00
llj
4ede768967 [pdf] a new viewer for pdf online view (#2503) 2018-11-09 11:28:18 +08:00
WangJianhui666
a63e8a4009 repo-tags-show (#2494) 2018-11-02 15:34:34 +08:00
杨顺强
c93e8aa603 Wiki bug repair (#2492) 2018-11-01 18:40:18 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +08:00
MichaelAn
f08a95a40f fix-bug (#2484) 2018-10-30 14:20:02 +08:00
zhengxie
3cd878bd6a Add preview related share perms 
Squashed commit of the following:

commit 12f52311df704e48c282b2a47f59f7a283cfa5c5
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Sep 11 15:14:34 2018 +0800

    [API] Update client sync and list dir items apis

commit bc18d19dc0f648732c5933c6918d8e784fc0f910
Author: llj <lingjun.li1@gmail.com>
Date:   Tue Sep 4 12:22:10 2018 +0800

    Add preview related share perms

    Squashed commit of the following:

    commit 658bdbdc7acf262f2c0abb0387cf3142b2d8ee37
    Author: llj <lingjun.li1@gmail.com>
    Date:   Tue Sep 4 12:17:47 2018 +0800

        [library icon title] added title for 'admin' permission

    commit 51a088fd7987e2307e5666facb6627d42a7843ec
    Author: zhengxie <xiez1989@gmail.com>
    Date:   Sat Sep 1 15:33:09 2018 +0800

        Add preview related share perms

        Squashed commit of the following:

        commit 42fe21ef0ba3bad4fb68dc5283194cb34eb7775a
        Author: llj <lingjun.li1@gmail.com>
        Date:   Sat Sep 1 13:33:59 2018 +0800

            [icon tip] modified library/folder icon title

        commit 077fecdce80bce966296a1735896a24bf32c282f
        Author: zhengxie <xiez1989@gmail.com>
        Date:   Mon Aug 27 11:05:34 2018 +0800

            Add preview related share perms

            Squashed commit of the following:

            commit 5783325eb25d7298ea3db7f59595446d122889e5
            Author: llj <lingjun.li1@gmail.com>
            Date:   Fri Aug 24 21:14:59 2018 +0800

                fixup

            commit 5f4f4025221f4026a4e7a9bc1c7bba5d6decf5a9
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 20:55:41 2018 +0800

                Fix wopi perm

            commit 632744cd5e56f8812af0efe523cf5751bbf57b66
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 17:29:31 2018 +0800

                Add preview related share perms

                Squashed commit of the following:

                commit 683296449601960d76a2d0245dab694ab16f67b2
                Author: llj <lingjun.li1@gmail.com>
                Date:   Fri Aug 24 15:54:59 2018 +0800

                    modification after adding 2 new permissions

                commit 3eff1ec06fc7566942b736261a1d5b613d706117
                Author: llj <lingjun.li1@gmail.com>
                Date:   Thu Aug 23 14:58:33 2018 +0800

                    [permission] added 2 new permissions for 'share' & 'folder permission'

                commit 73a0bfc6560860ac11e96a675fe789a984a194c8
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 16:34:47 2018 +0800

                    Add prevew related perms in history file view and text_diff

                commit 533b3ff0ca4aa5564ecc87456772b70eedfa816f
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 13:49:28 2018 +0800

                    Add prevew related perms on file views

                commit 03db78a841baddf6c042988358d20417f06be4ae
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Thu Aug 23 10:56:17 2018 +0800

                    [api2] Update repo perms and add is pro version check

                commit c025319fe56658da3a3dc077743ee016ac5acd4d
                Author: ilearnit <helloworld.c@outlook.com>
                Date:   Wed Aug 22 11:09:27 2018 +0800

                    update perm copy/download/share

                commit ea19ab4c695c99c0c2817616f2177bebae0777a2
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Mon Aug 20 16:00:11 2018 +0800

                    wip: add repo preview related perms.

                    Updated APIs:
                    1. [api2] group libraries
                    2. [api2] dir shared items
                    3. [api2] share link zip tasks

                    Updated Views:
                    1. wiki & wopi
                    2. ajax copy/download files/dirs
 2018-10-26 17:07:49 +08:00
MichaelAn
2bf3b448b5 Add button to toggle showing of resolved comment (#2473) 2018-10-25 16:58:27 +08:00
山水人家
209237a22a Bug repair (#2458) 2018-10-25 14:42:53 +08:00
山水人家
f3e0284751 Implement wiki mode menu function (#2461) 2018-10-25 13:36:06 +08:00
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
山水人家
6831d9e519 Wiki mode optimized (#2442) 2018-10-13 17:07:54 +08:00
llj
0408c9f82a [system admin] statistic: modification for 'reports' 2018-10-09 14:37:02 +08:00
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