1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-05 11:17:36 +00:00
Commit Graph

358 Commits

Author SHA1 Message Date
llj
35236d6c44 modified file_revisions 2012-08-11 20:00:21 +08:00
lins05
519287d5d9 create new file on web 2012-08-11 17:19:43 +08:00
lins05
b56cf1882d add 'open-local-file' link 2012-08-11 10:33:16 +08:00
xiez
f15fecdcf1 Fix bug 2012-08-10 21:20:01 +08:00
xiez
bfefa7df70 Add basic recommend feature 2012-08-10 21:17:28 +08:00
lins05
ecfb415ec4 fixed a bug in list_file_revision 2012-08-10 13:32:12 +08:00
xiez
a99ed91e49 Fix bug in repo_file_get 2012-08-10 10:43:51 +08:00
lins05
347fdd6ca8 merge file_edit_post;modified file_edit 2012-08-09 20:45:30 +08:00
llj
c19df2eece [view_file,view_shared_file,edit_file]:directly get file_content instead of ajax get 2012-08-09 20:45:30 +08:00
llj
c8887461b1 improved source file edit 2012-08-09 20:45:29 +08:00
llj
ae1dbd49bd added func: source file edit 2012-08-09 20:45:29 +08:00
plt
074e781831 Remove back_local 2012-08-08 17:05:35 +08:00
xiez
85fb879c74 Refactor auth and rename CcnetUser to User 2012-08-07 16:48:26 +08:00
xiez
4153e6255c Change sys.maxint to a const value 2012-08-04 17:12:45 +08:00
plt
b0e31a4993 Fix ace view 2012-08-03 17:24:26 +08:00
llj
1ae7cd953c modified source code view for ie 2012-08-03 17:24:26 +08:00
xiez
b187acdb13 Add autocomplete when send file shared link 2012-08-03 14:01:24 +08:00
xiez
bde88e09b6 Modify group 2012-08-03 11:33:23 +08:00
xiez
9c599715c7 Clean code, move org_group_admin and org_seafadmin into organizations/ 2012-08-02 19:43:20 +08:00
xiez
8f93238acc Change account context storage from cache to session 2012-08-02 17:50:16 +08:00
xiez
edbc6de917 Wrap get_group rpc 2012-08-01 22:45:58 +08:00
llj
9ae6fa9653 added 'reminding';modified team-account, new_msg_reply, group_info 2012-08-01 17:54:08 +08:00
llj
bdb40766c4 added syntax highlighting for source code file 2012-08-01 13:54:53 +08:00
xiez
6970bee966 Remove CROCDOC_API_TOKEN from settings, document preview is disabled default. 2012-08-01 11:24:07 +08:00
xiez
7a850c7953 Modify repo share.
* Email unregistered user when sharing repo.
* Add email to contacts when share repo/file and add group user.
* Remove org repo share link.
2012-07-31 15:02:18 +08:00
xiez
220f9c9c24 Change error function names 2012-07-30 20:44:32 +08:00
xiez
ad6dfbab7b Add index to groupmessage and fix typo. 2012-07-30 20:19:17 +08:00
xiez
61a3ac1409 Remove group user relationship when remove user. 2012-07-30 13:54:11 +08:00
xiez
061365f434 Add org repo create and clean code. 2012-07-30 10:26:26 +08:00
xiez
13a0288c91 Move included files to templates/snippets 2012-07-28 16:41:24 +08:00
xiez
b1ea10088a Add org user added notification 2012-07-27 23:37:48 +08:00
xiez
862723e1d8 Modify org user add 2012-07-27 23:35:35 +08:00
xiez
e534c2a230 Fix useradd bug 2012-07-27 23:35:35 +08:00
xiez
0132e4e85d Modify org 2012-07-27 23:35:35 +08:00
plt
fa11fc6af6 Clean seaserv 2012-07-26 11:32:52 +08:00
plt
a03c698ce6 Modify edit user 2012-07-24 11:45:42 +08:00
xiez
47076f8ad9 Merge branch 'lj'
Conflicts:
	templates/repo_file_get.html
	utils.py
2012-07-24 00:01:22 +08:00
xiez
acf3dfdf6b Clean code 2012-07-23 22:49:09 +08:00
xiez
4b2558a6c5 Add document preview feature 2012-07-23 22:44:45 +08:00
llj
d0ac9405d1 improved pdf-view 2012-07-23 14:58:54 +08:00
llj
48ca6c87df added pdf view: in page and in full screen 2012-07-21 22:13:38 +08:00
lins05
64d0dd8b0c use token to controll access 2012-07-21 17:14:15 +08:00
xiez
882b9f4892 Modify httpserver url 2012-07-21 15:06:43 +08:00
xiez
5e64e4b503 Add previewd file extention and type to cache. And clean code. 2012-07-19 17:19:59 +08:00
plt
32f65f5ae9 Merge branch 'lj' into master2 2012-07-19 16:59:32 +08:00
plt
7f669b5789 Fix utf8 chinese decode bug 2012-07-19 15:51:52 +08:00
llj
d07f8b7d60 improved repo_create 2012-07-19 14:06:17 +08:00
llj
e1ecd6f7fb improved repo_create 2012-07-16 17:41:08 +08:00
plt
0978c0abe3 Fix rpc bug 2012-07-14 22:41:32 +08:00
xiez
0ecb2f4e54 Fix rebase bugs 2012-07-14 21:18:59 +08:00
llj
cc7bd9b326 improved repo_file_view 2012-07-14 21:12:51 +08:00
xiez
c198fac291 Add file shared links in shareadmin page. 2012-07-14 21:11:02 +08:00
xiez
654c47bafa File shared link is viewd by people who generated. 2012-07-14 21:11:02 +08:00
xiez
83cd300b28 Fix sending emails and IE bugs 2012-07-14 21:11:02 +08:00
xiez
d66938cce0 Add file shared link, and modify url viewing file 2012-07-14 21:11:02 +08:00
lins05
2b72bd7213 add 'list file history' and 'revert file' 2012-07-14 11:55:35 +08:00
lins05
af5575c4a6 upload a new version of a file 2012-07-14 11:55:35 +08:00
lins05
e1471aa472 create repo online 2012-07-14 11:55:35 +08:00
xiez
4543be8649 Fix org related bugs 2012-07-09 14:24:20 +08:00
lins05
e575d86f57 fixed user quota in upload 2012-07-09 11:05:04 +08:00
xiez
402b9ab0ce Fix bugs
* Only repo owner or person who shared this repo can view repo page.
* Remove group user even when user is deleted by admin.
* Paginator link on admin page.
2012-07-09 10:37:42 +08:00
xiez
206e71411b Add dir diff 2012-07-05 19:56:39 +08:00
xiez
7d24c7c204 Modify repo history 2012-07-05 19:29:56 +08:00
xiez
6664ec3127 Merge branch 'upload' 2012-07-05 16:14:39 +08:00
xiez
e51747caff Fix bug in visiting repo.html when user in not logged in 2012-07-05 14:39:28 +08:00
lins05
df627e8727 remove uploaded file after commit
* set default max upload file size to 100MB
* use default upload chunk size(64KB)
2012-07-05 13:40:26 +08:00
xiez
d6c0963589 Clean code and fix bug in org 2012-07-05 11:52:12 +08:00
xiez
7a4dfadf75 Rewrite repo history page 2012-07-03 21:48:33 +08:00
xiez
340ad516e4 Add file preview feature 2012-07-03 17:55:18 +08:00
plt
fda1edfe1f Remove sleep and print 2012-07-03 16:39:28 +08:00
llj
8b40a83880 added file op:rename, cp, mv, upload, create 2012-07-02 11:47:04 +08:00
xiez
6a77ab10b0 Sort repos im myhome and group page 2012-06-28 20:02:17 +08:00
xiez
05a4cc9d0a Add repo last modify time 2012-06-28 19:28:23 +08:00
xiez
ad9ce0e10b Add msg reply count 2012-06-28 19:24:27 +08:00
xiez
8cd03c94cb Notify group message reply 2012-06-27 16:39:49 +08:00
xiez
5b39f73488 Modify group msg notification 2012-06-26 19:23:32 +08:00
xiez
9717f9a7ec Add user notification 2012-06-26 19:23:32 +08:00
killing
e86aa244c7 Use threaded rpc. 2012-06-25 20:52:57 +08:00
xiez
7a0a5509b7 Fix bug in seafile_access_check 2012-06-23 10:26:37 +08:00
xiez
d477e543e7 Modify profile 2012-06-21 20:53:13 +08:00
llj
d8c5604687 improved home-profile 2012-06-21 15:26:03 +08:00
llj
473cf33b97 show 'profile' in home;add profile-modify in setting 2012-06-21 13:27:23 +08:00
xiez
05f709a1a2 Modify share link view 2012-06-20 21:38:07 +08:00
xiez
9c4a54931f Add org account feature 2012-06-20 19:39:21 +08:00
xiez
5b96dc2ab2 Merge branch 'xjq' 2012-06-15 10:12:25 +08:00
killing
556d9b6a81 Modified file access URL. 2012-06-14 20:24:11 +08:00
xiez
0443d88a0e Fix get_diff bug 2012-06-13 19:57:06 +08:00
xiez
705f86e68d Add anonymous share feature 2012-06-12 10:15:47 +08:00
killing
a6dcdda71c Allow viewing encrypted repo directory/file. 2012-06-06 19:32:27 +08:00
xiez
c5daf3879a Fix bug in HTTP_REFERER 2012-06-05 19:38:28 +08:00
xiez
bd243bd383 Some modifications.
* Remove avatar cache
* Handle empty repo open issue
* Add SEAHUB_TITLE in settings.py
2012-05-30 22:42:21 +08:00
killing
d535ad0fb2 Add diff functionality on seahub. 2012-05-30 14:22:28 +08:00
xiez
4c69bfa942 Modify repo history 2012-05-29 11:04:03 +08:00
xiez
966971446d Add permission check on repo_history and repo_history_revert, and clean code 2012-05-28 22:35:45 +08:00
xiez
a4ff981110 Merge branch 'group_admin'
Conflicts:
	group/views.py
2012-05-28 16:40:37 +08:00
xiez
0eddcbcbc7 Merge branch 'xiez' 2012-05-28 16:38:03 +08:00
xiez
39b7243ddd Merge branch 'revert' 2012-05-28 16:37:18 +08:00
xiez
a75e3b699d Add groupadmin feature 2012-05-26 20:52:53 +08:00
xiez
cacebb25c5 Fix bug in remove shared repo in group, and clean code. 2012-05-26 15:31:35 +08:00
xiez
5cce21353d Add permission control in remove shared repo. 2012-05-26 14:49:38 +08:00
xiez
2071db60bb Modify profile page, and allow remove repos that share to me. 2012-05-25 19:42:19 +08:00
killing
55a2b3ce9c Add 'revert' functionality. 2012-05-25 17:07:08 +08:00
killing
0061fbff8a Allow viewing encrypted repo on server. 2012-05-24 17:44:55 +08:00
xiez
c485c68b5d View repo history directory. 2012-05-22 15:32:27 +08:00
xiez
2d3f38397c Translate repo history page and formate modual import 2012-05-20 20:32:21 +08:00
xiez
e24249d999 Clean code 2012-05-19 21:08:10 +08:00
xiez
6dd9bc9994 Sort repo item by name on repo page 2012-05-19 21:01:21 +08:00
xiez
7a0e302de5 Modify file view and download url 2012-05-19 11:50:05 +08:00
xiez
609b1befee Show file size on repo page 2012-05-18 17:48:58 +08:00
xiez
88f6d2b5f6 encode repo path url and remove link of last path 2012-05-18 11:40:39 +08:00
xiez
c12bd16863 Fix bug 2012-05-18 00:22:14 +08:00
xiez
17f79f729a Show repo path on repo page 2012-05-17 23:51:06 +08:00
llj
a054f4a3f5 modified base ui, repo, group, contact 2012-05-17 14:16:46 +08:00
llj
3912e0d20c modified group related code; modified repo & contact 2012-05-17 13:14:29 +08:00
plt
fd44881285 Fix bug in repo download 2012-05-16 22:44:24 +08:00
plt
29c0ffabc9 Merge branch 'master' of ../git-repo/seahub 2012-05-16 22:33:31 +08:00
xiez
91dbc381f4 Add group management, and modify repo download link 2012-05-16 21:32:49 +08:00
xiez
edb5ae0744 Change repo download 2012-05-16 21:31:28 +08:00
plt
0f24341bd4 Merge branch 'master' of ../git-repo/seahub 2012-05-15 16:16:01 +08:00
xiez
0cdd881868 Merge branch 'xiez-group'
Conflicts:
	views.py
2012-05-15 15:14:14 +08:00
xiez
479a7605de Modify page and clean code 2012-05-15 14:29:37 +08:00
xiez
1de93aa036 Show groups on myhome.html 2012-05-15 11:23:28 +08:00
xiez
d63b068b2d Add group feature 2012-05-15 11:01:32 +08:00
llj
c6c864b8c1 [repo-download]add seafile_access_check 2012-05-14 21:52:19 +08:00
xiez
661439d83a Fix bug in repo download on seahub 2012-05-12 21:29:51 +08:00
llj
b95e986b63 [repo-share-form]rewrite autocomplete with jquery-ui-autocomplete 2012-05-09 14:17:26 +08:00
plt
e135537345 resolve conflict in merge 2012-05-07 18:37:03 +08:00
xiez
890462afe6 Fix bug in share repo 2012-05-07 18:00:03 +08:00
xiez
404adb2303 Merge branch 'lj' 2012-05-07 17:27:28 +08:00
llj
4cbeaa2513 [repo-share-form]add autocomplete 2012-05-07 16:53:13 +08:00
xiez
e5611a825f Modify repo page, add role control 2012-05-07 10:59:19 +08:00
llj
c560463eb8 improved repo; modified header 2012-05-05 20:35:08 +08:00
xiez
0da0fa73a5 Fix bug in view repo as anonymous user, and clean code 2012-05-05 19:52:36 +08:00
llj
352a014d39 improved repo 2012-05-05 17:50:03 +08:00
llj
4c24151f04 modified repo 2012-05-04 21:36:36 +08:00
llj
14932fce0d added repo_dir to repo page;modified repo_dir,repo_history 2012-05-04 16:21:01 +08:00
xiez
9f0fb355d1 Fix bug in browser empty repo and encrypted repo 2012-05-04 14:07:33 +08:00
xiez
566e66b8d6 Add seafile version, change 4GB to 2GB, and modify userinfo page 2012-05-03 10:52:43 +08:00
xiez
eaaee89f55 Remove user id, and remove userid middleware 2012-05-02 20:58:06 +08:00
xiez
421a79ca1b Show repo size and add modify author on repo page 2012-04-28 19:47:38 +08:00
xiez
f7aedcd76a Change error msg 2012-04-27 23:01:20 +08:00
xiez
6af452180f Fix bug that couldn't view new created repo on seahub 2012-04-27 16:28:35 +08:00
xiez
c951d852d9 Remove login-require in back to local func 2012-04-27 13:53:49 +08:00
xiez
551d2984c6 Enable to show messages when share repo 2012-04-27 13:47:39 +08:00
xiez
54155176d9 Move share repos to myhome page 2012-04-26 22:15:07 +08:00
xiez
d14ca9a86d Remove auth and site from app, clean auth modual 2012-04-26 20:35:15 +08:00
xiez
9b1e1b2a1e Modify url format 2012-04-26 10:57:36 +08:00
xiez
270c6c6d5d Add a tab to back to local ccnet-applet 2012-04-26 10:19:57 +08:00
xiez
045854195a Add permission check in repo page 2012-04-25 20:48:56 +08:00
xiez
df3c475e09 Fix bug in repo download 2012-04-25 19:23:13 +08:00
plt
18d79dea7a Fix bug 2012-04-25 19:56:53 +08:00
xiez
5f90b28a77 Using urllib to quote repo_name instead of using django 2012-04-25 17:25:08 +08:00
xiez
a7ac3f014d Use textarea for share repo email, and also validate email 2012-04-25 16:49:56 +08:00
xiez
ecafd91884 Change repo download url 2012-04-25 14:34:42 +08:00
xiez
74d5325fe4 Merge branch 'lj' into merge/share_repo_with_lj 2012-04-25 11:39:25 +08:00
xiez
784a160e53 Add ccnet_applet_root in settings.py, used in repo download 2012-04-25 11:18:49 +08:00
xiez
e4fad50b43 Add basic download feature 2012-04-24 22:33:40 +08:00
xiez
f4002df715 Add repo share feature 2012-04-24 22:33:40 +08:00
llj
f4f05ab034 split repo into repo & repo_history 2012-04-24 16:53:57 +08:00
xiez
00f9575c74 Remove sending email after registration, and clean code 2012-04-21 11:05:59 +08:00
xiez
62bf4b11ce Rename several apis 2012-04-20 16:39:51 +08:00
xiez
8edaa75637 Add own permission to repo 2012-04-20 13:37:17 +08:00
xiez
34ca853347 Enable view repo on seahub when user not log in 2012-04-18 21:27:48 +08:00
xiez
b86d7e82a1 Modify public repo page 2012-04-17 11:41:38 +08:00
plt
f27af71e97 Fix bug in view.py 2012-04-16 17:32:13 +08:00
xiez
07c9e0a570 Modify public repo page 2012-04-16 15:59:07 +08:00
xiez
f539743f06 Change from threaded-rpc 2012-04-16 13:47:21 +08:00
xiez
52591e4b71 view public repo on myhome page 2012-04-16 13:47:21 +08:00
xiez
43780a8551 Fix bug about the ending "\n" in peername 2012-04-15 23:47:18 +08:00
xiez
6eb1848c6f Modify user info page 2012-04-15 23:33:22 +08:00
xiez
f634055615 Using peer name instead of user id in user info page 2012-04-15 21:33:38 +08:00
xiez
451c8de68e Merge branch 'lj' 2012-04-13 13:32:53 +08:00
xiez
5b92a3aab9 Add email-userid info page 2012-04-13 13:21:48 +08:00
xiez
8c9a5084e6 Using ccnet EmailUser table instead of seahub auth_user table.
* Rewrite auth module, change user to emailuser.
* Remove site app, and remove EmailOrUsernameModelBackend.
2012-04-11 19:48:20 +08:00
llj
f21f367b61 fix bug in pagination 2012-04-09 16:48:14 +08:00
xiez
63530f01ef Add user id list in middleware, and do some related modifications 2012-04-02 23:56:41 +08:00
xiez
50fe2bb91a Use email-user and binding in ccnet instead of userprofile in seahub
* Remove UserProfile from profile/models.
* Disable ccnet user id binding in profile page
2012-04-01 22:16:38 +08:00
llj
a6e2d8dd63 improved repo page && all tables 2012-03-30 13:50:05 +08:00
xiez
fb533069a9 Bugfix: remove fetched repo correctly on myhome page 2012-03-26 13:59:44 +08:00
xiez
f15fbfdf17 Add ownerhome.html to display owner's repos 2012-03-23 11:25:13 +08:00
xiez
16ebf72499 Enable admin to see user's repo on seafadmin page 2012-03-20 14:06:35 +08:00
xiez
ac7c3e955e Paginate seafadmin page 2012-03-20 11:35:56 +08:00
xiez
072758f2f6 Display owner's email instead ccnet-user-id 2012-03-19 16:48:51 +08:00
xiez
75bdc75e70 Add repo-owner column on seafadmin page 2012-03-19 14:47:34 +08:00
xiez
b72ce1327d User can be deleted on useradmin page 2012-03-17 14:05:21 +08:00
plt
c51eadc4f5 Add list of fetched repos 2012-03-11 21:35:44 +08:00
plt
578be85358 Enable add user in web and remove bind key id in registration form 2012-03-09 10:31:35 +08:00
plt
23e0d2b79c Update seafile rpc 2012-02-27 15:24:27 +08:00
plt
e77d2e3599 Enable activate user in user admin page 2012-02-24 11:23:54 +08:00
plt
37db478448 Impove registration process and add user admin page 2012-02-21 17:11:58 +08:00
plt
67e0ce2fb6 Add contact and share app 2012-02-11 11:12:54 +08:00
plt
fe1b85dbd6 Clean code 2012-02-01 00:07:10 +08:00
plt
eacf638709 Fix bugs in seaf server management 2012-01-29 14:02:30 +08:00
plt
14308b7f7b User seafserv_rpc instead of seafile_rpc and add repo management for staff 2012-01-29 13:05:35 +08:00
plt
92c654179d Show quota usage and remove repo in web 2011-11-01 22:21:01 +08:00
plt
2f7ee386e2 Let user specify ccnet user id when registration 2011-10-29 13:07:45 +08:00
plt
4ed7533d6c Enable setting of token in seahub 2011-10-18 15:41:48 +08:00
plt
3c9b48fea7 Rewrite home and myhome page 2011-10-13 00:17:48 +08:00
plt
ead966c6e2 Can repo to group 2011-09-10 20:07:46 +08:00
plt
6e3bd53397 Rewrite repo related function 2011-09-07 10:59:50 +08:00