haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 10:50:24 +00:00
Code Issues Releases Wiki Activity
7,281 Commits 142 Branches 460 Tags
11a0f4fd2ac899abbb83ba8e17a91d17d920f48c
Commit Graph

7281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
488c8802a3 update multi storages backend 
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
 2018-04-13 13:27:05 +08:00
xiez
12963cb7ef Merge pull request #2068 from haiwen/fix-transfer-share-links 
fix transfer share links
 2018-04-12 16:42:22 +08:00
ilearnit
755f9fbbc6 fix transfer share lonks 2018-04-12 16:38:23 +08:00
xiez
d4b8fb558f Merge pull request #2067 from haiwen/test_debug 
[test] debug
 2018-04-12 16:36:20 +08:00
ilearnit
7ba56a5abc [test] debug 2018-04-12 13:20:13 +08:00
xiez
55e72dc763 Merge pull request #2066 from haiwen/transfer-share-links 
transfer share links
 2018-04-12 11:47:21 +08:00
ilearnit
12a9ef5b27 transfer share links 2018-04-12 10:57:19 +08:00
lian
571a82c19f update trans str 2018-04-11 13:31:47 +08:00
zhengxie
d0f8e1b2b2 Merge branch '6.2' 
Conflicts:
	seahub/views/__init__.py
	static/scripts/app/views/myhome-repos.js
 2018-04-11 13:25:52 +08:00
ilearnit
a3e9dd23b4 custom css 2018-04-10 12:39:23 +08:00
xiez
f54fbaba22 Merge pull request #2058 from haiwen/customize-site 
customize site_name/site_title
 2018-04-09 13:15:50 +08:00
ilearnit
cfcb186cdd customize site_name/site_title 2018-04-08 17:03:51 +08:00
xiez
b99c923f8d Merge pull request #2063 from haiwen/dir-recursive 
return file info when get dir recursively
 2018-04-08 15:58:22 +08:00
xiez
fff6ef14db Merge pull request #2057 from haiwen/mk-the-cg-pwd-opt 
make the change password optional
 2018-04-08 14:24:46 +08:00
ilearnit
7c9bb56ed2 make the change password optional 2018-04-08 14:21:46 +08:00
lian
d643456d0a return file info when get dir recursively 2018-04-08 12:06:34 +08:00
xiez
a0684cb057 Merge pull request #2053 from haiwen/virtual-repo 
rm can_add_repo permission check
 2018-04-08 11:20:42 +08:00
xiez
2ade5eb2de Merge pull request #2049 from haiwen/stop-zip-process 
cancel zip task
 2018-03-30 15:19:37 +08:00
llj
26dd0baff4 [cancel zip task] fixup & improvement; also added it for 'shared dir view' page 2018-03-30 14:53:20 +08:00
lian
3ccc0e5084 check if enable LIBRARY_TEMPLATES inside repo_create_cb func (#2056) 2018-03-30 13:43:48 +08:00
lian
f4cd577823 use inner file upload url when send post request inside seahub code. (#2055) 2018-03-30 13:29:12 +08:00
zhengxie
df7fd295a2 Update requirements 2018-03-30 13:28:29 +08:00
ilearnit
d29ab8a9ac if close query zip window then stop zip process 2018-03-30 12:24:40 +08:00
Daniel Pan
cfab8f6889 Merge pull request #2052 from haiwen/oos-title 
add title when view file via OOS
 2018-03-29 11:11:24 +08:00
lian
d7d90dc5a2 rm can_add_repo permission check 2018-03-28 14:30:26 +08:00
lian
e3cd767dee add title when view file via OOS 2018-03-28 14:08:16 +08:00
Daniel Pan
8fc5e8637b Merge pull request #2048 from ilearnit/update-footer-about-time 
update footer about time
 2018-03-27 23:47:30 +08:00
llj
a7a3349b2b [new design] home_base.html: fix 2018-03-26 17:54:02 +08:00
zhengxie
f1a32a3e64 [Django 1.11] Use dict in template.render, and update tests 2018-03-26 16:10:30 +08:00
C_Q
a35af2eea8 fix-hash-urls (#2045) 
* fix-hash-urls

* add fix hash urls test
 2018-03-26 15:43:37 +08:00
xiez
f55137c58f Merge pull request #2050 from haiwen/wiki-ui 
Wiki ui
 2018-03-26 15:36:50 +08:00
zhengxie
1dc576d9ab [wiki] Update perm checking 2018-03-26 15:22:24 +08:00
llj
52ec5f5488 [wiki] redesigned UI 2018-03-26 13:31:41 +08:00
llj
a7f24851e2 [wiki] modification after rebase 2018-03-26 13:31:41 +08:00
llj
cd0c7a1170 [wiki] added 'wiki list' and 'wiki' pages 
Conflicts:
	seahub/wiki/urls.py
	static/scripts/app/views/side-nav.js
 2018-03-26 13:31:41 +08:00
zhengxie
ea929696d8 [wiki] Sort wiki list and pages, add readonly permission to GET api 2018-03-26 13:31:41 +08:00
zhengxie
05f1a6fb7e [wiki] Create home page when create wiki 2018-03-26 13:31:41 +08:00
zhengxie
222739ace6 Squashed commit of the following and rebase: 
commit 251f1cd451
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Mar 19 14:41:25 2018 +0800

    Update wiki pages

commit 9461b904f4
Author: ilearnit <helloworld.c@outlook.com>
Date:   Mon Feb 26 16:36:58 2018 +0800

    extend wikis page operation

commit 0ad2f5bc49
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Mar 12 11:32:27 2018 +0800

    Fix minor issues

commit 8fb3c1ab47
Author: ilearnit <helloworld.c@outlook.com>
Date:   Fri Feb 9 17:02:36 2018 +0800

    add edit wiki permission

commit 2103d80302
Author: zhengxie <xiez1989@gmail.com>
Date:   Fri Feb 9 11:56:48 2018 +0800

    [wiki] Updates and tests

commit 642198cc80
Author: zhengxie <xiez1989@gmail.com>
Date:   Wed Jan 17 12:04:52 2018 +0800

    Add wiki home page and and tests

commit 999b17d0e9
Author: ilearnit <helloworld.c@foxmail.com>
Date:   Tue Jan 16 12:19:06 2018 +0800

    Delete a Wiki

    Conflicts:
    	seahub/wiki/models.py

commit f5b00647c6
Author: zhengxie <xiez1989@gmail.com>
Date:   Fri Jan 12 17:34:12 2018 +0800

    [wiki] Add wiki model
 2018-03-26 13:31:40 +08:00
ilearnit
3ffb418be9 update footer about time 2018-03-23 15:36:29 +08:00
xiez
768678054c Merge pull request #2034 from haiwen/multi-storage 
update multi storage backend feature
 2018-03-23 10:36:16 +08:00
Daniel Pan
7fa3816c14 Merge pull request #2047 from haiwen/6.2-fixed-search-path 
[fixed] error when use search_path feature
 2018-03-22 16:24:04 +08:00
zming
3998466c25 [fixed] error when use search_path feature 2018-03-22 13:31:32 +08:00
zhengxie
b7722fc05b [tests] Fix urlpatterns 2018-03-21 17:02:06 +08:00
zhengxie
6e07b9a778 [Django 1.11] Add auth app, otherwise we will not able to import django.contrib.auth.models 2018-03-21 16:59:53 +08:00
zhengxie
9c24ec74c4 Add missing migrations 2018-03-21 16:59:37 +08:00
zhengxie
9b16ba0e8f [Django 1.11] Feature removed in Django 1.9. Update template settings and test 2018-03-19 15:33:25 +08:00
Daniel Pan
bed0ed8bc5 Merge pull request #2037 from haiwen/dst-obj-name 
update admin library dirent copy api
 2018-03-19 14:56:24 +08:00
lian
3b2e0352bd update admin library dirent copy api 
return `dst_item_name` field for case of src file/folder been renamed.
 2018-03-19 14:53:52 +08:00
zhengxie
553d9b3df3 [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site, and update urls 2018-03-19 13:49:01 +08:00
zhengxie
bba9fb7254 [Django 1.11] Feature removed in Django 1.9. Update django constance to remove get_cache 2018-03-19 13:38:35 +08:00