haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity
8,384 Commits 142 Branches 460 Tags
db64e5a18efaad9b4303b817a79deb5d25e0b51c
Commit Graph

8384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
杨顺强
c93e8aa603 Wiki bug repair (#2492) 2018-11-01 18:40:18 +08:00
C_Q
4cc735cf1f update draft (#2491) 2018-11-01 17:52:59 +08:00
lian
41bc505562 add api for get comment count of a single file (#2490) 2018-11-01 13:44:06 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +08:00
zhengxie
4ad78173bd Fix empty value in user_traffic_over_limit 2018-11-01 10:45:15 +08:00
C_Q
574de37bb3 update review comment perm (#2489) 2018-10-31 22:13:59 +08:00
ilearnit
c65d9f5481 update seafile-editor version 2018-10-31 10:10:32 +00:00
MichaelAn
1c52029612 fix-comments-avatar-bug (#2485) 2018-10-31 10:10:19 +08:00
MichaelAn
f08a95a40f fix-bug (#2484) 2018-10-30 14:20:02 +08:00
ilearnit
0a9f965fce update seafile-editor version 2018-10-30 03:51:26 +00:00
C_Q
87287c6f02 Update review (#2481) 2018-10-30 11:07:01 +08:00
lian
43a7fda79a optimize shareable groups (#2482) 2018-10-29 14:19:54 +08:00
zheng xie
019cd9feea Merge pull request #2479 from haiwen/email-to-name 
Email to name
 2018-10-27 13:31:37 +08:00
lian
dbde875981 use name instead of email 
at group/device/admin-log page
 2018-10-27 13:19:22 +08:00
lian
0d05476914 add height=32 for avatar img 2018-10-27 13:18:37 +08:00
zheng xie
bcd9496bf8 Merge pull request #2478 from haiwen/6.3-migrate_group_wiki 
[wiki] Add group wiki migration script
 2018-10-26 17:13:11 +08:00
zheng xie
6c221e341d Merge pull request #2296 from haiwen/7.0-share_perm 
7.0 add extra share perms
 2018-10-26 17:08:34 +08:00
zhengxie
18fe766866 [api2] Fix download repo perm 2018-10-26 17:07:49 +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
zheng xie
9365088e98 Merge pull request #2401 from haiwen/user-traffic-excel 
export user traffic by month to excel
 2018-10-26 16:31:49 +08:00
lian
68f3a1428c remove unused while loop when export user storage to excel 2018-10-26 16:15:11 +08:00
lian
333faef2fe update url, class name, and seafevents_api 2018-10-26 15:42:52 +08:00
C_Q
d65c775e55 Modify trans str (#2475) 2018-10-25 17:50:47 +08:00
lian
a43389a126 enable admin change repo history when enable_repo_history_setting (#2469) 2018-10-25 17:18:08 +08:00
zheng xie
ebda1a316d Merge pull request #2474 from haiwen/6.3-login_refactor 
[auth & api] Refactor login
 2018-10-25 17:16:01 +08:00
MichaelAn
2bf3b448b5 Add button to toggle showing of resolved comment (#2473) 2018-10-25 16:58:27 +08:00
llj
dd599f20e6 [system admin] statistic report: modification for 'user storage' 2018-10-25 15:39:08 +08:00
zhengxie
b55474b33a [auth & api] Refactor login 2018-10-25 15:18:40 +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
MichaelAn
91cbfc508e improve (#2467) 2018-10-25 10:39:16 +08:00
C_Q
67e19792aa New draft file (#2465) 2018-10-24 14:37:41 +08:00
zheng xie
6dd82286d7 Merge pull request #2466 from haiwen/6.3-force_2fa 
force 2fa
 2018-10-24 10:36:52 +08:00
lian
017bf12afe Merge pull request #2464 from odontomachus/6.3 
In group name validation, search for groups rather than get all groups.
 2018-10-23 17:51:41 +08:00
llj
c3cc904a18 [system admin] user info page: added 'force 2fa' option 2018-10-23 16:59:57 +08:00
lian
717cba3086 add export traffic usage of all user to excel 2018-10-23 14:47:45 +08:00
MichaelAn
26f9d7d9d7 Review comment (#2459) 2018-10-23 13:13:44 +08:00
C_Q
a393f0242d fix encode (#2462) 2018-10-23 08:27:10 +08:00
zhengxie
67b025a0c5 Support .ai file preview 2018-10-22 11:56:30 +08:00
llj
a8978895ca [system admin] statistic: add missing file 2018-10-22 11:09:58 +08:00
Jonathan Villemaire-Krajden
c7b3bd206f In group name validation, search for groups rather than get all groups. 2018-10-19 12:30:47 +02:00
zhengxie
a0f1349292 [wiki] Add group wiki migration script 2018-10-19 14:46:26 +08:00
zheng xie
68377bf495 Merge pull request #2457 from haiwen/xmind 
preview xmind file
 2018-10-19 10:37:55 +08:00
zhengxie
5b2a16bdf1 [sysadmin] Fix traffic stats page error when org is deleted 2018-10-18 10:23:39 +08:00
zhengxie
26854bca9d [api] Update repos api, add org_id in send_msg 2018-10-18 10:17:51 +08:00
lian
fc5e37587d preview xmind file 2018-10-18 10:16:03 +08:00
lian
d1efb33442 Merge pull request #2456 from haiwen/repo-tag-set 
repo-tag-set
 2018-10-17 17:10:54 +08:00
wangjianhui
bdca0782b7 repo-tag-set 2018-10-17 16:29:58 +08:00
plt
5aae8ce4e0 Fix a bug in saving draw file 2018-10-17 11:37:57 +08:00
lian
e4c961481f Merge pull request #2455 from haiwen/share-bug 
repair share bug
 2018-10-17 11:37:39 +08:00