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
xiez
29df42dc64 Use class based view to clean repo code 2012-09-13 13:31:32 +08:00
xiez
134f290993 Add repo_history_view page, and move message block to base 2012-09-12 17:11:27 +08:00
xiez
51da061d8e Clean code 2012-09-12 11:35:43 +08:00
llj
17b78ce7a4 Merge branch 'lj_fileop' 2012-09-07 16:45:33 +08:00
xiez
9b7528daa1 Show error msg in ajax when add/rename file or dir 2012-09-07 11:03:17 +08:00
lins05
5bf1743882 redirect to repo history when revert file from repo histoy view 2012-09-07 10:58:42 +08:00
lins05
5b423f6f6f redirect to parent dir after revert a file 2012-09-07 10:24:29 +08:00
llj
2c989de69e [file-op]modified mv/cp ui;modified op-list popup 2012-09-06 19:51:56 +08:00
xiez
4bf9851c65 Modify org msg 2012-09-06 16:57:54 +08:00
xiez
4e76418e70 Unset inner pub repo 2012-09-06 11:03:49 +08:00
xiez
9eff5fea03 Modify group create, and clean code 2012-09-06 10:19:34 +08:00
xiez
cdf017da1a Fixed bug in remove repo 2012-09-04 21:05:20 +08:00
xiez
69dde60743 Change op button 2012-09-04 17:15:19 +08:00
xiez
22ee4fe65a Added button to click into group in repo page 2012-09-03 20:54:51 +08:00
xiez
1e8014839f Added share src in inner pub page 2012-09-03 19:36:47 +08:00
xiez
d138bee164 Fixed bug in org repo share, and clean code 2012-09-03 16:14:15 +08:00
xiez
29c9ff11df Added org repo share 2012-09-03 12:04:14 +08:00
lins05
20fc024f15 quote file/dir names in url 2012-09-02 20:23:57 +08:00
lins05
db3a7469de fixed a bug in rename 2012-09-02 20:10:49 +08:00
xiez
12a6e0a87f Fixed a few bugs related to org. Using with tag to wrap template include 2012-09-01 17:48:26 +08:00
xiez
5ad09999c7 Add context switch decorator 2012-08-31 17:28:50 +08:00
xiez
1e4d831f46 Remove session storage in context switch 2012-08-30 20:27:28 +08:00
xiez
02b3f6f0af Add org personal page, and inner pub page 2012-08-30 20:27:28 +08:00
xiez
06de726050 Modify public home 2012-08-30 20:27:28 +08:00
xiez
7c4884a7f4 Change public repo to innerpub repo 2012-08-30 20:27:28 +08:00
xiez
98142ab219 Add public home 2012-08-30 20:27:27 +08:00
llj
869222d863 [file-op]added feedback message 2012-08-27 11:16:02 +08:00
xiez
37c0f934bc Add file comment feature 2012-08-26 11:50:57 +08:00
xiez
0d8a1d47b1 Fix user add bug 2012-08-24 11:23:49 +08:00
lins05
ece64e5f5e allow anyone who can access a repo to revert it 2012-08-23 16:58:38 +08:00
lins05
981ff56486 improve newline/encoding detection 2012-08-22 17:08:52 +08:00
llj
7f20d67df3 modified file revert 2012-08-21 21:04:36 +08:00
xiez
43ba724391 Merge branch 'upload-error' 2012-08-17 11:39:22 +08:00
lins05
cd2ded2696 revert file from history 2012-08-17 11:00:49 +08:00
killing
9068c400c9 Clean file upload html files and add upload error pages. 2012-08-16 20:25:32 +08:00
xiez
40480f8b22 Send email when reset password 2012-08-16 17:01:09 +08:00
xiez
338561cb83 Use user.set_password to change user password, instead of using raw rpc 2012-08-16 14:31:37 +08:00
xiez
930bd31c30 Add password reset 2012-08-16 11:00:54 +08:00
xiez
e0c5529557 Add sys_staff_required decorator 2012-08-16 10:48:59 +08:00
xiez
33a2c1491c clean code 2012-08-15 10:58:08 +08:00
killing
dc65e319a1 Update file upload code. 2012-08-14 21:13:11 +08:00
xiez
c9e37ac5c4 Modify group recommend.
* Get all groups a repo shared, then find out groups that user joined.
2012-08-14 17:53:58 +08:00
xiez
4f64802e22 Modify group recommend 2012-08-13 21:26:58 +08:00
lins05
58f3284d4c use django form in new-dir/new-file 2012-08-13 16:25:53 +08:00
xiez
339445cf5e Recommend directory to group 2012-08-13 15:58:54 +08:00
llj
ee6c2d2d61 [myhome]combine groups_manage and groups_join 2012-08-13 11:05:28 +08:00
xiez
b8998c994a Merge branch 'new-file' 2012-08-13 10:50:37 +08:00
xiez
01b355a0f6 Merge branch 'recommend'
Conflicts:
	media/css/seahub.css
	views.py
2012-08-13 10:46:07 +08:00
plt
029322a498 Move open-local to file_view 2012-08-12 11:22:42 +08:00
plt
1bc96f3a75 Merge branch 'open-file' 2012-08-12 00:38:15 +08:00
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