haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00
Code Issues Releases Wiki Activity
9,695 Commits 121 Branches 467 Tags
d52949da9c723fb145db629ab66a3c7ccc7e0073
Commit Graph

1038 Commits

Author SHA1 Message Date
llj
c382e06099 [help, system admin] redesigned 'side nav' for mobile 2019-06-19 10:36:22 +08:00
Michael An
cb974a3ae0 change backbone weixin icon 2019-06-06 14:42:44 +08:00
llj
37668ca955 [login, choose_register, sign up] modified btn 2019-04-24 14:01:08 +08:00
llj
a4a671b702 [login, sign up] modified bg color of the buttons 2019-04-23 14:52:20 +08:00
zhengxie
8e1d52ce10 Merge branch '6.3' 2018-12-07 14:59:14 +08:00
llj
a492bad1ba [user setting] modified 'webDav password' setting 2018-12-06 14:44:04 +08:00
zhengxie
a4fa2b4a10 Merge branch '6.3' 2018-12-06 11:44:11 +08:00
杨顺强
81a656033f looking shared video on mobile is error (#2590) 2018-12-03 15:21:04 +08:00
llj
4ede768967 [pdf] a new viewer for pdf online view (#2503) 2018-11-09 11:28:18 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +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
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
llj
0408c9f82a [system admin] statistic: modification for 'reports' 2018-10-09 14:37:02 +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
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
llj
ffce0e0778 [system admin, org admin] file access/update, permission: modified ui (#2370) 2018-09-15 08:14:15 +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
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
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
864b4da11d Merge branch '6.3' 
Conflicts:
	seahub/urls.py
 2018-08-08 10:40:48 +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