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

496 Commits

Author SHA1 Message Date
lins05
5545afe6d7 improve diff related code 2012-10-20 11:48:33 +08:00
plt
4bb5cb2582 Make color of msg relay buttons lighter 2012-10-20 10:41:38 +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
025a52bea4 Merge branch 'lj_perm' 2012-10-19 15:18:07 +08:00
llj
250696df71 [shareadmin-permission]improved ui & ue 2012-10-19 15:14:43 +08:00
plt
efffd71d19 Improve css of common info page 2012-10-19 10:35:56 +08:00
llj
fc2011c856 [shareadmin]added permission-set 2012-10-18 21:32:36 +08:00
zhengxie
faba380ebe Modify msg delete button 2012-10-18 13:22:38 +08:00
zhengxie
7429045c0f Added group msg remove feature 2012-10-18 10:57:54 +08:00
llj
8f5bfb0999 [file-view]added 'update', modified 'history' positon;[edit]modified md file-edit 2012-10-17 15:37:15 +08:00
llj
0c025c88a9 Merge branch 'lj_ie' 2012-10-17 14:31:51 +08:00
plt
e7dd1aede8 Change style of commit detail 2012-10-17 11:55:15 +08:00
llj
10eb056b4a modified btn for ie 7 2012-10-16 17:00:01 +08:00
llj
39a9870300 improved events for encrypted repo;added events for org[by ls & lj] 2012-10-15 21:03:42 +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
llj
be89036fcb Merge branch 'lj_group' 2012-10-10 18:20:19 +08:00
llj
4f67c85694 [group]added basic-info 2012-10-10 18:11:13 +08:00
llj
ece34c58fa [group]added avatar to msg-form 2012-10-10 17:09:39 +08:00
llj
e9a8a724e2 Merge branch 'lj' 2012-10-10 16:03:26 +08:00
zhengxie
d02200f67c Remove bulb tips 2012-10-10 16:01:48 +08:00
llj
338d5f0200 [info-bar]modified bg color 2012-10-10 15:58:58 +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
llj
3637ee4c4e [groups]modified right panel 2012-10-10 11:16:49 +08:00
plt
9786b32e39 Add info-item background 2012-10-09 22:16:38 +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
plt
a986bb5e8c Add min-height and margin to repo-tabs 2012-10-09 21:03:31 +08:00
plt
bd6db84cb8 Remove background color of info-item 2012-10-09 20:54:47 +08:00
llj
a3de77f55d [repos-tabs]modified css 2012-10-09 20:12:53 +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
killing
916184a54c Add file recycle view. 2012-10-09 14:41:21 +08:00
llj
e50022978a Merge branch 'events' 2012-09-29 17:18:21 +08:00
llj
1ee4ee8a1a [events]redesigned the ui 2012-09-29 17:17:00 +08:00
ZhengXie
75ac577fea Use ajax in group message autocomplete 2012-09-28 22:43:25 +08:00
llj
d628bc4371 [event]show events in myhome 2012-09-28 21:51:04 +08:00
lins05
80a84e097a remove flexpaper printer/logo button 2012-09-28 14:14:48 +08:00
llj
4efed862ee modified repo icons and added title to them 2012-09-27 19:15:55 +08:00
xiez
91d3d78dda Add group public page 2012-09-26 20:04:34 +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
58efc80107 Merge branch 'commit-link' 2012-09-26 19:03:56 +08:00
llj
3f0b56bbd4 [lsch]modified style of links in commit-detail 2012-09-26 19:02:48 +08:00
llj
d29cd43e12 modified css of left/right panel 2012-09-26 16:52:29 +08:00
plt
90ddf87af3 Modify icons 2012-09-26 15:45:50 +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
bac82d56c8 add link to commit details 2012-09-25 20:07:46 +08:00
plt
384e59e037 Change icons for creating folder and creating file 2012-09-25 17:45:30 +08:00
llj
dc60691e93 Merge branch 'lj_comment' 2012-09-25 11:25:56 +08:00
plt
091958b82b Modify h3 color 2012-09-25 11:31:41 +08:00
plt
6f6d07df27 Change h2 h3 color to #222, and change default color to #333
Also modify default file icon
2012-09-25 11:22:18 +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
plt
9d73596fd3 Improve css of left panel border 2012-09-24 17:02:13 +08:00
xiez
2a4ac3a601 Modify groups page 2012-09-24 16:30:23 +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
plt
07378acef1 Change icons 2012-09-22 20:47:13 +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
llj
0d09cf744e [history]modified 'back' btn 2012-09-21 15:32:52 +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
9f943b1c4c [file_comment]limit width of textarea when drag 2012-09-19 21:10:41 +08:00
llj
9085a9e4dc [file_view]redesign comment feature;modified history_file_view 2012-09-19 20:42:55 +08:00
plt
168a224c3f Add tooltip to file revision page 2012-09-18 11:53:26 +08:00
llj
dcc65b7fe8 [msg-reply]changed textarea into input 2012-09-17 16:36:49 +08:00
llj
b005709194 [repo_history]redesigned ui 2012-09-17 14:30:36 +08:00
llj
aeb85878ec [repo_view_file]modified contributors 2012-09-17 12:57:29 +08:00
xiez
fa447e729f Fixed sending file shared link bug 2012-09-15 21:17:32 +08:00
llj
15bb2ce923 [repo, repo_history]redesign ui 2012-09-15 21:01:06 +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
bf445f0a0a use libreoffice pdf convertor 2012-09-13 14:01:32 +08:00
plt
d4ea5ad792 Remove topbar shadow 2012-09-11 14:13:01 +08:00
llj
b83b1cd955 [topbar]modified css 2012-09-11 13:50:17 +08:00
plt
14ec9ea811 Change top bar color 2012-09-11 13:28:43 +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
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
llj
ba7d40e2be Merge branch 'lj_public' 2012-09-06 10:50:27 +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
xiez
22ee4fe65a Added button to click into group in repo page 2012-09-03 20:54:51 +08:00
llj
9585896c3a [file-edit]modified ace.js 2012-09-03 11:31:32 +08:00
llj
7ef0f4cacb Merge branch 'lj_ie' 2012-09-01 14:47:53 +08:00
llj
0c0da9f7b4 Merge branch 'lj_reply' 2012-09-01 14:44:17 +08:00
plt
92a8cf3a2a Add missing favicon 2012-09-01 11:49:45 +08:00
llj
bd52f4d48b [@]format str before giving it to ele_cp 2012-08-31 20:48:56 +08:00
llj
916392c566 [ie_textarea]rm default vertical scrollbar 2012-08-31 17:02:41 +08:00
llj
9ef3d6158f modified msg-reply;modified atAutocomplete member_list js 2012-08-31 16:12:41 +08:00
llj
198291da6c improved autocomplete 2012-08-31 12:05:45 +08:00
llj
c0453c15c4 [@]fix menu position bug (when ele is at the bottom of the window) 2012-08-30 20:54:53 +08:00
llj
06abb7c96f [@]modified menu styles; modified myhome share 2012-08-30 11:44:51 +08:00
llj
01bd71713e [@]improved menu position 2012-08-30 11:44:51 +08:00
llj
cac0727eaa [@]make simpler 2012-08-30 11:44:50 +08:00
llj
9bd6c2b580 [@xxx]improved addAtAutocomplete 2012-08-30 11:44:50 +08:00
plt
5e31f5030e Change favicon 2012-08-29 13:51:32 +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
3953525f6c Merge branch 'lj_edit' 2012-08-25 11:53:18 +08:00
llj
d91f830983 [md-view]added min-height 2012-08-25 10:57:08 +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
a304faf3ca [editor]modified css for ie 8 2012-08-24 11:53:15 +08:00
llj
c314b37611 [file-edit]modified ace.js for ie 2012-08-23 20:47:36 +08:00
llj
3272e8bde2 [file-upload]fix double progress bar problem for ie 2012-08-23 18:00:12 +08:00
plt
3b20215e3f Change font-size of article backto 14px 2012-08-23 15:47:11 +08:00
plt
3cb29d1b8d Change padding of article 2012-08-23 15:41:53 +08:00
plt
6512b9eef8 Improve css of article 2012-08-23 15:37:36 +08:00
llj
898ef791e4 [css]clean up 2012-08-21 16:08:41 +08:00
plt
4bb3daea44 Improve css of pre in article 2012-08-21 15:08:06 +08:00
llj
81c88a323e [file_edit]modified css 2012-08-21 10:47:53 +08:00
llj
c327682f74 [md]added styles for table 2012-08-21 10:34:40 +08:00
xiez
1107f7035b Add pinyin autocomplete in group message 2012-08-20 16:51:23 +08:00
xiez
a88af0b3a8 Fix autocomplete bug 2012-08-19 14:17:04 +08:00
plt
9f4820c578 Merge branch 'lj_infobar' 2012-08-19 13:44:04 +08:00
plt
c62a4bc7b1 Improve css of article 2012-08-19 13:43:17 +08:00
xiez
12b63f3e7a Add basic autocomplete for @ 2012-08-19 13:37:10 +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
plt
f7de4efa07 Change font color of table content to #333 2012-08-18 15:57:09 +08:00
plt
c5957b87e7 Set color of header to #333 in article 2012-08-18 15:48:29 +08:00
llj
4a1fd76a2c modified styles of md file;modified file edit 2012-08-18 15:34:38 +08:00
llj
bb59f76067 [md]modified css 2012-08-18 11:51:44 +08:00
plt
fa04027ac9 Merge branch 'lj2' into lj_infobar 2012-08-17 16:00:44 +08:00
llj
a7e617b5c6 modified css for info-bar 2012-08-17 15:22:09 +08:00
llj
59589db5e7 [msg-reply]set cursor position of reply-input;improved reply js 2012-08-17 14:56:59 +08:00
plt
5a8df42227 Enlarge the font size of bottom bar 2012-08-15 16:20:57 +08:00
llj
ab2915c13f modified recommend 2012-08-15 14:57:14 +08:00
llj
432c2473cc modified msg-reply 2012-08-15 10:29:34 +08:00
plt
b4eb13d6e0 Modify font size of recommend msg 2012-08-13 22:53:16 +08:00
llj
9b8d4b770f improved 'messages' 2012-08-13 17:41:25 +08:00
llj
e89f2ff67a modified recommend 2012-08-13 16:30:21 +08:00
llj
16c71fdfd8 [add-new-file]modified icon 2012-08-13 16:30:21 +08:00
llj
d2c32ce2f8 modified add-new-file 2012-08-13 16:30:21 +08:00
llj
4d4534c4bf fix merge bug (css) 2012-08-13 11:35:11 +08:00
xiez
01b355a0f6 Merge branch 'recommend'
Conflicts:
	media/css/seahub.css
	views.py
2012-08-13 10:46:07 +08:00
llj
cd016ffdf6 modified file-view ui 2012-08-11 20:00:20 +08:00
xiez
bfefa7df70 Add basic recommend feature 2012-08-10 21:17:28 +08:00
llj
09d42ff13c modified msg-reply, msg 2012-08-10 16:31:39 +08:00
lins05
347fdd6ca8 merge file_edit_post;modified file_edit 2012-08-09 20:45:30 +08:00
llj
0ca7e6f8b0 added style to <blockquote> in markdown file view 2012-08-09 20:45:30 +08:00
llj
cfca229770 modified style of bottom-bar button 2012-08-09 20:45:29 +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
ae1dbd49bd added func: source file edit 2012-08-09 20:45:29 +08:00
llj
048274d24d modified top-bar 2012-08-03 21:23:57 +08:00
llj
d1a37121de modified style of top-bar 2012-08-03 17:24:26 +08:00
llj
c04900d3de modified source code view for ie8 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
llj
894b05f6d6 [edit_contact]change from a page to a popup in contact_list 2012-08-03 17:24:25 +08:00
xiez
bde88e09b6 Modify group 2012-08-03 11:33:23 +08:00
llj
9ae6fa9653 added 'reminding';modified team-account, new_msg_reply, group_info 2012-08-01 17:54:08 +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
3467b9cf00 modified font-family of source code file 2012-08-01 13:54:54 +08:00
llj
bdb40766c4 added syntax highlighting for source code file 2012-08-01 13:54:53 +08:00
xiez
0084b1217e Refactor contacts app. 2012-07-30 19:47:11 +08:00
plt
932dc76bde Add 1px to height of topbar 2012-07-28 20:36:26 +08:00
plt
97310eb2c6 Modify css of markdown-view 2012-07-28 20:33:39 +08:00
plt
f70361c8e8 Merge branch 'lj' 2012-07-28 20:23:07 +08:00
llj
c987b16d3f modified css 2012-07-28 15:25:08 +08:00
xiez
b1ea10088a Add org user added notification 2012-07-27 23:37:48 +08:00
llj
c39665081a [top-bar]:added 'team-account';modified style of <a> 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
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
plt
a9129c9e1f Find '@<name>' in group messages 2012-07-24 14:00:27 +08:00
llj
65a1b667dd improved ui of group avatar;added link to user avatar 2012-07-23 17:36:07 +08:00
llj
9d1b1a63d9 improved pdf view: enable l10n 2012-07-23 16:56:31 +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
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
plt
bf609eaea9 Remvoe top border line of table 2012-07-20 13:06:21 +08:00
plt
e225990583 Add table bottom margin 2012-07-20 13:02:14 +08:00
plt
b7bfd139cb Modify color of links in footer 2012-07-20 12:59:50 +08:00
llj
49cddd47d2 [myhome]modified repo-create btn and other modification 2012-07-20 10:53:20 +08:00
llj
a01514e795 modified ui of avatar_modify, file_upload/update 2012-07-19 15:18:12 +08:00
llj
4e304835c8 modified style of narrow-panel, simplemodal popup, and input 2012-07-19 14:47:31 +08:00
llj
368bace9dd modified width of repo-create popup 2012-07-19 14:06:19 +08:00
llj
2d3406ec8a modified width of repo-create 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
0b37e40cbc improved ajax POST 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