1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-21 16:34:33 +00:00
Commit Graph

217 Commits

Author SHA1 Message Date
zhengxie
9a5aae50ab [shibboleth] Add joker * in affiliation role map 2017-08-02 18:31:15 +08:00
zming
6cb50b9c0c [captcha] fixed size 2017-07-13 14:31:46 +08:00
zhengxie
e30d19c791 [shibboleth] Fix empty role quota issue which will cause page unavailable 2017-06-26 10:33:54 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
922148a1b0 Add terms&conditions config 2016-08-02 15:03:19 +08:00
Daniel Pan
26d2a4d774 Merge pull request #1299 from haiwen/terms
Terms
2016-07-27 13:54:04 +08:00
zhengxie
c675497336 Add licenses 2016-07-25 11:12:40 +08:00
zhengxie
0f73921205 Update T&C
Conflicts:
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/sysadmin/base.html
	seahub/urls.py
	seahub/views/sysadmin.py
2016-07-22 16:39:05 +08:00
zhengxie
41f9a3950c Add ToC 2016-07-22 16:34:09 +08:00
Shuai Lin
3d04bfea6d support two factor authentication 2016-06-14 14:26:22 +08:00
zhengxie
f12215ec5e
[shib] Fix shib complete url bug 2016-05-17 17:48:57 +08:00
zhengxie
f43cdb3f35 [tests] Make shib test pass 2016-03-24 16:58:55 +08:00
zhengxie
65a336f573 [shib] Add shibboleth complete page 2016-03-24 16:25:45 +08:00
zhengxie
42c90bda2e Fix activate request email not sent bug on registration, and apply to shibboleth login 2016-03-24 15:21:11 +08:00
Daniel Pan
b75e8e8d9c clean code and icons 2016-03-09 15:12:53 +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
11e645cae0 [shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing 2016-02-23 14:26:10 +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
zhengxie
508322e629 [shibboleth] Record nickname, contact email and institution to profile 2016-01-27 14:10:51 +08:00
zhengxie
333c0a9966 Upgrade rest framwork, check memcached at startup 2015-12-05 16:35:51 +08:00
zhengxie
68efe49481 [django 1.8] WIP 2015-12-05 16:32:01 +08:00
zhengxie
d1bd4bd7cf Remove constance from thirdpart 2015-10-13 11:58:47 +08:00
zhengxie
18baf34f0e Add django constance to thirdpart to void dependency 2015-10-10 10:51:38 +08:00
lian
4baf74926b add seahub web settings page 2015-09-21 11:48:07 +08:00
zhengxie
d1bd33afc2 Fix account registrion email bug 2015-05-14 17:32:54 +08:00
Shuai Lin
120d094b1b sudo mode: handle shibboleth login 2015-05-05 13:42:03 +08:00
Shuai Lin
d0ca22283a small fix of shibboleth middware 2015-04-07 10:25:31 +08:00
Shuai Lin
2b1e11d129 use token v2 for shibboleth login 2015-04-02 20:48:16 +08:00
Shuai Lin
22a1d52aca fixed shibboleth middleware set cookie problem 2015-04-02 20:45:32 +08:00
zhengxie
6757126da9 [shib] Fix bug when authenticate shib user, issure #394 2015-03-05 16:38:42 +08:00
David Kreitschmann
75cf92aca6 Environment variable for shibboleth user name can be changed. The default is REMOTE_USER which is provided by e.g. apache modules. 2015-03-05 15:39:00 +08:00
zhengxie
109ed579fa Enable user provide name in register 2015-01-23 15:44:10 +08:00
zhengxie
92d0c09507 [shib] set username and api token in cookie when the user login with Shibboleth the first time 2014-12-25 18:29:13 +08:00
zhengxie
61b41e8fea [shibboleth] Modify user creation 2014-12-25 18:29:13 +08:00
zhengxie
c914fe30c5 [thirdpart] Add shibboleth 2014-12-25 18:29:13 +08:00
zhengxie
2dd360e5e7 Update captcha 2014-08-05 14:41:04 +08:00
imwhatiam
90ba936514 [passwd strength] add STRONG password check(default not enabled) when user sign-up or change-password 2014-07-29 16:42:08 +08:00
imwhatiam
8988702ada [sign-up] check password strength at both client and server side 2014-07-29 11:26:41 +08:00
zhengxie
910eb2ccd4 Add sigle sign on feature 2014-04-04 14:36:27 +08:00
zhengxie
862c6e4f74 Added login simple check feature 2014-01-02 18:26:23 +08:00
zhengxie
a611d11088 Added captcha to thirdpart 2013-11-09 10:42:06 +08:00
zhengxie
cd762fe60a [sysadmin] Email user when admin activate his/her account 2013-10-17 18:20:44 +08:00
zhengxie
49c769a6a5 Email admin to activate newly registered account 2013-10-17 17:03:26 +08:00
zhengxie
131b15bb66 Change hashcompat to hashlib to depress warning 2013-09-14 18:11:11 +08:00
zhengxie
53201b105d Move auth from thirdpart to seahub 2013-05-07 15:16:05 +08:00
Pi3R1k
84e4b8fb96 add /thirdpart/auth/locale/fr/LC_MESSAGES/django.po 2013-04-23 15:08:44 +02:00
llj
d9629e01b5 update po files 2013-04-13 19:18:37 +08:00
zhengxie
8a951a2a1d Merge branch 'develop' 2013-03-16 19:40:41 +08:00
zhengxie
6032c5c954 Fixed password reset bug 2013-03-13 19:22:17 +08:00
zhengxie
fc14a6a7c7 Remove seaserv 2013-03-11 20:01:45 +08:00
plt
71fec8a3b2 Remove seaserv 2013-03-09 10:35:53 +08:00
zhengxie
151a158f4a Move views.py to views/, and refactor file view 2013-03-08 10:21:34 +08:00
zhengxie
d73e7c8996 Fixed api2 quota bug 2013-03-02 16:59:26 +08:00
zhengxie
45a8ff62c1 Added rest framework 2013-03-01 13:38:05 +08:00
zhengxie
f108c3b79a Fixed rpc return value bug 2013-02-28 20:02:03 +08:00
zhengxie
36a3bd1685 Enable change repo name and desc. 2013-02-25 17:27:12 +08:00
zhengxie
3e2ddb466b Merge branch 'pubinfo'
Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
2013-02-23 11:48:06 +08:00
zhengxie
7f887be89f Added repos/groups/users count 2013-02-22 14:52:33 +08:00
zhengxie
70fa9dc318 [api2] Added shared repo related apis 2013-02-20 20:51:37 +08:00
zhengxie
c134f9e84e Display share quota usage.
Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
2013-01-29 15:33:53 +08:00
lins05
99ec82061b add limit to download a dir 2013-01-28 11:10:31 +08:00
zhengxie
0063bd98ab Fixed bug in displaying initial commit message 2013-01-28 10:29:09 +08:00
zhengxie
4efcde781f Cleaned code 2013-01-24 17:10:51 +08:00
lins05
87db2ca986 fixed a bug when parsing SERVICE_URL 2013-01-17 10:53:40 +08:00
lins05
8d2fa5a82c improve the tip of open-local 2013-01-10 11:47:05 +08:00
zhengxie
ab9f1094e4 i18n for auth 2013-01-09 19:35:18 +08:00
zhengxie
db23497e69 Added email sending settings 2013-01-09 17:30:31 +08:00
zhengxie
078faaa57b Fixed bug in ccnet_server_addr when there is a '/' at end 2013-01-08 11:48:52 +08:00
zhengxie
ca5f21c585 Added SEAFILE_CONF_DIR environment var, and remove max_upload_file_size and http_server_root from settings 2013-01-08 11:12:07 +08:00
lins05
d2b0680436 remove thirdpart/djangorestframework 2013-01-05 18:30:26 +08:00
lins05
1adab92810 handle ccnet_server_addr right when service_url contains https:// 2013-01-05 10:49:47 +08:00
zhengxie
ee749f5650 Modification for large group 2013-01-04 20:12:32 +08:00
killing
73209e4e9f Setting how many days of history to keep. 2013-01-04 13:05:24 +08:00
zhengxie
f94c4c5a61 Added dir shared link feature 2013-01-03 19:28:57 +08:00
zhengxie
0ec2900bc4 Fixed a few bugs in share and api2 2012-12-25 11:16:20 +08:00
zhengxie
8347e84fee Fixed bug in getting shared repos using api2, and refactor some code. 2012-12-19 10:58:14 +08:00
zhengxie
cad653726b [Issue #28] Shared to group libraries are only visible in Groups view, not in "My Home -> Shared" 2012-12-18 19:52:41 +08:00
zhengxie
919e286b83 Added repo download link 2012-12-17 10:40:12 +08:00
zhengxie
3486fb4223 Added several functional tests, and fixed a few bugs
* wrap remov_repo rpc
* delete profile when remove user
* delete remove_binding rpc
2012-12-05 11:44:21 +08:00
zhengxie
047ccae72d Remove users' repo decrypt passwords from server when log out 2012-11-22 14:26:39 +08:00
zhengxie
1e79e72a54 Improved file upload and update 2012-11-17 17:31:37 +08:00
zhengxie
438f54bcac Modified translations and i18n for auth 2012-10-30 14:42:21 +08:00
lins05
5545afe6d7 improve diff related code 2012-10-20 11:48:33 +08:00
lins05
f9e0437628 add text file diff 2012-10-19 18:00:22 +08:00
llj
b28ba88c86 Merge branch 'events' 2012-10-15 21:05:28 +08:00
llj
39a9870300 improved events for encrypted repo;added events for org[by ls & lj] 2012-10-15 21:03:42 +08:00
zhengxie
1db310e480 Fiexed long username bug when login 2012-10-15 19:09:53 +08:00
ZhengXie
4fba6bd5ad Fixed bug in viewing repo when has shared repos. 2012-10-09 14:09:47 +08:00
llj
e50022978a Merge branch 'events' 2012-09-29 17:18:21 +08:00
ZhengXie
4ca3810790 Fixed bug in moving files under org context 2012-09-29 16:51:36 +08:00
lins05
02870ee552 add user events 2012-09-28 17:04:38 +08:00
killing
d30f7c4bbb Clean up shared repo listing code and add permission for public repos. 2012-09-26 19:20:21 +08:00
xiez
91aa8aa023 Fixed bug and clean code in service.py 2012-09-22 19:28:49 +08:00
xiez
b16b7ece18 Allow share repo to unjoined group 2012-09-22 17:46:56 +08:00
killing
803780ea39 Add read/write permission to share.
Also check permission in various operations.
2012-09-21 11:38:05 +08:00
xiez
de4cc456ea Add unregistered user to group 2012-09-19 19:52:35 +08:00
xiez
339f9796d7 Raise 404 when repo or path is invalid when show repo page 2012-09-13 17:31:27 +08:00
xiez
9eff5fea03 Modify group create, and clean code 2012-09-06 10:19:34 +08:00