haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-18 06:57:52 +00:00
Code Issues Releases Wiki Activity
1,689 Commits 140 Branches 456 Tags 2.6 GiB
bfd6b51a71
Commit Graph

893 Commits

Author SHA1 Message Date
llj
aeb85878ec [repo_view_file]modified contributors 2012-09-17 12:57:29 +08:00
plt
330366cb96 Modify repo history list page 
* Remove restore
* Add tooltip
 2012-09-17 11:11:30 +08:00
llj
9b06dc373e [repo]improved file-op 2012-09-17 10:32:31 +08:00
xiez
54d03673d4 Modify 404 page 2012-09-15 21:26:27 +08:00
xiez
fa447e729f Fixed sending file shared link bug 2012-09-15 21:17:32 +08:00
llj
2317ef5c60 Merge branch 'lj_repo' 2012-09-15 21:03:28 +08:00
llj
15bb2ce923 [repo, repo_history]redesign ui 2012-09-15 21:01:06 +08:00
xiez
874d375de5 Merge branch 'feature/public_msg' 
Conflicts:
	base/models.py
	views.py
 2012-09-15 13:18:13 +08:00
lins05
5f1eccbec5 add file contributor list when view file 2012-09-15 12:00:59 +08:00
xiez
35137b75f4 Clean code 2012-09-15 10:57:32 +08:00
xiez
32f7463a1d Added innpub messages 2012-09-14 22:15:14 +08:00
llj
092a83a1ec [open_local]fixed bug when open local file of 'Docu'; added waiting tip 2012-09-14 16:11:53 +08:00
xiez
c8d708980c Fix recommend in org context 2012-09-14 11:39:33 +08:00
llj
63fe16a502 [file-view]remove line number of text file 2012-09-13 19:17:33 +08:00
llj
d1c68189ea merge lj_codemirror 2012-09-13 16:53:00 +08:00
llj
51aa529071 [file view/edit]rewrite with codemirror 2012-09-13 16:36:23 +08:00
lins05
dd65585ff7 remove a unused file 2012-09-13 14:09:05 +08:00
lins05
bf445f0a0a use libreoffice pdf convertor 2012-09-13 14:01:32 +08:00
xiez
29df42dc64 Use class based view to clean repo code 2012-09-13 13:31:32 +08:00
xiez
0a1457804a Fixed bug in view dir history 2012-09-12 17:19:11 +08:00
xiez
134f290993 Add repo_history_view page, and move message block to base 2012-09-12 17:11:27 +08:00
llj
9e0f848c93 [shared-link]enable selecting the link by click 2012-09-07 19:50:29 +08:00
llj
17b78ce7a4 Merge branch 'lj_fileop' 2012-09-07 16:45:33 +08:00
llj
7c46c64656 [file-mv/cp]clean code 2012-09-07 16:01:07 +08:00
llj
abbbe438b3 [file-mv/cp]ensure only one selected dir display in the popup 2012-09-07 15:01:54 +08:00
llj
df8dada200 [file-mv/cp]enable double click to open a dir 2012-09-07 14:53:11 +08:00
llj
0697550534 [file-mv/cp]rm hd highlight 2012-09-07 13:33:02 +08:00
llj
010f1892e6 [file-mv/cp]open current_repo as default;highlight clicked hd 2012-09-07 11:19:18 +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
plt
3470b73939 Change logo 2012-09-07 10:53:08 +08:00
llj
afd6fd8ff5 [file-op]close other op-list popup when open one 2012-09-07 10:44:12 +08:00
llj
2c989de69e [file-op]modified mv/cp ui;modified op-list popup 2012-09-06 19:51:56 +08:00
xiez
066618c6f9 Modify org repo share tips 2012-09-06 17:38:29 +08:00
xiez
4bf9851c65 Modify org msg 2012-09-06 16:57:54 +08:00
xiez
131dc40f32 Show group add error msg in ajax 2012-09-06 13:22:16 +08:00
llj
95d1865462 Merge branch 'lj_fileop' 2012-09-06 11:47:53 +08:00
llj
c6858620eb [file-op]improved popup interaction 2012-09-06 11:40:36 +08:00
xiez
e12fc8c7b1 Modify inner pub page 2012-09-06 11:07:47 +08:00
xiez
4e76418e70 Unset inner pub repo 2012-09-06 11:03:49 +08:00
llj
ba7d40e2be Merge branch 'lj_public' 2012-09-06 10:50:27 +08:00
xiez
a2e7b86d4a Modify some pages 2012-09-06 10:19:34 +08:00
xiez
9eff5fea03 Modify group create, and clean code 2012-09-06 10:19:34 +08:00
llj
a57fef28d1 [file-op]modified popup 2012-09-05 16:37:14 +08:00
lins05
ad4279ed74 open local file: prompt when not in sync 2012-09-05 11:40:19 +08:00
xiez
b7fd7fdf58 Modify myhome and personal page 2012-09-05 11:03:15 +08:00
xiez
a7ec760511 Modify shared repo 2012-09-05 10:22:30 +08:00
xiez
69dde60743 Change op button 2012-09-04 17:15:19 +08:00
llj
5eba73832a [user_profile]extracted user_profile popup code and included them in grp_info,org_info,public_home 2012-09-04 16:13:06 +08:00
plt
e46a5ff5fe Clean base.html 2012-09-04 12:11:26 +08:00
plt
cc5cb86704 Improve several page 2012-09-04 11:27:15 +08:00
xiez
22ee4fe65a Added button to click into group in repo page 2012-09-03 20:54:51 +08:00
llj
d5cd2da36e Merge branch 'lj_ie' 2012-09-03 20:10:46 +08:00
llj
fa5797c65d [file-edit]added browser-use advice for ie user 2012-09-03 20:09:03 +08:00
xiez
1e8014839f Added share src in inner pub page 2012-09-03 19:36:47 +08:00
xiez
29c9ff11df Added org repo share 2012-09-03 12:04:14 +08:00
lins05
db3a7469de fixed a bug in rename 2012-09-02 20:10:49 +08:00
llj
f8aba3d7ff [file-edit]fixed a bug for ie 2012-09-01 20:34:42 +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
d7a570dc91 Fixed bug when cloud_mode is false 2012-09-01 13:35:27 +08:00
xiez
5ad09999c7 Add context switch decorator 2012-08-31 17:28:50 +08:00
xiez
0e3482e228 Modify personal page 2012-08-31 09:31:00 +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
98142ab219 Add public home 2012-08-30 20:27:27 +08:00
plt
5e31f5030e Change favicon 2012-08-29 13:51:32 +08:00
llj
872ab9f14e [file upload,update]extracted upload_progress_js 2012-08-27 11:36:00 +08:00
plt
d84ebc3c62 Improve css of file comment 2012-08-27 11:06:32 +08:00
xiez
37c0f934bc Add file comment feature 2012-08-26 11:50:57 +08:00
llj
2a3652770e [repo_create_js]fix bug;del debug code 2012-08-25 15:51:45 +08:00
llj
3953525f6c Merge branch 'lj_edit' 2012-08-25 11:53:18 +08:00
llj
1666fc45c6 [file-upload]fixed double progressbar problem for ie 2012-08-24 16:31:43 +08:00
llj
456f730d84 Merge branch 'lj_ie' 2012-08-24 11:56:10 +08:00
llj
5dd7a7e698 [editor]change min-height 2012-08-24 11:53:15 +08:00
lins05
ece64e5f5e allow anyone who can access a repo to revert it 2012-08-23 16:58:38 +08:00
llj
fecaa2d6c8 [bottom_bar]rm 'letter' button 2012-08-23 11:10:22 +08:00
llj
fd7e60174d [repo_view_file]fixed js bug 2012-08-23 10:52:53 +08:00
lins05
981ff56486 improve newline/encoding detection 2012-08-22 17:08:52 +08:00
plt
2980ddee27 Merge branch 'cookie' 2012-08-22 16:43:08 +08:00
plt
6e1a4e5079 Change markdown preview button 2012-08-22 16:31:06 +08:00
llj
85b10baa2f [cookie]modified for ie 2012-08-22 16:22:10 +08:00
llj
13da7e9bfd [file-edit]improved md preview 2012-08-22 14:41:36 +08:00
llj
5b332dcecc [file-edit]added preview for markdown file 2012-08-22 12:08:08 +08:00
plt
5a5937424a Merge branch 'lj_css' 2012-08-22 10:23:43 +08:00
llj
acca44811f [open_local]modified 'redirect-download' popup ui 2012-08-21 17:48:49 +08:00
llj
898ef791e4 [css]clean up 2012-08-21 16:08:41 +08:00
llj
468cc92f9b [cookie]changed 'topinfo' to 'note_id' 2012-08-21 11:27:09 +08:00
llj
c5be7a4062 modified cookie set 2012-08-20 15:56:39 +08:00
plt
9f4820c578 Merge branch 'lj_infobar' 2012-08-19 13:44:04 +08:00
xiez
12b63f3e7a Add basic autocomplete for @ 2012-08-19 13:37:10 +08:00
llj
237427ef60 modified cookie set 2012-08-18 21:53:32 +08:00
llj
517b2a9019 [info-bar]added cookie modification 2012-08-18 21:31:21 +08:00
llj
8630d08dd6 modified info-bar 2012-08-18 21:31:21 +08:00
xiez
871580ae0b Add repo create related js to sigle file 2012-08-18 18:02:31 +08:00
lins05
0047ca24fa fixed a bug in open-local-file 2012-08-18 17:27:48 +08:00
llj
4a1fd76a2c modified styles of md file;modified file edit 2012-08-18 15:34:38 +08:00
llj
5d6f6fb1c0 improved file edit 2012-08-17 17:27:00 +08:00
plt
08dd9892b2 Modify table length 2012-08-17 16:25:59 +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
plt
80223fefa5 Merge branch 'version-check' 2012-08-16 22:08:27 +08:00
xiez
17beca800b Merge branch 'lj_imgview' 2012-08-16 21:13:29 +08:00
killing
9068c400c9 Clean file upload html files and add upload error pages. 2012-08-16 20:25:32 +08:00
lins05
967e6727bd use new version check url 2012-08-16 18:11:21 +08:00
llj
92ed7191ed modifie img view 2012-08-16 17:53:55 +08:00
xiez
40480f8b22 Send email when reset password 2012-08-16 17:01:09 +08:00
xiez
930bd31c30 Add password reset 2012-08-16 11:00:54 +08:00
plt
afd188c102 Merge branch 'lj_recommend' 2012-08-15 16:18:06 +08:00
llj
dd321702d2 [file-view]modified file-op display 2012-08-15 16:17:41 +08:00
llj
ab2915c13f modified recommend 2012-08-15 14:57:14 +08:00
xiez
33a2c1491c clean code 2012-08-15 10:58:08 +08:00
xiez
dee14b2937 Change repo sharing message notification 2012-08-15 10:39:43 +08:00
killing
dc65e319a1 Update file upload code. 2012-08-14 21:13:11 +08:00
xiez
5219347ef8 Modify recommend message and fix profile cache bug 2012-08-14 13:27:27 +08:00
xiez
76c9398522 Modify recommend message 2012-08-13 21:43:34 +08:00
xiez
647713de1b Merge branch 'master2' 2012-08-13 21:29:15 +08:00
xiez
4f64802e22 Modify group recommend 2012-08-13 21:26:58 +08:00
llj
9b8d4b770f improved 'messages' 2012-08-13 17:41:25 +08:00
xiez
8e88f79ec6 Merge branch 'lj' 2012-08-13 16:44:04 +08:00
llj
e89f2ff67a modified recommend 2012-08-13 16:30:21 +08:00
llj
d2c32ce2f8 modified add-new-file 2012-08-13 16:30:21 +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
22184d7b78 Add csrf token in form 2012-08-13 10:52:14 +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
llj
b665c9ed1a modified file_revisions 2012-08-11 20:00:21 +08:00
llj
524c03cd29 modified repo_history 2012-08-11 20:00:21 +08:00
llj
7a09ad7b54 modified file_revisions, repo_history 2012-08-11 20:00:20 +08:00
llj
1fe3c4506e del 'history' in file-op-popup; added 'history' in file-view 2012-08-11 20:00:20 +08:00
llj
c1cbee2bd4 improved file-view ui 2012-08-11 20:00:20 +08:00
llj
cd016ffdf6 modified file-view ui 2012-08-11 20:00:20 +08:00
llj
085a73a323 hide 'footer' when there is 'recommend' 2012-08-11 20:00:20 +08:00
lins05
519287d5d9 create new file on web 2012-08-11 17:19:43 +08:00
lins05
887867b4dc no need to check repo exist before open-local-file 
If no default app found for this file type, open its
directory instead.
 2012-08-11 14:19:52 +08:00
lins05
5bd32f07c4 check seafile version before send open-file request 2012-08-11 10:33:16 +08:00
lins05
b56cf1882d add 'open-local-file' link 2012-08-11 10:33:16 +08:00
xiez
bfefa7df70 Add basic recommend feature 2012-08-10 21:17:28 +08:00
lins05
354b1154a4 show user nickname in repo history/file revision 2012-08-10 13:32:12 +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
c77626550e added 'bottom_bar'(recommend & ...);clean 'view_history' 2012-08-09 20:45:29 +08:00
llj
85692e7816 [editor]added worker-css/js;added one line for bottom scrollbar 2012-08-09 20:45:29 +08:00
llj
e457cbe02a modified file edit: added markdown file, del commit-msg & commit-details 2012-08-09 20:45:29 +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
lins05
140959affb fixed a bug when get ccnet server host addr 2012-08-09 16:07:37 +08:00
xiez
94b1d26409 Make avatar test pass, ans add some other basic tests. 2012-08-08 10:09:02 +08:00
llj
02c47e1662 improved pdf, docu file view for ie 2012-08-04 17:59:55 +08:00
llj
14874cb389 improved auto-complete in myhome 2012-08-04 17:59:55 +08:00
llj
958ded9688 modified pdf and svg file view for ie 2012-08-04 17:59:55 +08:00
llj
f7c519f526 modified source code view for ie8 2012-08-03 20:32:43 +08:00
llj
8f0e431dc2 modified markdown file view for ie8 2012-08-03 17:41:24 +08:00
llj
c04900d3de modified source code view for ie8 2012-08-03 17:24:26 +08:00
llj
d55a788dfd improved source code view 2012-08-03 17:24:26 +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
llj
0a1a131d08 modification for ie 2012-08-03 17:24:25 +08:00
xiez
b187acdb13 Add autocomplete when send file shared link 2012-08-03 14:01:24 +08:00
lins05
1646e9a2c0 use a longer timeout when seafile_access_check 2012-08-03 11:29:00 +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
plt
65692fa793 Modify login page 2012-08-02 00:03:30 +08:00
plt
127aece255 Modify page 2012-08-01 23:47:01 +08:00
plt
7a419c1236 Fix bug 2012-08-01 23:16:53 +08:00
xiez
edbc6de917 Wrap get_group rpc 2012-08-01 22:45:58 +08:00
xiez
4db42157e9 Change OFFICIAL_MODE to CLOUD_MODE 2012-08-01 22:34:35 +08:00
plt
f9e40a6136 Fix bug 2012-08-01 23:45:24 +08:00
llj
9ae6fa9653 added 'reminding';modified team-account, new_msg_reply, group_info 2012-08-01 17:54:08 +08:00
xiez
331e57cd1e Add OFFICIAL_MODE to switch between cloud version and download version. 2012-08-01 17:42:28 +08:00
llj
a007618484 modified team-account(personal_account) 2012-08-01 13:54:54 +08:00
llj
7099f7b5d7 improved contact_add 2012-08-01 13:54:54 +08:00
llj
f370b8e630 improved file view js 2012-08-01 13:54:53 +08:00
llj
bdb40766c4 added syntax highlighting for source code file 2012-08-01 13:54:53 +08:00
xiez
c5d80ee8e7 Add USE_ORG in settings. 
NOTE: Org feature is not enabled by default, in order to use org, need set USE_ORG to True in settings or local_settings.
 2012-08-01 11:08:56 +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
0084b1217e Refactor contacts app. 2012-07-30 19:47:11 +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
b517fefde2 Modify org top bar 2012-07-27 23:37:48 +08:00
plt
6e7dad1766 Update code 2012-07-27 23:37:48 +08:00
xiez
862723e1d8 Modify org user add 2012-07-27 23:35:35 +08:00
llj
c39665081a [top-bar]:added 'team-account';modified style of <a> 2012-07-27 23:35:35 +08:00
xiez
0132e4e85d Modify org 2012-07-27 23:35:35 +08:00
llj
0207e1e162 added markdown file preview;improved file-view ui;modified pdf view 2012-07-27 19:53:49 +08:00
llj
cc4211d284 improved pdf/doc view 2012-07-26 16:12:58 +08:00
llj
2aedd5dbbf modified repo-op 2012-07-26 16:08:01 +08:00
plt
aa432c6a25 Fix typo 2012-07-26 16:16:20 +08:00
plt
3d1f2ba50c Set unkown file type 2012-07-26 15:43:42 +08:00
plt
afb931a333 Move condition check from client to server in repo_file_get.html 2012-07-26 15:14:10 +08:00
llj
06e8f248b5 added loading-img for pdf view;modified doc view code indent;modified ui of joined group avatar 2012-07-24 17:44:44 +08:00
llj
b9014c6668 improved repo-op btn;fixed ff button bug. 2012-07-24 16:23:05 +08:00
llj
075eae8723 improved ui of pdf view in page 2012-07-24 16:23:05 +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
65a1b667dd improved ui of group avatar;added link to user avatar 2012-07-23 17:36:07 +08:00
xiez
84b8bc001d Add missing templatetag 2012-07-23 17:04:51 +08:00
xiez
6dd67afc43 Use short email in commit message. 2012-07-23 17:00:58 +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
plt
571e9ba2b0 Remove back to local link 2012-07-21 20:34:26 +08:00
lins05
64d0dd8b0c use token to controll access 2012-07-21 17:14:15 +08:00
llj
e095d90a98 [contacts]contact_add: changed from a page to a popup 2012-07-20 16:25:30 +08:00
plt
6980d24bc7 Use dropdown arrow as more option img 2012-07-20 14:33:33 +08:00
plt
0b02cec341 Change download to sync 2012-07-20 14:22:39 +08:00
llj
49cddd47d2 [myhome]modified repo-create btn and other modification 2012-07-20 10:53:20 +08:00
llj
53b8f2f0ab [repo]file cp/mv popup: change width when open dir tree 2012-07-19 21:18:14 +08:00
llj
a01514e795 modified ui of avatar_modify, file_upload/update 2012-07-19 15:18:12 +08:00
llj
c94aaf1513 [repo]modified file-mv/cp popup 2012-07-19 14:06:18 +08:00
llj
ef95e145d4 modified grp member-add & repo-op 2012-07-19 14:06:18 +08:00
llj
adfc1114ea [repo]improved more-op popup 2012-07-19 14:06:17 +08:00
llj
0b37e40cbc improved ajax POST 2012-07-19 14:06:17 +08:00
llj
695eb760fb improved repo_upload_file 2012-07-19 14:06:17 +08:00
llj
d07f8b7d60 improved repo_create 2012-07-19 14:06:17 +08:00
xiez
ea1b664541 Add new repo_file_get file and clean settings.py. 2012-07-19 11:31:30 +08:00
plt
6eddec46ae Improve file type icons 2012-07-19 12:24:07 +08:00
plt
b7f95673a1 Improve table style and create repo link style 2012-07-17 11:39:13 +08:00
llj
e1ecd6f7fb improved repo_create 2012-07-16 17:41:08 +08:00
llj
1fe9c25bbb improved view_shared_file 2012-07-14 21:12:51 +08:00
llj
cc7bd9b326 improved repo_file_view 2012-07-14 21:12:51 +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
xiez
9c71c002a0 Move group_avatar from group to avatar. 2012-07-14 20:17:40 +08:00
llj
75b724a169 added func: set group avatar 2012-07-14 20:17:40 +08:00
lins05
cbab401d84 fixed a bug in file history list 2012-07-14 14:16:39 +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
llj
edd5e5428a modified header 2012-07-12 16:05:43 +08:00
plt
d8336f35bf Change style to navigation bar 2012-07-12 11:13:50 +08:00
xiez
72d0ae8a20 Modify 404 page 2012-07-09 16:17:44 +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
llj
3340d139d4 improved file-op popup 2012-07-06 15:16:06 +08:00
xiez
f5f076a3f1 Merge branch 'lj' 2012-07-05 19:58:01 +08:00
xiez
206e71411b Add dir diff 2012-07-05 19:56:39 +08:00
llj
d2784e1a4c improved file-op popup 2012-07-05 19:52:02 +08:00
xiez
2f95082933 Merge branch 'lj' into master2 2012-07-05 19:31:29 +08:00
xiez
7d24c7c204 Modify repo history 2012-07-05 19:29:56 +08:00
llj
957f391111 [repo_history]improved details popup 2012-07-05 17:45:21 +08:00
xiez
6664ec3127 Merge branch 'upload' 2012-07-05 16:14:39 +08:00
xiez
79a9ee8717 Merge branch 'lj' 2012-07-05 14:41:21 +08:00
xiez
e51747caff Fix bug in visiting repo.html when user in not logged in 2012-07-05 14:39:28 +08:00
llj
7ef6406cba added tip to repo-share popup 2012-07-05 14:28:29 +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
llj
ecd93b3a70 added tip to repo-share popup 2012-07-05 10:36:46 +08:00
plt
7080f9d864 Improve footer 2012-07-04 17:57:16 +08:00
llj
677853f1ec redesigned footer;improved file-op popup position 2012-07-04 17:27:53 +08:00
xiez
df3946ee82 Merge branch 'preview-rebased' 2012-07-04 10:57:30 +08:00
xiez
e173920670 Add url_target_blank filter 2012-07-03 23:05:35 +08:00
xiez
7a4dfadf75 Rewrite repo history page 2012-07-03 21:48:33 +08:00
xiez
38f20dbaa1 Show escaped content in pre tag 2012-07-03 17:57:14 +08:00
plt
a9891a761e Fix bug 2012-07-03 17:56:41 +08:00
xiez
c70fbf11d1 Fix bug 2012-07-03 17:55:18 +08:00
xiez
340ad516e4 Add file preview feature 2012-07-03 17:55:18 +08:00
llj
8b40a83880 added file op:rename, cp, mv, upload, create 2012-07-02 11:47:04 +08:00
xiez
4cd0a2cc44 Modify home page 2012-06-30 11:59:51 +08:00
xiez
89eb1714d7 Modify page 2012-06-29 10:16:10 +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
1be271353e Mofigy group msg reply notification 2012-06-27 19:56:11 +08:00
xiez
8cd03c94cb Notify group message reply 2012-06-27 16:39:49 +08:00
xiez
9717f9a7ec Add user notification 2012-06-26 19:23:32 +08:00
xiez
83c0242d78 Add group message feature 2012-06-26 19:23:32 +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
llj
3f39de1c3c improved seafile_access_check 2012-06-14 16:27:24 +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
xiez
82263b6787 Remove web access setting on repo page 2012-06-11 19:58:53 +08:00
lins05
2e134f92d5 [server-setup] use port 13420 in seafile_access_check 2012-06-07 11:46:48 +08:00
killing
a6dcdda71c Allow viewing encrypted repo directory/file. 2012-06-06 19:32:27 +08:00
llj
01f65e4f22 modification for ie 2012-06-06 17:34:42 +08:00
xiez
c5daf3879a Fix bug in HTTP_REFERER 2012-06-05 19:38:28 +08:00
xiez
f9c72b57a4 Add notification at info-bar, and fix bug in visiting register/login page when user is already logged in. 2012-06-04 21:27:32 +08:00
plt
28dbc2ad73 Improve repo and repo_history_dir 2012-06-01 02:20:35 +08:00
plt
b0b0dfea47 Improve css 2012-06-01 02:10:31 +08:00
llj
7492665f3a modified layout of repo_history_dir 2012-05-31 19:53:33 +08:00
llj
5f4c50e141 modified column width of tables 2012-05-31 19:21:07 +08:00
llj
aa9ce1520d modified 'commit-time' in repo & repo_history; added 'commit-time' to repo_history_dir 2012-05-31 17:50:46 +08:00
llj
2f3867b1a3 add 'time' to repo; modifed 'commit details' in repo_history; modified hd in repo_history_dir 2012-05-31 12:00:50 +08:00
plt
5445021e8e Merge branch 'lj' 2012-05-30 23:49:32 +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
llj
03da1d073e [repo_history]modified td width;[group_info]changed op-link to icon 2012-05-30 20:23:46 +08:00
xiez
120e960e21 Fix bug in diff 2012-05-30 19:59:15 +08:00
xiez
3b3a882913 Merge branch 'diff' 2012-05-30 19:57:40 +08:00
xiez
27e5d75637 Merge branch 'bugfix/avatar_add' 
Conflicts:
	avatar/templates/avatar/add.html
 2012-05-30 16:23:59 +08:00
llj
ceb1a5f6c8 fixed bug in repo 2012-05-30 16:10:11 +08:00
llj
ce9dbaed25 fixed indent 2012-05-30 14:44:03 +08:00
killing
d535ad0fb2 Add diff functionality on seahub. 2012-05-30 14:22:28 +08:00
llj
2ec528339f modified repo_history, repo_history_dir;cleaned up css 2012-05-30 14:12:48 +08:00
xiez
49dd0229d4 Remove avatar change page 2012-05-30 13:51:25 +08:00
llj
844196b2f9 [shareadmin, contact_list]change op-btn to img icon; improved myhome 'op' code 2012-05-30 12:00:57 +08:00
llj
d4d08fc496 modified repo 2012-05-30 12:00:57 +08:00
llj
283b4f0e58 modified 'side' of myhome & repo 2012-05-30 12:00:57 +08:00
plt
48b1b8a4b1 Merge branch 'repo_history' into master2 
Conflicts:
	profile/templates/profile/user_ids.html
 2012-05-29 22:34:42 +08:00
xiez
d760d54a00 Modify commit time format 2012-05-29 20:29:59 +08:00
llj
6f40b55c50 fixed bug for repo-op in myhome 2012-05-29 11:25:49 +08:00
xiez
4c69bfa942 Modify repo history 2012-05-29 11:04:03 +08:00
llj
f444794d29 modifed repo-op ui in myhome; modified avatar 2012-05-28 22:10:54 +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
5cce21353d Add permission control in remove shared repo. 2012-05-26 14:49:38 +08:00
xiez
35aefe608d Merge branch 'feature/avatar' into master2 2012-05-25 20:14:50 +08:00
xiez
2071db60bb Modify profile page, and allow remove repos that share to me. 2012-05-25 19:42:19 +08:00
llj
6b5c2fef4e modified avatar related pages-base, group_info, avatar_change 2012-05-25 17:15:15 +08:00
killing
55a2b3ce9c Add 'revert' functionality. 2012-05-25 17:07:08 +08:00
xiez
e5f64a4944 Remove avatar delete url 2012-05-25 14:14:51 +08:00
xiez
df4a838005 Show avatar in top bar instead of myhome page. 2012-05-24 21:12:48 +08:00
xiez
4c20e49613 Make basic avatar operations work. 2012-05-24 20:20:08 +08:00
killing
0061fbff8a Allow viewing encrypted repo on server. 2012-05-24 17:44:55 +08:00
llj
4878db22a1 modified icons in repo page 2012-05-23 13:50:12 +08:00
llj
68b9a3c703 modified shareadmin 2012-05-23 13:50:12 +08:00
llj
4e77183492 modified submit-btn & registration pages with only text 2012-05-23 13:50:12 +08:00
plt
a2d7d74f4a Merge branch 'lj2' into repo_history 2012-05-22 17:35:24 +08:00
llj
207f236437 modified registration pages, contact-add/edit, user-add 
* modifed ui of all pages above
* add input field check before submit for forms
 2012-05-22 16:21:16 +08:00
llj
80a17711d2 modifed 'mygroup' in myhome 2012-05-22 16:18:34 +08:00
xiez
c485c68b5d View repo history directory. 2012-05-22 15:32:27 +08:00
xiez
de984749d0 Fix bug in unshare repo 2012-05-22 13:41:41 +08:00
xiez
2d3f38397c Translate repo history page and formate modual import 2012-05-20 20:32:21 +08:00
llj
93a5b54c18 modified repo-history page 2012-05-19 21:28:06 +08:00
llj
c0df5bc283 modified ui of seafadmin 2012-05-19 21:28:06 +08:00
llj
5792594c15 fix bug in autocomplete 2012-05-19 21:28:06 +08:00
llj
cff0b604be Center contact_add/edit & 'registration' pages 2012-05-19 21:28:06 +08:00
llj
cd05efe89e add 'addAutocomplete' func; add autocomplete to add-group-member; modified repo-share 2012-05-19 21:28:06 +08:00
llj
32f6a6cede modifed group-member-icon;rewrite confirm dialog;add confirm to rm group 2012-05-19 21:28:06 +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
plt
f333633159 Merge branch 'repo_path' 
Conflicts:
	templates/repo.html
 2012-05-18 15:33:50 +08:00
plt
4d72aedf45 Improve file icons 2012-05-18 15:21:53 +08:00
plt
1611194758 Merge branch 'master' of /home/gonggeng/git-repo/seahub into master2 2012-05-18 14:49:58 +08:00
plt
d2d4f7e885 Merge branch 'filter' 2012-05-18 13:47:39 +08:00
llj
43d5089057 modified repo, group_info 2012-05-18 11:47:59 +08:00
xiez
88f6d2b5f6 encode repo path url and remove link of last path 2012-05-18 11:40:39 +08:00
plt
5bfca47edb Merge branch 'repo_path' into master2 
Conflicts:
	templates/repo.html
 2012-05-18 01:08:04 +08:00
xiez
27f714c4a8 Add file icon 2012-05-17 23:52:37 +08:00
xiez
17f79f729a Show repo path on repo page 2012-05-17 23:51:06 +08:00
xiez
db2419c598 Modify group page 2012-05-17 23:50:04 +08:00
plt
af96c3085e Improve group css 2012-05-17 23:59:16 +08:00
llj
24a760758c modified top-bar, repo, contact_list, user admin pages 2012-05-17 20:40:40 +08:00
xiez
d5d9e81e1c Modify repo page 2012-05-17 19:43:50 +08:00
plt
97c6de7ee8 Remove unused icons and add default group icon 2012-05-17 15:59:59 +08:00
plt
c4f8ee968b Merge branch 'lj' 2012-05-17 15:41:25 +08:00
xiez
034ea57339 Dynamicly change navigator 2012-05-17 14:02:47 +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
xiez
91dbc381f4 Add group management, and modify repo download link 2012-05-16 21:32:49 +08:00
xiez
8d9c3960e7 Change view/download button to a tag in repo.html 2012-05-16 15:22:04 +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
llj
77bf3cf392 modified ui of #main; clean up css 2012-05-14 21:52:18 +08:00
llj
ea45a6c999 modified ui of contacts; clean code & rm unused files 2012-05-12 15:52:07 +08:00
llj
b95e986b63 [repo-share-form]rewrite autocomplete with jquery-ui-autocomplete 2012-05-09 14:17:26 +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
llj
5143d5d370 improved repo & repo_histroy 2012-05-05 14:23:37 +08:00
plt
0d9d36932f Merge branch 'lj' 2012-05-05 13:13:38 +08:00
llj
bb0983c5fc modified header 2012-05-05 10:51:18 +08:00
llj
4c24151f04 modified repo 2012-05-04 21:36:36 +08:00
xiez
fb336698d2 Add contact feature 2012-05-04 16:30:07 +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
1b898331c7 Modify server version 2012-05-03 13:52:35 +08:00
xiez
566e66b8d6 Add seafile version, change 4GB to 2GB, and modify userinfo page 2012-05-03 10:52:43 +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
551d2984c6 Enable to show messages when share repo 2012-04-27 13:47:39 +08:00
xiez
5b9aa88709 Change seahub navigator 2012-04-26 22:23:02 +08:00
xiez
54155176d9 Move share repos to myhome page 2012-04-26 22:15:07 +08:00
xiez
301597d826 Merge branch 'lj' into feature/clean_auth 2012-04-26 20:36:07 +08:00
xiez
d14ca9a86d Remove auth and site from app, clean auth modual 2012-04-26 20:35:15 +08:00
llj
1e59d855d7 modified 'download'(open in new window or tab) & other btns 2012-04-26 16:41:22 +08:00
xiez
153da6ad55 Fix repo download bug 2012-04-26 13:40:28 +08:00
xiez
15dce6cef0 Merge branch 'lj' into merge/urlformat_lj 
Conflicts:
	templates/repo.html
 2012-04-26 11:06:47 +08:00
llj
56bf442297 modified repo-access-switch click 2012-04-26 10:59:02 +08:00
xiez
9b1e1b2a1e Modify url format 2012-04-26 10:57:36 +08:00
xiez
df3c475e09 Fix bug in repo download 2012-04-25 19:23:13 +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
83e50e29bc Modify url 2012-04-25 13:21:40 +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
be712e3a8e Modify repo access page 2012-04-24 11:24:04 +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
b15ebbe426 Bug fix in repo page 2012-04-20 14:21:09 +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
xiez
8e8b6b774b Enable to view file on the server 2012-04-17 10:32:28 +08:00
xiez
4788c8078c Modify public repo page 2012-04-17 09:51:07 +08:00
xiez
07c9e0a570 Modify public repo page 2012-04-16 15:59:07 +08:00
xiez
52591e4b71 view public repo on myhome page 2012-04-16 13:47:21 +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
ed41db3206 modified pwd_change 2012-04-09 15:10:15 +08:00
xiez
bab5790de7 Using new navigator in password_reset page, and modify some words 2012-04-05 15:10:38 +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
plt
fc11ef20cb Update useradmin.html 2012-04-01 20:31:30 +08:00
llj
fbe5f18f64 improved tables 2012-04-01 14:25:59 +08:00
llj
a6e2d8dd63 improved repo page && all tables 2012-03-30 13:50:05 +08:00
llj
c4b94434b9 added token-show-switch for repo page 2012-03-28 10:38:12 +08:00
llj
04266b81ad improved delete comfirmation 2012-03-27 17:42:08 +08:00
llj
09d507ead7 improved repo, ownerhome, useradmin pages 2012-03-27 11:13:58 +08:00
llj
dc44b60b21 improved del-btn for some pages:myhome, seafadmin, useradmin 
*myhome: improved ui, added dialog
*other: added dialog
 2012-03-27 11:13:58 +08:00
xiez
fb533069a9 Bugfix: remove fetched repo correctly on myhome page 2012-03-26 13:59:44 +08:00
xiez
e140e49a5c Resolve confflicts when merge lj 2012-03-24 17:31:02 +08:00
llj
ea7949d40c fixed a bug in login 2012-03-24 11:34:25 +08:00
llj
b812c6b5a8 improved useradmin & seafadmin 2012-03-23 16:24:25 +08:00
llj
6555e70ded modified seafadmin 2012-03-23 14:50:19 +08:00
llj
b181af9598 improved several pages 2012-03-23 12:01:00 +08:00
xiez
f3d11e0c8e Add missing html file 2012-03-23 11:29:07 +08:00
xiez
f15fbfdf17 Add ownerhome.html to display owner's repos 2012-03-23 11:25:13 +08:00
xiez
d98794b55c Resolve cofflicts in when merge lj 2012-03-23 11:11:18 +08:00
llj
4cf87d09ba improved several pages 2012-03-22 20:33:27 +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
5e527af20b Enable admin delete user when user has not bind ccnet-id 2012-03-19 11:11:37 +08:00
xiez
6bba8865b9 Add confirm dialog when delete user 2012-03-18 20:43:51 +08:00
xiez
b72ce1327d User can be deleted on useradmin page 2012-03-17 14:05:21 +08:00