haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity
6,618 Commits 145 Branches 460 Tags
f797d2d52359e4529ce7262b818a70a3a14464a2
Commit Graph

282 Commits

Author SHA1 Message Date
xiez
06b5fd107e Update settings.py 2016-04-09 13:40:13 +08:00
zhengxie
c1e7102316 Change logger to INFO 2016-04-09 11:49:04 +08:00
Daniel Pan
57f4eb9b4c Update logo to HiDPI 2016-04-06 19:44:11 +08:00
zhengxie
f40c1374b8 [sysadmin] Add force_password_change option on settings 2016-03-29 17:03:50 +08:00
zhengxie
c1046d8ef4 [i18n] Update po files 2016-03-22 12:10:15 +08:00
zhengxie
3aa29e5b1f [inst] Add institution feature 2016-03-17 13:57:43 +08:00
zhengxie
72d30b2495 Merge branch '5.0' 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
 2016-03-07 16:04:36 +08:00
zhengxie
a14c10a8fc Update init user reset password, and clean code 2016-03-01 16:56:24 +08:00
zhengxie
602355381f [settings] Update pub repo creation and sync with folder 2016-02-17 16:00:53 +08:00
zhengxie
cc5af51dec Merge branch '5.0' 
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
 2016-02-02 12:19:46 +08:00
xiez
4966be7a69 Merge pull request #978 from haiwen/5.0-login_url 
Enable LOGIN_URL to be configured
 2016-01-29 13:36:34 +08:00
xiez
9455f3a03f Merge pull request #997 from haiwen/remove-pubfile 
Remove group pub file
 2016-01-22 10:54:47 +08:00
zhengxie
c4d743b134 Add setting to enable/disable organization repo creation 2016-01-21 13:55:52 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
Daniel Pan
d88d93cc99 Remove group pub file 2016-01-14 10:41:24 +08:00
zhengxie
100e264ec9 Enable LOGIN_URL to be configured 2016-01-05 12:07:58 +08:00
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd 
[sysadmin] Force passwd change when add/reset user
 2015-12-20 11:19:24 +08:00
Daniel Pan
9e855459eb Merge pull request #930 from haiwen/post_office 
Add post_office app, and send async email to imported csv users
 2015-12-20 11:17:41 +08:00
xiez
922b4411ba Merge pull request #942 from haiwen/redesign 
Redesign
 2015-12-15 11:59:52 +08:00
zhengxie
9404af609d Add post_office app, and send async email to imported csv users 2015-12-15 11:32:34 +08:00
llj
1f15e38752 [group members] use double size for member avatars 2015-12-15 10:59:44 +08:00
zhengxie
054ef03687 [sysadmin] Force passwd change when add/reset user 2015-12-08 11:33:26 +08:00
zhengxie
68efe49481 [django 1.8] WIP 2015-12-05 16:32:01 +08:00
zhengxie
0023d93aad [share] Update share link passwd 2015-12-05 16:29:31 +08:00
zhengxie
5c3de620f8 Merge branch '5.0' 2015-12-04 11:57:53 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
 2015-12-02 17:37:50 +08:00
lian
0188ed04ef update thumbnail check 2015-11-19 12:21:54 +08:00
zhengxie
b1bedaecfb [share] Update share link passwd 2015-11-10 15:37:47 +08:00
zhengxie
c035744735 [i18n] Update locales to 5.0 2015-11-03 11:15:38 +08:00
xiez
197594be01 Merge pull request #875 from haiwen/grid 
Grid
 2015-10-30 11:24:23 +08:00
llj
40ddb4ea4b [view_shared_dir] added 'grid view' 2015-10-29 17:17:40 +08:00
xiez
1a9858f7fc Merge pull request #856 from haiwen/merge-server-config 
Merge server config
 2015-10-27 11:02:48 +08:00
lian
c41ff45ea2 enable sysadmin view user's repo 2015-10-21 14:05:46 +08:00
Shuai Lin
5df7796345 import seahub_settings from central conf dir in release pacakge 2015-10-21 13:28:40 +08:00
lian
4e2a380ac1 update SHARE_LINK_PASSWORD_MIN_LENGTH 
1. add SHARE_LINK_PASSWORD_MIN_LENGTH to web setting page
2. update SHARE_LINK_PASSWORD_MIN_LENGTH check
 2015-10-19 17:20:15 +08:00
zhengxie
b96ee082da Remove SITE_BASE from settings 2015-10-10 11:03:50 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00
lian
668fdb7215 add ENBALE_ENCRYPT_LIBRARY setting 2015-09-24 17:20:45 +08:00
lian
4baf74926b add seahub web settings page 2015-09-21 11:48:07 +08:00
zhengxie
49fb5ca174 Add admin settings page to edit some configurations. Install django constance by pip install 'django-constance[database]' 2015-09-21 11:07:42 +08:00
zhengxie
1155777cf8 [I18N] Update .po files and version 2015-09-14 15:53:20 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
llj
0f5472bdee add option 'SHOW_TRAFFIC' 2015-09-11 11:00:54 +08:00
patrickgao
806965fa0f add SHARE_LINK_PASSWORD_MIN_LENGTH 2015-08-12 15:20:12 +08:00
llj
2f2e1b7524 [fileupload] enable resumable fileupload for 'dir view' & 'upload link' 
'resumable' is only enabled for 'upload files',
not for 'add folder' & 'file update'
 2015-08-07 15:03:59 +08:00
xiez
2006fe63ac Update settings.py 2015-07-30 11:08:08 +08:00
lian
6867b1823d update thumbnail default size 2015-07-25 16:30:38 +08:00
xiez
024a1deceb Merge pull request #706 from haiwen/file-lock 
file lock
 2015-07-23 10:40:40 +08:00
lian
f1b352e9ac add password_session app 2015-07-22 15:03:33 +08:00
lian
2c2bf4f98f file lock 2015-07-20 13:50:42 +08:00