haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 07:52:14 +00:00
Code Issues Releases Wiki Activity
9,346 Commits 138 Branches 453 Tags 2.3 GiB
c382e06099
Commit Graph

152 Commits

Author SHA1 Message Date
zhengxie
2ca0b5f34d Merge branch '6.3' 2018-12-20 16:11:59 +08:00
llj
f22a6715a3 [dir view] show 'leaving page' confirm popup when a file is uploading (#2612) 2018-12-19 14:49:25 +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
fc5e37587d preview xmind file 2018-10-18 10:16:03 +08:00
C_Q
7da4642806 change the default view mode of repo (#2399) 2018-09-25 22:41:40 +08:00
shanshuirenjia
db47fb34a7 Wiki coding style improve (#2380) 2018-09-19 09:57:17 +08:00
llj
e19a147154 [dir view] getMore: fixup for some cases 2018-09-12 17:05:58 +08:00
llj
94368c5af9 [dir view] fileupload: added support for IE9 2018-09-07 15:17:46 +08:00
lian
c8b51b7bfc update logic of show folder share icon 
if current user has 'is_admin' library permssion, show folder share icon
 2018-08-24 17:54:42 +08:00
llj
1b0e3e1264 [dir view] enable 'copy file/dir to current folder' 2018-08-21 16:58:49 +08:00
llj
3fcfeab7f4 [dir view] fixup for 'group owned repo' 2018-08-15 12:35:49 +08:00
llj
d7510c0773 [group repo list, dir view] modification after 'enable users to share personal libraries to departments' 2018-08-10 16:45:20 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
lian
e976b6107f convert repo path 2018-07-11 17:23:34 +08:00
llj
ce23a58edf [group owned repo] share: enable 'share to user/group' 2018-06-15 14:22:10 +08:00
llj
8ae359afbe [address book] fixup & improvement 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
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +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
32019fe305
Merge pull request #1963 from haiwen/mv-multi-fix 
[dir view] mv multi: fix
 2017-12-27 16:53:18 +08:00
llj
f88c9c5f74 [dir view] mv multi: fix 2017-12-27 16:49:11 +08:00
lian
2fe5db8c76 update lock feature 
Don't allow delete/rename/move a file when it is locked
 2017-12-27 15:03:47 +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
6b31bae382 [dir view] mv/cp multi dirents: add feedback msg 2017-12-11 16:55:21 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
llj
1577275095 small fix 2017-11-01 15:42:03 +08:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
llj
33266638ef [share] share repo with 'admin' perm: modification 2017-08-30 17:59:14 +08:00
llj
a070329833 Don't use 'big' thumbnail for gif files 2017-07-12 16:35:09 +08:00
llj
5d48dac96c [dirent details] improvement; show more info for folders 2017-07-04 17:49:36 +08:00
llj
76d58cb025 [dir view] added 'details' for dirent 2017-07-04 14:28:40 +08:00
llj
a4d5736c68 fixed UI bugs for mv/del selected dirents; modified 'avatar' 2017-06-30 13:39:30 +08:00
llj
8dd8e1e7f0 [thumbnail] added 'thumbnail_size_for_original' 2017-05-31 16:32:00 +08:00
llj
0169245045 [dir view] new dir/file: close the dropdown menu after clicking a menu item 2017-05-04 16:32:47 +08:00
Daniel Pan
5c69f79688 Merge pull request #1545 from haiwen/use-thumbnail 
[image] use thumbnail for magnificPopup & file view page
 2017-04-24 18:21:45 +08:00
llj
3443479e75 [video] show thumbnail for video files in dir-view/favorites/view-shared-dir pages 2017-04-19 16:21:33 +08:00
llj
2a8e40c3c0 [image] use thumbnail for magnificPopups, file_view page & shared_file_view page 2017-04-18 17:28:29 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
llj
acc1ebb6eb [dir view] bugfix for 'magnificPopup' & 'grid-item download' 2017-02-25 17:36:07 +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
llj
c8f5d4ed5d [dir view] '.repo-op' UI: bugfix 2017-02-17 13:26:43 +08:00
llj
f85d9e8e67 [dir view] bugfix for img view with magnificPopup 2017-02-09 16:00:36 +08:00
lian
7c1c1e2977 update rm ajax 2017-02-07 16:03:46 +08:00
lian
18c60fd306 update cp/mv file/dir 2017-01-19 14:40:49 +08:00
lian
734263b76e update cancel_cp 2017-01-19 14:40:49 +08:00
lian
4a120b5aa5 update cp_progress 2017-01-19 14:40:49 +08:00
llj
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
38226256cd Merge pull request #1444 from haiwen/download-dir 
update zip download dir
 2017-01-07 17:58:38 +08:00