haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-26 07:02:11 +00:00
Code Issues Releases Wiki Activity
10,139 Commits 134 Branches 450 Tags 2.1 GiB
d95da0bff1
Commit Graph

76 Commits

Author SHA1 Message Date
llj
c382e06099 [help, system admin] redesigned 'side nav' for mobile 2019-06-19 10:36:22 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +08:00
lian
dbde875981 use name instead of email 
at group/device/admin-log page
 2018-10-27 13:19:22 +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
lian
a43389a126 enable admin change repo history when enable_repo_history_setting (#2469) 2018-10-25 17:18:08 +08:00
llj
76489d2ca4 [system/org admin] rm 'email' for group member; modified 'Info' icon for org admin side nav 2018-09-11 15:16:02 +08:00
zheng xie
775d6871f7
Merge pull request #2281 from haiwen/6.3-org_address_book-fe 
[org admin] added 'address-book'
 2018-08-20 13:21:59 +08:00
llj
5b8dc61e6f [misc] fixup 2018-08-18 11:05:08 +08:00
llj
ff90c7cfb4 [org admin] added 'address-book' 2018-08-17 14:01:48 +08:00
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0" 
This reverts commit 62c3519e85.
 2018-08-03 16:08:29 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +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
b0df96a948 [user panel] group owned library: enable group admin to set folder perm 2018-05-18 12:12:01 +08:00
llj
97b0e98c7d [address book] modified group quota shown and etc. 2018-05-10 12:13:47 +08:00
llj
266b6330b1 [address book] added check for invalid input when set group quota 2018-05-09 18:01:02 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book 
Address book
 2018-04-25 16:26:12 +08:00
llj
5e5813072c [address book] modification 2018-04-25 16:19:15 +08:00
llj
f1a24470ad [address book] add 'show/set group quota', 'list/create/delete group libraries' functions 2018-04-24 20:08:20 +08:00
llj
30c0636791 [address book] modification: nav icon, group owner 2018-04-20 12:04:48 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
llj
4fd7b7acd7 [share] fix 2018-01-30 18:04:50 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
llj
5d2aa8af05 [system admin] added 'address book' 2018-01-04 18:06:05 +08:00
zhengxie
d37144ef75 Merge branch '6.2' 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
 2017-12-28 15:47:18 +08:00
llj
a3600ff488 [fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page 2017-12-14 17:23:01 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
zhengxie
4b37a8afe3 Update translation and refactor 2017-09-18 17:07:30 +08:00
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
llj
ab5c066a74 [lib icons] use new lib icons 2017-08-26 11:07:12 +08:00
zhengxie
21701ef3b3 Merge branch 'setLibHistory' 
Conflicts:
	seahub/urls.py
 2017-08-23 15:37:29 +08:00
llj
cb0aacd89d [UI] modified some 'file upload' buttons 2017-08-15 15:43:37 +08:00
llj
c6e8b64492 [system admin] libraries: added 'history setting' 2017-08-11 17:51:11 +08:00
xiez
64832adc03 Merge pull request #1674 from haiwen/license 
license
 2017-07-15 15:37:06 +08:00
llj
0015a9a6c8 [system admin] enable user to upload a license file 2017-07-04 10:39:11 +08:00
lian
46a5473326 add amdin system library upload api 2017-07-03 14:42:12 +08:00
lian
37dc0354d9 update admin create repo log 2017-05-23 16:49:52 +08:00
lian
e1d0169e64 update admin log 
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
 2017-05-23 16:05:51 +08:00
lian
0ca018fcf4 add admin create repo api 2017-05-18 10:43:31 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
llj
acf79cf1aa [system admin] admin logs: fix 2017-03-22 17:26:42 +08:00
lian
dd88c4e043 add admin operation logs page 2017-03-22 17:26:42 +08:00
Daniel Pan
b84c09e972 Merge pull request #1491 from haiwen/mobile-side-nav 
[mobile] side nav: modified for sysadmin-backbone pages & all non-bac…
 2017-02-17 22:55:12 +08:00
llj
b0d6304852 [mobile] side nav: modified for sysadmin-backbone pages & all non-backbone pages 2017-02-17 18:43:38 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00