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
killing
b60b27f022 Modify file upload error page. 2012-10-31 11:16:59 +08:00
zhengxie
989e32a32c Modified plural 2012-10-31 10:02:00 +08:00
llj
f1ef097bac translation 2012-10-30 20:38:37 +08:00
zhengxie
438f54bcac Modified translations and i18n for auth 2012-10-30 14:42:21 +08:00
zhengxie
a21dcf40b7 i18n for seahub forms 2012-10-30 11:56:01 +08:00
zhengxie
6b7744c3e8 Fixed bug in i18n 2012-10-29 23:12:06 +08:00
llj
5621d23694 translation and js/css modification for en 2012-10-29 21:44:13 +08:00
plt
ad44c589e5 Modified paging 2012-10-29 16:33:53 +08:00
zhengxie
ca79f8fca0 i18n for share 2012-10-29 11:19:21 +08:00
zhengxie
f4afd0edef Modified translations 2012-10-27 21:12:28 +08:00
zhengxie
77130dbd78 i18n for pub page 2012-10-27 21:03:56 +08:00
zhengxie
6ce8589a1b i18n for repo history and snapshot 2012-10-27 20:32:45 +08:00
zhengxie
a90d4e989d i18n for repo_view_file page 2012-10-27 19:41:00 +08:00
zhengxie
56ad57c565 i18n form repo page 2012-10-27 17:23:30 +08:00
zhengxie
68377baee4 i18n for group and myhome 2012-10-27 14:11:37 +08:00
zhengxie
cb469bd31f Modified i18n for myhome 2012-10-27 11:42:13 +08:00
llj
21de42fd7b [myhome]translation 2012-10-27 11:23:15 +08:00
plt
9cf34f19eb Change logo img 2012-10-27 10:41:19 +08:00
llj
ebf9327f12 Merge branch 'lj' 
Conflicts:
	organizations/views.py
	templates/myhome.html
	templates/snippets/my_owned_repos.html
	views.py
 2012-10-26 20:23:21 +08:00
zhengxie
2c18ff7b17 Changed repo to library 2012-10-26 19:54:45 +08:00
llj
6baebcd97f added file-star feature(by ls & lj) 2012-10-26 19:50:36 +08:00
zhengxie
e6eceaa1cd Merge branch 'quota' into feature/i18n 
Conflicts:
	templates/myhome.html
 2012-10-26 19:24:22 +08:00
zhengxie
f76f396937 Added i18n form login and myhome page 2012-10-26 19:15:52 +08:00
killing
1d8ae030c2 Add quota and quota usage information. 
Changed pages:
* myhome
* user info admin
* org personal page
* org admin page
 2012-10-26 14:34:46 +08:00
killing
f9cfd081fe Change commit description and diff output for merge. 2012-10-24 21:16:53 +08:00
llj
99dc7fa328 rm 'update' in file-view;added 'history' in repo file-op 2012-10-24 17:38:03 +08:00
llj
735da17157 modified repo-share popup & css for some form elements 2012-10-24 16:59:19 +08:00
llj
23ea468d60 [text-diff]redesign ui 2012-10-24 15:40:25 +08:00
zhengxie
fd8b98f88c Modified org seahub title 2012-10-23 20:53:59 +08:00
zhengxie
0fc71e366e Change default title 2012-10-23 20:14:12 +08:00
zhengxie
927741d552 Improved css of tips and placeholder 2012-10-23 17:47:00 +08:00
llj
7279405cc8 modified atautocomplete and file-comment 2012-10-23 17:21:42 +08:00
zhengxie
26e0213fa3 Modified group duplicated name checking 2012-10-23 16:41:46 +08:00
llj
d9bbed6f04 improved recommend-to-group & clean up code 2012-10-22 17:49:22 +08:00
llj
5795f4c304 [bottom-bar]improved to-group 2012-10-22 13:19:12 +08:00
llj
0d14e4ad29 [to-group]modified the popup to be like comment-popup 2012-10-20 21:37:02 +08:00
llj
50947201a1 [bottom-bar]fixed bug(comment-btn is hidden when repo not shared to grp) 2012-10-20 20:19:27 +08:00
zhengxie
56ea2dbd66 Added at complete in file commet 2012-10-20 19:43:56 +08:00
zhengxie
e8ef6b8b1d Modify tips 2012-10-20 16:28:42 +08:00
zhengxie
ab4d29262c Handle multi groups when click into group in repo page 2012-10-20 16:28:42 +08:00
zhengxie
2afa404385 Added i18n for seahub 2012-10-20 16:22:19 +08:00
zhengxie
1418a244cd Modified checkbox 2012-10-20 15:27:50 +08:00
zhengxie
8c556ed0e9 Modified group recommend 2012-10-20 15:22:54 +08:00
lins05
5545afe6d7 improve diff related code 2012-10-20 11:48:33 +08:00
plt
02b3c655fa Modify css style of member list 2012-10-20 10:33:02 +08:00
lins05
f9e0437628 add text file diff 2012-10-19 18:00:22 +08:00
zhengxie
1f08f9fb52 Added jquery placeholder 2012-10-19 17:53:31 +08:00
llj
6596e55a95 [view-shared-file]fixed bug(added css file) 2012-10-17 22:15:08 +08:00
llj
8f5bfb0999 [file-view]added 'update', modified 'history' positon;[edit]modified md file-edit 2012-10-17 15:37:15 +08:00
plt
e7dd1aede8 Change style of commit detail 2012-10-17 11:55:15 +08:00
llj
1fc32d18fd [myhome]modified repo-list table width for ie 7 2012-10-16 16:35:04 +08:00
llj
82400f7010 [lsch]fixed js bug for ie 7 2012-10-16 16:03:23 +08:00
llj
49096665f6 [info-bar]modified cookie set for safari 2012-10-16 15:05:58 +08:00
plt
ca409c5806 Modify decrypt repo page 2012-10-15 22:21:38 +08:00
llj
b28ba88c86 Merge branch 'events' 2012-10-15 21:05:28 +08:00
llj
be492b7eed Merge branch 'lj_edit' 2012-10-15 21:05:19 +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
654c7cac07 Modify password reset form 2012-10-15 16:49:27 +08:00
llj
d470ed1461 [codeMirror]enable editor auto-resizing;improved height of file-view 2012-10-15 15:49:12 +08:00
llj
5d279c992d merge lj_ie 2012-10-15 11:10:10 +08:00
zhengxie
cee9a2606b Added timestamp to css and js 2012-10-13 21:59:33 +08:00
llj
2afbd695c5 [myhome]added 'cache' to tabs 2012-10-13 19:18:24 +08:00
zhengxie
3e464137c0 Modify org personal page, and add org root 2012-10-13 17:40:55 +08:00
llj
daa8566d34 modification for ie 2012-10-13 17:34:48 +08:00
zhengxie
6cd0df1a1d Disable button when perform ajax post 2012-10-12 21:12:18 +08:00
killing
28d86558e1 Fix bug when showing update file error. 2012-10-12 17:12:54 +08:00
zhengxie
e189c91c9e Added title_panel in org pages 2012-10-12 10:41:15 +08:00
killing
2aecb8478c Revert a deleted dir in recycle page. 2012-10-11 14:50:02 +08:00
zhengxie
782d583e34 Added missing templates 2012-10-11 14:35:42 +08:00
zhengxie
7088daf7c3 Added pubinfo page 2012-10-11 14:34:08 +08:00
zhengxie
7fe8376866 Modify org groups 2012-10-11 12:59:38 +08:00
killing
b137de1c9d Fix bugs in admin pages. 
* Admin should not access the contents of non-readable repos.
* Fix bug in userinfo.html.
 2012-10-11 10:58:02 +08:00
zhengxie
3e0961ff90 Fixed autocomplete bug when share repo 2012-10-10 19:21:17 +08:00
llj
be89036fcb Merge branch 'lj_group' 2012-10-10 18:20:19 +08:00
llj
0c6c2b1d2a [groups]clean code 2012-10-10 15:54:17 +08:00
llj
978c49a4a6 modified info-bar 2012-10-10 11:54:49 +08:00
zhengxie
3de1d68209 Add bulb-tips 2012-10-10 11:38:33 +08:00
zhengxie
b98fe8b0ac Fixed autocomplete bug 2012-10-10 10:45:10 +08:00
zhengxie
2d22e92dd5 Change tips style 2012-10-09 22:24:40 +08:00
zhengxie
8efc8eced3 Merge branch 'recycle' 2012-10-09 21:56:54 +08:00
zhengxie
91962bff50 Merge branch 'myhome' 
Conflicts:
	templates/snippets/shared_in_repos.html
 2012-10-09 21:56:41 +08:00
zhengxie
05bf9ea8e6 Modify empty tips 2012-10-09 21:47:54 +08:00
llj
95c2241efb redesigned ui of myhome and org_personal 2012-10-09 17:51:13 +08:00
llj
bc3c0b577d modified myhome right panel 2012-10-09 17:51:13 +08:00
ZhengXie
4789ad6343 Added tips when there is no owned repos. 2012-10-09 16:45:06 +08:00
killing
68f9d27709 Revert file from recycle page. 2012-10-09 15:00:09 +08:00
killing
916184a54c Add file recycle view. 2012-10-09 14:41:21 +08:00
ZhengXie
41d0b33b77 Changed repo name 2012-10-09 14:38:13 +08:00
llj
1ee4ee8a1a [events]redesigned the ui 2012-09-29 17:17:00 +08:00
llj
d628bc4371 [event]show events in myhome 2012-09-28 21:51:04 +08:00
lins05
02870ee552 add user events 2012-09-28 17:04:38 +08:00
lins05
80a84e097a remove flexpaper printer/logo button 2012-09-28 14:14:48 +08:00
llj
45e46b8dd1 Merge branch 'lj' 2012-09-28 11:59:03 +08:00
llj
414d0ec2bf [repo-file-op]highlight it, show some op and etc. when click other line 2012-09-28 11:43:51 +08:00
killing
658324e5c1 Display "download" link for files in a read-only repo. 2012-09-28 09:47:21 +08:00
llj
4efed862ee modified repo icons and added title to them 2012-09-27 19:15:55 +08:00
llj
c5e76855fc [repo]fixed repo-file-op interaction bug 2012-09-27 17:15:19 +08:00
llj
8791da008f modified repo page:interaction & file-rename popup; modified 'r' repos icon 2012-09-27 16:43:45 +08:00
xiez
669a556626 Disable innerpub msg and msg reply 2012-09-27 16:05:07 +08:00
plt
7274fdb31f Improve contacts page 
* Add tip
* Rename 联系人 to 通讯录
 2012-09-27 11:34:06 +08:00
xiez
e1bb456c0e Disable sharing repo to unregistered user 2012-09-27 11:08:05 +08:00
xiez
bbb091659d Fixed recomend file in encrypt repo 2012-09-26 20:44:15 +08:00
killing
d30f7c4bbb Clean up shared repo listing code and add permission for public repos. 2012-09-26 19:20:21 +08:00
llj
2d5559c43f Merge branch 'lj_ui' 2012-09-26 16:54:02 +08:00
plt
63c9e8cd25 Fixed autocomplete bug 2012-09-26 15:40:19 +08:00
llj
895725b9fc add icon for repos;added op icon back in repo page;modified css of title-panel 2012-09-26 15:15:08 +08:00
llj
a447c03ae7 modified layout & ui of some pages 2012-09-25 20:49:58 +08:00
lins05
2960b68b26 show file last modifed time in repo_view_file 2012-09-25 16:51:00 +08:00
llj
dc60691e93 Merge branch 'lj_comment' 2012-09-25 11:25:56 +08:00
llj
7b2a7a614c [file_comment]fixed comment-input 'click' bug & modified its height 2012-09-25 10:48:26 +08:00
xiez
f90c82b59d Enable pingyin autocomplete in repo share 2012-09-24 17:20:08 +08:00
llj
dc98fea8e8 [pdfUseFlash]fixed 'file-op' hide bug 2012-09-24 16:35:53 +08:00
llj
89c3c71859 [pdfView]fixed 'open-local' bug;improved ui & ue 2012-09-24 15:32:20 +08:00
xiez
a8e6b269e9 Modify messages color and time 2012-09-24 10:54:44 +08:00
xiez
7f24c337c7 Change group label name 2012-09-24 10:10:01 +08:00
xiez
8fed1fa766 Change sync repo to download repo 2012-09-22 19:50:40 +08:00
xiez
db365fc35d Modify home page 2012-09-22 19:17:22 +08:00
xiez
b16b7ece18 Allow share repo to unjoined group 2012-09-22 17:46:56 +08:00
llj
393b43f157 Merge branch 'lj_history' 2012-09-22 11:55:02 +08:00
llj
a3e78bcfa4 [repo_view_file]modified file-view from file_revisions;clean code 2012-09-22 11:37:01 +08:00
lins05
797b72e756 view pdf in flash for ie 2012-09-22 10:20:04 +08:00
llj
b8079d6ea5 modified history_file_view, repo_history_view, file_revisions 2012-09-21 20:36:53 +08:00
xiez
25e18f7413 Modify pulic home and groups 2012-09-21 19:57:11 +08:00
llj
0d09cf744e [history]modified 'back' btn 2012-09-21 15:32:52 +08:00
llj
3e1fd75e9f [history]modified repo_history, repo_history_view;added repo_view_snapshot 2012-09-21 14:08:27 +08:00
killing
803780ea39 Add read/write permission to share. 
Also check permission in various operations.
 2012-09-21 11:38:05 +08:00
llj
01e6a61d02 [flash]make flash not show on top of popups and fixed buttons;show flash when 'open-local-feedback' popup shows 2012-09-20 16:45:51 +08:00
llj
61f04162cd [file-op]mv 'rename' back to popup 2012-09-20 14:29:02 +08:00
llj
876155cb12 Merge branch 'lj_fileview' 2012-09-20 11:58:53 +08:00
llj
d5d10c9405 [file-comment]click area outside file-comment and hide it 2012-09-20 11:55:19 +08:00
llj
83e430efdb [file_comment]show comments when enter file-view from link in grp msg 2012-09-20 10:45:09 +08:00
llj
09a78055db [file_comment]fixed bug 2012-09-19 21:01:59 +08:00
llj
9085a9e4dc [file_view]redesign comment feature;modified history_file_view 2012-09-19 20:42:55 +08:00
xiez
9c93e1a740 Clean business group add 2012-09-18 14:06:20 +08:00
plt
5d0fc681e8 Clean repo history 2012-09-18 13:15:05 +08:00
llj
1298ae7ab6 Merge branch 'lj_fileview' 2012-09-18 12:03:18 +08:00
plt
b6c0bff13b Show history button in file history view 2012-09-18 12:06:55 +08:00
llj
8d4611ff4e [file-view]modified commit-info align 2012-09-18 11:55:03 +08:00
plt
168a224c3f Add tooltip to file revision page 2012-09-18 11:53:26 +08:00
llj
8013094ed4 [repo]rm file 'revert' 2012-09-18 11:40:30 +08:00
plt
ed40718b99 Improve file revision page 2012-09-18 11:42:15 +08:00
xiez
00460468cb Add business groups 2012-09-18 10:43:50 +08:00
llj
ce04e5cb47 Merge branch 'lj_filehistory' 2012-09-18 10:40:32 +08:00
llj
8c5e1a5d81 Merge branch 'lj_fileview' 2012-09-18 10:32:35 +08:00
xiez
fd0dad1c7c Disable share encrypt repo to unregistered email. Move out repo decrypt form. 2012-09-17 19:14:22 +08:00
llj
67d950aff2 [file_view]modified commit_time class of view_history 2012-09-17 16:03:19 +08:00
llj
082de8ba3e [file_history]redesigned ui 2012-09-17 15:28:10 +08:00
llj
b005709194 [repo_history]redesigned ui 2012-09-17 14:30:36 +08:00
llj
181a028b8d Merge branch 'lj_fileview' 2012-09-17 13:06:43 +08:00
llj
b7a934c2c9 Merge branch 'lj_repo' 2012-09-17 13:01:35 +08:00
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