haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Code Issues Releases Wiki Activity
6,744 Commits 146 Branches 461 Tags
a3e9dd23b41ee6aea5fb95101db8bd78fa9cf11c
Commit Graph

6744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ilearnit
d29ab8a9ac if close query zip window then stop zip process 2018-03-30 12:24:40 +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
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
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
zhengxie
4a498c15f8 [Django 1.11] Feature removed in Django 1.9, request.REQUEST -> request.GET/POST. Remove {% load url from future %} 2018-03-19 13:37:57 +08:00
llj
9d4cb611b4 Modified js after 'Merge 6.2', since jQuery is updated 2018-03-17 16:58:05 +08:00
Daniel Pan
6daa2a3db0 Merge pull request #2040 from haiwen/pdf-text-selection 
[file view] pdf: enable text selection
 2018-03-17 15:05:46 +08:00
llj
8d6e0ce5fd [file view] pdf: enable text selection 2018-03-17 14:26:51 +08:00
zhengxie
663eebc8ed [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site 2018-03-16 13:23:53 +08:00
zhengxie
2d56fd73c0 Rewrite 2fa, do not import models in package level 2018-03-16 11:42:13 +08:00
zhengxie
24b4e4a805 Rewrite contacts and wiki, do not import models in package level 2018-03-16 11:19:34 +08:00
zhengxie
46e0b29637 [auth] Remove unused code 2018-03-16 10:56:59 +08:00
xiez
d120bdef94 Merge pull request #2035 from haiwen/replace-something-with-render 
FIx feature removed issue in Django1.10. `render_to_response()` -> `r…
 2018-03-16 10:39:44 +08:00
ilearnit
3526b2b5cf FIx feature removed issue in Django1.10. render_to_response() -> render(), remove context_instance arg in `render_to_string()' 2018-03-16 10:33:54 +08:00
llj
545c13085d [SVG] fix after 'merge 6.2' 2018-03-15 11:45:06 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
xiez
580a812433 Merge pull request #2033 from haiwen/demo-user 
remove CLOUD_MODE check when login demo user
 2018-03-14 17:29:34 +08:00
lian
ef5c962b44 update demo user feather 
1. remove CLOUD_MODE check when login demo user
2. add ENABLE_DEMO_USER settings
 2018-03-14 17:23:12 +08:00
lian
b3da8a8d49 Merge pull request #2031 from haiwen/6.2-trash-event 
trash event
 2018-03-14 10:58:46 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
xiez
44ed4b3955 Merge pull request #2030 from haiwen/password-set 
use `seafile_api.is_password_set` to check encrypted repo
 2018-03-13 17:57:02 +08:00
lian
df2de72e00 use seafile_api.is_password_set to check encrypted repo 2018-03-13 11:57:13 +08:00
Daniel Pan
e579fb8775 Merge pull request #2029 from haiwen/prefix-query 
prefix-query
 2018-03-13 10:15:47 +08:00
zming
d6d4bf5aa0 prefix-query 2018-03-12 15:01:58 +08:00
xiez
5dd06a7d0c Merge pull request #2013 from haiwen/fix_rename_activity 
Fix folder renaming issue in activity list, ref: https://forum.seafil…
 2018-03-08 11:18:43 +08:00
zming
9960fa349c Shared files cannot be previewed by others. 2018-03-08 11:15:20 +08:00
xiez
bdaa660787 Merge pull request #2026 from haiwen/fix-2fa-backup-token 
Fix 2fa backup token page when 2fa is skipped.
 2018-03-06 17:32:22 +08:00