haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-22 16:56:57 +00:00
Code Issues Releases Wiki Activity
12,389 Commits 140 Branches 456 Tags 2.7 GiB
625116cccb
Commit Graph

1280 Commits

Author SHA1 Message Date
llj
a32ae19a4b [repo setting] modified 'folder perm' 2015-06-17 13:33:40 +08:00
llj
43d020a0a4 modification 2015-06-16 17:38:09 +08:00
llj
e69b93a1c5 add missing css file 2015-06-16 17:25:22 +08:00
llj
9b903cbaf2 [repo perm] 'perm add': modification, bugfix, improvement 2015-06-15 18:37:55 +08:00
llj
ee816216ea add 'top tip' for IE 2015-06-05 17:49:09 +08:00
llj
a66d22d363 [search result] modified UI 2015-05-29 11:05:33 +08:00
xiez
d2a075df68 Merge pull request #620 from haiwen/add_org_lib 
[org view] modified 'add library'
 2015-05-28 17:43:19 +08:00
lian
b48d9844a8 [search-result] add highlight-content class 2015-05-28 17:33:59 +08:00
lian
df817c0529 [search-result] update search result css and add 128 pixel file icon 2015-05-28 15:50:28 +08:00
llj
cb4e0d7493 [org view] modified 'add library' 2015-05-28 13:57:00 +08:00
llj
be238d44c4 [share] bugfix for 'download link' 2015-05-27 15:10:50 +08:00
zhengxie
51ade2d834 Update styles of share popup 2015-05-26 14:36:31 +08:00
lian
903b29aea4 add public repo 2015-05-14 11:28:12 +08:00
llj
2dc00204df enable 'show error' for 'fetch libs' 
Conflicts:
	static/scripts/app/views/group.js
	static/scripts/app/views/myhome-repos.js
	static/scripts/app/views/myhome-shared-repos.js
	static/scripts/app/views/organization.js
 2015-05-12 16:56:24 +08:00
llj
210fee97c5 modification for long lib/dir/file name 2015-05-09 15:04:16 +08:00
zhengxie
60b2a4b2bf Merge branch '4.1' 2015-05-08 10:38:44 +08:00
llj
ea355f0327 [dir view] bugfix for '#upload-menu' ui 2015-05-05 17:29:31 +08:00
llj
b2e5db1153 [select2] modified styles of 'input' 2015-05-05 12:02:51 +08:00
llj
7051aeb55d [file view] fix ui bug for pdf/doc/image files 2015-05-04 17:37:16 +08:00
llj
2c6994c56a [folder perm] modified 'user perm' 2015-04-28 17:18:24 +08:00
zhengxie
ab2b49a236 Moved select2.png 2015-04-27 17:50:00 +08:00
llj
c01969c7ed [folder perm] rewrote it 2015-04-25 14:28:09 +08:00
lian
1721a5821d [dirent-view] add/modify/remove user/group folder perm 2015-04-23 10:18:50 +08:00
llj
f53c178e95 [side nav] improvement 2015-04-22 15:31:52 +08:00
lian
66e938868a enable/disable personal wiki 2015-04-22 15:31:51 +08:00
zhengxie
c709eab594 Use django compressor to compress css 2015-04-22 15:31:48 +08:00
llj
8d45b64511 [dir view] use magnificPopup for img view 2015-04-22 15:31:47 +08:00
llj
62fe930d3a [libs] modified ui of 'lib list' & 'lib create' 
* removed 'description', added 'size'
 2015-04-22 15:31:46 +08:00
llj
c4dabb0220 [lib decrypt] modified form UI & used popup 2015-04-22 15:31:45 +08:00
llj
1b306dac28 [ui] modified ui details of 'share popup' & 'dir view' 2015-04-22 15:31:45 +08:00
llj
51d1e0a420 [dir view] modified UI of dirent hidden-op 2015-04-22 15:31:41 +08:00
llj
33de4b3c6f [lib view] modified UI of 'dirent-op' 2015-04-22 15:31:41 +08:00
lian
6aecc53750 new dir/file icon 2015-04-22 15:31:41 +08:00
llj
4c0f263cca [share] added lib/dir/file share 2015-04-22 15:31:40 +08:00
lian
b10d518ae2 show popup 2015-04-22 15:31:40 +08:00
lian
aaaaedd181 new cp/mv/del icon 2015-04-22 15:31:39 +08:00
lian
273872a91b update repo setting/trash/history 
1. hide setting-icon if is not repo owner
2. hide trash-icon if user-perm is 'r'
 2015-04-22 15:31:39 +08:00
lian
a3b1eff49a show setting/trash/history icon 2015-04-22 15:31:39 +08:00
Daniel Pan
1e3a18f6c9 [backbone] Remove path bar from repo list page 2015-04-22 15:31:37 +08:00
Daniel Pan
f5710ac77a [backbone] Add path bar to repo list page 2015-04-22 15:31:36 +08:00
llj
02ec7cfc94 [myhome lib] modified css, modified 'repo-file-list-topbar' UI 2015-04-22 15:31:36 +08:00
Daniel Pan
254357c3f1 [backbone] Merge lj's work 2015-04-22 15:31:32 +08:00
zhengxie
700dc2bf1d tmp mod 2015-04-22 15:29:47 +08:00
llj
6aee6b5578 [file view] modified ui 2015-04-15 16:51:18 +08:00
llj
0f3d73e346 [file view] modified 'file view area' height 2015-04-15 14:37:53 +08:00
lian
7b51afe600 [sysadmin-log] Show file-audit/update & permission log 2015-03-25 13:36:24 +08:00
lian
d1fb67c78f [repo-setting] Set folder perm 2015-01-21 11:14:34 +08:00
llj
287bb0bc80 [fileupload] modified fileupload, file-update, shared_upload_link 2014-12-17 12:04:31 +08:00
llj
b22f92fe1d [fileupload] updated plugin files, enabled 'folder drag & drop', added improvement 2014-12-17 12:04:31 +08:00
lian
c8cde80e7d [preview] Show image file's preview 
Conflicts:
	seahub/views/repo.py
 2014-12-09 15:19:59 +08:00
lian
95a3123354 [thumbnail] Show image file's thumbnail 
Conflicts:
	seahub/views/ajax.py
	seahub/views/repo.py
 2014-12-09 15:19:59 +08:00
llj
d2d7c72e99 [fileupload] redesigned 'add folder' 2014-12-03 11:28:56 +08:00
llj
c754f19f34 [fileupload] redesigned it. 2014-11-14 11:51:11 +08:00
llj
e1e5e885a5 [repo] use icons for dirent download & share. 2014-10-28 17:51:48 +08:00
llj
6756b48c14 use new ellipsis for group names in top-grp-list-popup & group homepage 2014-10-24 19:01:47 +08:00
llj
34c8299854 improved popup triangles UI 2014-10-22 15:13:00 +08:00
llj
f970ac5bb4 [header] added 'triangle' to popups 2014-10-21 15:05:05 +08:00
llj
a38fcffd34 [top nav] use 'hover' instead of 'click' to show group-list popup 2014-10-21 15:05:05 +08:00
llj
a0abb77adf modified UI of 'back to library' on some pages 2014-10-21 14:59:46 +08:00
llj
444706347e added 'left-right-tabs' ui widget, and used it on file/dir share popup 2014-09-25 16:39:14 +08:00
llj
da8fb66a05 [multi-tenancy] added icon for org, modified style for 'org url' in org_register 2014-08-30 14:54:46 +08:00
zhengxie
fb10e7d000 Merge branch '3.1' 2014-08-27 17:15:10 +08:00
zhengxie
2eb8b9ea82 Update org register and pubuser paginator 2014-08-26 15:25:33 +08:00
llj
327a6675b9 [notice] msg reply: improved ui & truncation of msg 2014-08-25 18:01:59 +08:00
llj
7f1a3d93e6 [notice] add 'topic' to grp-msg-reply: improved code & ui 2014-08-25 18:01:59 +08:00
lian
f6552ff297 [notice-popup] add simple group discussion topic to grpmsg-reply notification 2014-08-25 18:01:59 +08:00
llj
6d98462a5e [signup, passwd change] redesigned passwd tip, improved code; [file view] added tip for sidebar 2014-08-05 17:13:51 +08:00
zhengxie
79a043db60 Merge branch 'password' 2014-07-29 17:32:04 +08:00
llj
26f97371a1 [file view] added 'back to top' 2014-07-29 17:21:17 +08:00
llj
c8cf757191 [passwd strength] improved passwd tip & strength display, removed 'show passwd', fixed bugs 2014-07-29 11:26:41 +08:00
llj
790065b19c [file view] redesigned it; [repo] open file in new window 2014-07-17 13:56:36 +08:00
zhengxie
33732da277 Merge branch 'user-role' 2014-07-15 17:45:58 +08:00
llj
8ab9e72a96 [notice page] redesigned it 2014-07-14 16:34:54 +08:00
llj
11ec432f84 [user role] bugfix and improvement 2014-07-09 17:51:07 +08:00
imwhatiam
1683a73e4e [user-role] Select role when add a user / change role at user admin page; 
Limit guest user's operation: can not create group and library.
 2014-07-07 16:05:14 +08:00
llj
2849a13251 [share link] add passwd & expiration: improved ui & interaction 2014-07-04 17:40:07 +08:00
llj
e18f7cbb41 added notification popup and custom scrollbar 2014-06-18 10:21:42 +08:00
imwhatiam
81a4c5c3bf [shared-link-email] add extra message and show file/dir name at email body 2014-06-10 13:53:05 +08:00
zhengxie
d5f1c76146 Merge branch '3.0' 2014-05-23 13:38:07 +08:00
llj
1a5f051a0e highlight keywords in 'search result' and 'file view' page; bug fix for pdf view 2014-05-19 11:15:24 +08:00
llj
e026d486dc [dir share popup] fixed ui problem for languages with long words 2014-05-09 11:56:13 +08:00
llj
053d37f157 [activity] rewrote the ui 2014-05-07 18:10:53 +08:00
zhengxie
668c68132e Merge branch '3.0' 
Conflicts:
	seahub/templates/snippets/events_js.html
	seahub/urls.py
	seahub/views/__init__.py
	seahub/views/ajax.py
 2014-05-07 17:52:34 +08:00
llj
5ea7cb52ed [all_msg_list] msg form: fixed contact avatar ui bug 2014-04-25 13:47:58 +08:00
llj
eac1d8af9b [multi-tenancy] modified 'choose_register' 2014-04-22 17:16:13 +08:00
llj
29056488ae [top info-bar] modified ui 2014-04-17 11:34:09 +08:00
llj
8b56620a53 [doc/pdf view] improved outline hide/show toolbar 2014-04-16 17:13:27 +08:00
llj
cb8354fbb8 [help] improved help-con hd ui 2014-04-15 16:38:23 +08:00
llj
5e46b79dd6 improved 'msg send' in all_msg_list page; disable 'selected files by selecting a dir' in jstree 2014-04-14 16:40:13 +08:00
llj
6f0c5b97f4 modified wiki-index ui 2014-04-12 17:22:04 +08:00
llj
640b1d8529 modified css for ipad; modified file-view-tip: center the content and added 'download' 2014-04-12 16:57:16 +08:00
llj
579b7cdd85 [details] modified discussion/msg form btns ui, jstree lib icon, repo dirents sort icon, wiki-index ui 2014-04-12 16:53:48 +08:00
llj
4feccc18b7 [wiki index] improved ui 2014-04-10 15:59:03 +08:00
llj
f8092b7e59 [base.html] use seahub.min.css, update timestamp 2014-04-10 12:44:39 +08:00
llj
555d1d6099 [discuss/msg] add-file: make img icons brighter when hover on them 2014-04-09 18:30:45 +08:00
llj
a394705024 [font awesome] added missing css styles 2014-04-09 17:41:47 +08:00
llj
9e882b84c0 [repo] modified file/dir mv/cp: show progress, add 'cancel' func 2014-04-09 17:18:54 +08:00
llj
13a54d1e6e [lib setting] added 'back to lib' & modified input width 2014-04-01 17:55:06 +08:00
llj
cdb0cf300e [sysadmin] added 'go-back' for user-info page 2014-04-01 15:13:07 +08:00
llj
bd283fd3fb [msg/discuss] modified details 2014-04-01 11:18:59 +08:00
llj
bf101ec8d6 [discuss, msg] modified ui of discussion/msg, improved 'add file' 2014-04-01 10:40:13 +08:00
llj
de580f515d [grp discuss] add 'add files' func 2014-03-31 16:01:15 +08:00
llj
dc45cc963f use seahub.min.css; small bug fix and improvement for org 2014-03-27 18:30:06 +08:00
llj
8526a7f688 [table] modified css for 'op-icon', improved ui 2014-03-27 15:37:58 +08:00
llj
0cd855af8d [device management] improvement 2014-03-27 12:11:17 +08:00
llj
6a4f2666f8 [jstree] only show checkbox for files in file-choose-popup 2014-03-20 10:49:26 +08:00
llj
8693c5cc7a [activity,notice] modified ui of 'more' 2014-03-18 14:41:59 +08:00
llj
3f87bae4e7 [pdf2html] improved toolbar 2014-03-17 19:53:40 +08:00
llj
43066de6ac optimized images, used seahub.min.css, updated timestamp for static files 2014-03-11 17:16:41 +08:00
llj
2a922e95ac improved top-grp-popup; fixed image missing bug in grp-list page 2014-03-11 13:48:42 +08:00
llj
44fa487956 [jstree] compressed and added jstree.js to jq.min.js 2014-03-10 14:27:15 +08:00
llj
6aa1c3c215 [optimization] cleaned up css, combined css files, use css sprite; cleaned up js 2014-03-07 11:31:48 +08:00
llj
fbda6112da modified css for wiki-index-con, show 8 grps in top-grp-popup, modified grp name shown length 2014-02-28 20:27:27 +08:00
llj
c88087f334 fixed 'bg img blurry' bug for IE 11 2014-02-28 17:53:45 +08:00
llj
c54a719d4e modification for IE 2014-02-27 18:06:44 +08:00
llj
c0ddc43e28 improved details 2014-02-27 15:26:08 +08:00
llj
7effd00162 [traffic admin] improved ui 2014-02-27 12:01:25 +08:00
llj
3fd69efde1 [org, grp] improved ui for user-list 2014-02-26 17:08:25 +08:00
llj
8b220fd1d8 changed 'folder' icon; modified css for 'search' 2014-02-26 17:08:25 +08:00
llj
584738e1e1 [wiki] modified wiki nav ui 2014-02-26 17:08:25 +08:00
llj
69cc8f2e49 modified 'add' icon, grp public icon & 'quit', sysadmin user/lib search 2014-02-26 17:08:25 +08:00
llj
7c6a45dd0b improved bottom_bar 2014-02-26 17:08:25 +08:00
llj
e811427ed7 modified ui for right-panel hd nav, share popup, grp admin 2014-02-26 17:08:25 +08:00
llj
c98f09dd00 [repo] fixed 'details' bug; modified bottom_bar ui 2014-02-26 17:08:25 +08:00
llj
f61ec323ae [repo] modified ui details 2014-02-26 17:08:25 +08:00
llj
686cb0a200 [repo] redesigned ui, mainly 'repo-top' 2014-02-26 17:08:24 +08:00
llj
63c6fc0b5b modified 'font-size' of new-narrow-panel; modified ui of tabnav (sysadmin etc) 2014-02-26 17:08:24 +08:00
llj
60d1549d4f improved ui: wiki-nav, tabnav, personal-msg-panel 2014-02-26 17:08:24 +08:00
llj
01c39f851c modified ui of panels like login 2014-02-26 17:08:24 +08:00
llj
0a30a76fba modified login/register/passwd change&reset ui; modified checkbox ui 2014-02-26 17:08:24 +08:00
llj
e65b05cae1 [top nav] improved grp info popup 2014-02-26 17:08:24 +08:00
llj
27e6008950 modified ui of checkbox 2014-02-26 17:08:24 +08:00
llj
61b83efb4a modified ui of button 2014-02-26 17:08:24 +08:00
llj
1d169bb90a improved side nav for sysadmin & grp 2014-02-26 17:08:24 +08:00
llj
f222201d60 modified ui of wiki-index hd 2014-02-26 17:08:24 +08:00
llj
86830cdf4b improved ui 2014-02-26 17:01:04 +08:00
llj
addae79c1d improved ui, deleted sf_font2 2014-02-26 17:01:04 +08:00
llj
4dfddf6150 improved user-info-popup & top-nav-grp-info popup 2014-02-26 17:01:03 +08:00
llj
b3599c7ff5 redesigned right-panel hd, modified side-nav, top-grp-info-popup, <th> ... 2014-02-26 17:01:03 +08:00
llj
652f1d8a8f added top-info-popup for 'group' in top nav 2014-02-26 17:01:03 +08:00
llj
fd633e6e21 [group list] redesigned it 2014-02-26 17:01:03 +08:00
llj
6f42d7b061 [group, organization] redesigned the side nav 2014-02-26 17:01:03 +08:00
llj
a223fb5187 [home] redesigned side-nav. rm border-top of header 2014-02-26 17:01:03 +08:00
llj
6be90e8b68 [side nav] modified icons 2014-02-26 17:01:03 +08:00
llj
0a13c6484b redesigned top nav 2014-02-26 17:01:03 +08:00
llj
7c21e8b70d [file upload] modified icon ui for 'add files' 2014-02-20 16:37:49 +08:00
llj
0b323bc6e1 [wiki index edit] modified ui 2014-02-12 18:07:50 +08:00
llj
c37e8a8a81 modified css for link in info-bar 2014-02-11 10:31:06 +08:00
llj
cb1530a0d7 [excel view] improved ui 2014-01-23 12:29:06 +08:00
lins05
378faa9594 improve preview of excel files 2014-01-23 12:29:06 +08:00
llj
5e5f083b63 [shared dir view] modified ui for 'zip', fixed 'download' hover bug 2014-01-21 18:48:44 +08:00
llj
56db61b6af [grp pubfile] modified css for file download 2014-01-20 15:24:15 +08:00
llj
47e55d8373 [wiki improve] index: show tip & create btn when no index; improved img ui 2014-01-17 17:47:36 +08:00
llj
7dc74e8ccb [wiki index] improved ui 2014-01-17 17:47:36 +08:00
llj
a33a971bed [wiki] improvement & bug fix for header links, index, & creating wiki by choosing a lib 2014-01-17 17:47:36 +08:00
swpd
8cfd795ef3 Squashed commit of the following: 
commit 1e791a50186ae10df65cf2f72b723f85301bf36a
Author: swpd <swpdtz@gmail.com>
Date:   Mon Dec 23 21:29:42 2013 +0800

    [group] allow staff to choose an existing group library to be used as group wiki

commit 23a3bc6ee4e95997ea402076d01980661a6aa2f4
Author: swpd <swpdtz@gmail.com>
Date:   Mon Dec 23 13:59:58 2013 +0800

    [wiki] allow user to choose an existing personal library to be used as personal wiki

commit fa3df2cf76b79a0593bb1eda2b413774c63b2676
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 22 02:39:20 2013 +0800

    [wiki] generate within-page anchors for h1 and h2 tags automatically

commit 034a75626f825186a48b398e231f73185a54635c
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 15 16:40:42 2013 +0800

    [group] allow group user to create wiki hierarchy index

commit 590b5c1488573d83eab636b0747d4f64d5f9d589
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 15 16:23:46 2013 +0800

    [wiki] allow user to create personal wiki hierarchy index
 2014-01-17 17:47:36 +08:00
llj
195e4ab447 fixed bug for op-confirm popup like repo-del 2014-01-06 15:21:30 +08:00
llj
8a62f61fe7 [details improvment] topbar: user info; grp: new discussion add, 'quit' 2013-12-20 18:07:45 +08:00
llj
341a0140d6 [sysadmin] redesigned user_info page; changed 'Nickname' to 'Name' 2013-12-20 16:18:44 +08:00
llj
6c241b5b13 [notification] improved 'info-bar' ui, rewrote 'notification_add' 2013-12-20 14:18:27 +08:00
llj
6b6512b54d [grp list] improved link icons ui 2013-12-20 13:21:10 +08:00
llj
575267c834 [profile] redesigned user_profile page, improved set_profile 2013-12-19 19:24:10 +08:00
llj
649fd02173 added 'help' app 2013-12-19 14:12:28 +08:00
llj
fc0ce8ec14 [footer] modification , and use 'include' 2013-12-19 14:12:28 +08:00
llj
b52c9a939d modified lib icon 2013-12-19 13:54:58 +08:00
llj
d4b91e4a9a [grp list] show 'lib/wiki/..' links when hover; modified grp avatar size setting 2013-12-18 14:30:35 +08:00
llj
8c806a2a1e [group list] added 'lib/discuss/wiki' links, improved code 2013-12-18 14:30:35 +08:00
llj
0940671e42 [grp list] modified avatar style 2013-12-18 14:30:34 +08:00
llj
a94aa36efb made grp avatars round; modified tab text in file/dir share popup 2013-12-16 18:12:42 +08:00
llj
9b8a9096d7 improved ui of <input>, fixed 'grp avatar change' bug 2013-12-13 16:47:28 +08:00
llj
882caad65d [details improvments] login ui, 'new guide' text 2013-12-13 13:40:18 +08:00
llj
302f92e34e modified logo 2013-12-12 15:03:10 +08:00
llj
1d7e6cad2c [topbar] modified 'system admin', rm 'workspace' 2013-12-11 16:29:33 +08:00
llj
22680870c8 [redesign] modified topbar, top nav, use side nav 2013-12-10 12:30:41 +08:00
zhengxie
89009eabf4 Added notices more 2013-12-05 19:47:09 +08:00
llj
44b656d05f [msg] move 'send msg' from topbar to all_msg_list page 2013-11-25 18:46:06 +08:00
llj
252925eb84 [sub-lib] modified text in setting page & sync popup, fixed del bug; modified style of settings page 2013-11-19 17:41:08 +08:00
llj
83f705adc0 [clients] don't show repo name repeatedly; rewrite 'unsync'; modified text 2013-11-15 17:57:28 +08:00
llj
47cf0c6de7 [shared upload link] bug fix and improvement; [dir priv share] improved 2013-11-14 16:31:40 +08:00
llj
cab5c49735 [new feature, by swpd] allow user to share upload link 2013-11-14 16:31:40 +08:00
llj
266dcf1ac2 [repo] fixed 'window-scroll tremble' bug; fixed 'box-shadow' bug for some browsers 2013-11-11 20:09:55 +08:00
llj
59dc5e3d27 [login CAPTCHA] improved ui, added 'ajax refresh' func 2013-11-11 11:53:52 +08:00
llj
49d95cb073 'enc repo setting' improvement; rm 'new-file', file link for enc repo in client_crypto mode 2013-11-07 15:56:42 +08:00
zhengxie
089869d8a0 Added option for user to choose server/client encryption 2013-11-07 10:53:05 +08:00
llj
a8348b476c clean up code & rm unused files 
Conflicts:

	seahub/templates/repo.html
	seahub/templates/snippets/repo_create_form.html
 2013-11-06 12:05:18 +08:00
llj
2c38cf9364 clean up and improved code for 'tabs'; clean up css 2013-11-06 11:56:30 +08:00
llj
d4fab4cab4 [grp member/admin add] enable 'select contacts', improved ui & code 2013-10-29 14:27:33 +08:00
zhengxie
6b9863f14c [sysadmin] Enable admin to activate/inactivate a user 2013-10-15 17:49:50 +08:00
llj
4058f05a41 [admin] lib/user search: modified ui & clean up the code 2013-10-14 15:01:02 +08:00
llj
27bd64af0d [lib settings] improved ui, interaction, fixed bug; modified 'enable modules' icon 2013-10-12 17:10:54 +08:00
llj
ba7c9dd1f8 [profile] modified ui 2013-10-12 15:25:14 +08:00
poetwang
f285a6b7a3 [api2]Set color of events page to 0xffffff 2013-10-12 14:51:13 +08:00
llj
bd71a756a9 [enable module] improved ui, fixed bug for wiki 2013-10-12 13:49:02 +08:00
llj
ff7f481386 [seaf edit] added 'removeformat', improved 'fontsize' 2013-10-08 16:43:37 +08:00
zhengxie
b790f7b3d3 Modified sys list orphan repos 2013-09-28 16:50:34 +08:00
zhengxie
f3b23ee9f6 Merge branch '1.9' 2013-09-27 10:54:47 +08:00
zhengxie
afed88311d Added repo search 2013-09-25 17:52:31 +08:00
zhengxie
b4d187ad4a Added module configuration for personal wiki and group wiki 2013-09-25 17:52:31 +08:00
zhengxie
9219d9fd34 [sysadmin] Search user 2013-09-25 17:51:03 +08:00
plt
3321fd668d Add seacloud home page 2013-09-25 14:48:52 +08:00
llj
aad993163e [repo] added feature 'select multi dirents, and del/mv/cp' and fixed sort bug 2013-08-30 13:47:57 +08:00
llj
251cc64005 [repo] added 'more' for dirents view 2013-08-20 18:30:17 +08:00
llj
af0d89743d [sub-lib] divided into 'sync' & 'syncable share' 2013-08-12 15:49:51 +08:00
llj
3c7030180d modified style of wiki img 2013-08-07 18:04:12 +08:00
llj
2b0c10aed5 modified max-width of wiki img 2013-08-05 14:49:42 +08:00
llj
78f177ddc1 add tips for file upload, fixed upload popup 'overflow' bug for ie 2013-08-02 14:56:21 +08:00
llj
08f7063e32 [file upload] improved ui/interaction, rm unused files 2013-08-01 11:55:46 +08:00
zhengxie
1fa15b9840 Rewrite file upload 2013-08-01 11:55:46 +08:00
llj
e1f4371277 [repo] fixed bug for long dirent name 
long dirent name could make the table layout ugly
 2013-07-28 22:44:34 +08:00
llj
6c08760a8a redesigned shares/private shares, modified wiki img style, updated md extra.js to fix '$' bug 2013-07-23 19:40:05 +08:00
llj
114866ca8f improved 'share link' for repo/file-view, fixed 'star' bug for file-view 2013-07-23 18:56:52 +08:00
llj
81b29f9457 [repo] improved priv-share, modified gen-share-link and etc. 2013-07-20 16:44:51 +08:00
llj
ab7e9f2589 [repo] redesigned ui/interaction, refactored funcs, fixed bugs 2013-07-20 15:15:41 +08:00
llj
bbe70db7f9 [api2 discussions] improved ui detail 2013-07-20 14:55:41 +08:00
llj
8c598ddc7c [repo] improved 'file share' popup 2013-07-20 14:55:41 +08:00
zhengxie
96dbf73161 Fixed fileshare popup style 2013-07-20 14:55:41 +08:00
llj
02924f0b8c [api2] events/discussion: improved 'loading' & fixed bug 2013-07-20 14:55:41 +08:00
llj
3f7bd2257b fixed activity 'more' bug; finished getting 'more' discussions with ajax 2013-07-20 14:55:40 +08:00
llj
b4db129c27 [api2 activity/discussion] improved ui/interaction 2013-07-20 14:55:40 +08:00
llj
93b311dd05 [msg] show avatar of contact 2013-07-20 14:55:39 +08:00
llj
a006e80c58 [msg] added 'add file/directory' 2013-07-20 14:55:39 +08:00
llj
e70e0977c6 modified ui of repo-share popup 2013-07-01 14:56:59 +08:00
llj
5664c6fe24 [repo-share-popup] redesigned ui 2013-06-27 13:55:22 +08:00
llj
21d43caa8c [topbar] modified signout 2013-06-26 17:48:58 +08:00
llj
7b786bdf6f improved topbar 2013-06-26 16:26:04 +08:00
llj
8a39f5a04c [pdf2html] improved zoom in/out 2013-06-08 20:23:36 +08:00
llj
cca9355828 [bottom bar] modified ui 2013-06-05 14:05:45 +08:00
llj
4d5236ba9b [pdf2html] improved ui & added zoom in/out; modified msg-count color 2013-06-05 11:44:27 +08:00
llj
beee5c0909 [msg] redesigned send-msg popup, improved topbar & user-msg page 2013-06-01 14:25:40 +08:00
zhengxie
7ab4da93f5 Change all msg table 2013-05-30 10:57:40 +08:00
llj
ade51c00d5 [pdf2html] redesigned doc/pdf view , rm 'flexpaper' files 2013-05-28 17:43:41 +08:00
lins05
75b79439b5 show loading gif when converting documents 2013-05-28 17:43:41 +08:00
zhengxie
2b1bfaeac4 Merge branch 'file_link' 
Conflicts:
	seahub/views/__init__.py
 2013-05-22 17:09:47 +08:00
llj
7f1ccc52e3 [search] added 'advanced search' for top-search-form and search-result page 2013-05-22 11:53:53 +08:00
llj
d0c96aada3 [search] added 'scales' option 2013-05-22 11:53:53 +08:00
plt
adfc9c7638 Merge branch 'pubfile2' 2013-05-21 22:54:35 +08:00
plt
00122ac6fa Improve css of payment 2013-05-21 22:54:10 +08:00
zhengxie
d0d6f6d49d Convert file/folder link in file activity 2013-05-21 11:18:11 +08:00
plt
58660afcae Improve coding of pubfile 2013-05-19 15:38:39 +08:00
zhengxie
66cce706d1 Merge branch 'event' 
Conflicts:
	seahub/views/__init__.py
 2013-05-18 13:26:11 +08:00
zhengxie
8fbedb85f3 Merge branch 'dancewhale-master' 
Conflicts:
	media/css/seahub.css
	seahub/templates/myhome.html
	seahub/templates/wiki/personal_wiki.html
 2013-05-18 11:09:34 +08:00
zhengxie
8212dc3834 Added payment 2013-05-17 17:20:08 +08:00
plt
e48fea29c8 Add pubfile support 2013-05-17 11:12:32 +08:00
llj
2ecb72c33d [events] redesign it 2013-05-14 12:08:11 +08:00
dancewhale
41fb83ff8c some change in html 2013-05-08 17:13:55 +08:00
llj
75c2e896f1 [profile set] modified ui for other langs 2013-04-27 10:56:53 +08:00
llj
4ad9d23a1e modified js str with 'trans' for french; improved some code 2013-04-27 10:56:53 +08:00
llj
08e1ab63aa [useradmin] improved user-add, set/revoke admin, user-delete 2013-04-23 10:25:44 +08:00
plt
e5ddc4bd07 Improve sys admin 2013-04-20 14:34:40 +08:00
llj
1fe5406127 [sf editor] fixed bugs and cleaned up code 
* fixed 'font menu no content when lang is zh-cn' bug
* added back necessary '.btn-into' styles
* rm no used js/css
 2013-04-20 12:11:46 +08:00
llj
b45ab7cb53 [discuss to group] fixed '.msg-main top border missing sometimes' in chrome 2013-04-20 12:11:45 +08:00
llj
e0bfae4068 improved css ( mainly for ie 7) 2013-04-16 11:54:53 +08:00
llj
0c27dd2818 [md] add support of 'tables', 'def_list' 2013-04-15 16:23:17 +08:00
zhengxie
b4e96191bd Center wiki img 2013-04-13 20:50:18 +08:00
llj
503f1d1e92 [icons] replaced some image icons with font icons 
* replaced all the image icons that's can be replaced
* added 'seafile-font'(offered only 'sf-icon-share' so far)
* make other browsers that doesn't support ':before' such as IE 7 can show the icons too
 2013-04-13 17:38:45 +08:00
llj
8ec83cbf3d [sf edit] use 'bootstrap-wysiwyg' as the editor, and rm 'experimental' 2013-04-11 15:27:23 +08:00
llj
b48e407022 modified tip for public discuss;modified css of 'discuss to grp' for ie 7 2013-04-09 15:26:57 +08:00
plt
2e7e581b93 Add personal wiki 2013-04-06 19:38:21 +08:00
llj
2ac3d80906 [font icons] add icons for bottom-bar & public group, using font-awesome 2013-04-06 17:20:21 +08:00
llj
f523998daf [discuss to grp] improved form ui & error tip, mv 'list' html to 'group' 2013-04-05 11:52:37 +08:00
llj
e3f7651c68 [discuss to grp] use ajax, show discusstions & replies 
* manually merged some code from zx's branch 'file_discuss'
 2013-04-04 20:05:08 +08:00
llj
af5897d540 [grp discuss] display image if the attachment is a image file 2013-03-30 13:21:48 +08:00
llj
9e40a98d4e [ui] modified space/traffic 2013-03-28 12:03:43 +08:00
lins05
bfd6b51a71 add traffic usage help link 2013-03-27 22:05:53 +08:00
llj
dc34d7abcf [ie] modified wiki, markdown extra.js, search results page for ie 2013-03-27 17:15:00 +08:00
llj
e1c241e94a translation; improved md edit ui & help; fixed bugs in grp discussion/wiki 2013-03-26 14:37:11 +08:00
lins05
f9cc2f9cae improve traffic-stat 2013-03-26 11:01:11 +08:00
llj
dc14675a10 [markdown] use pagedown for view, edit/preview. 
* modified Markdown.Editor.js and pagedown.css
* offered 'help' popup and 'fenced code block'
 2013-03-25 20:39:11 +08:00
llj
886447ce61 [grp discuss] improved html/css, mainly for autocomplete menu 2013-03-20 17:07:36 +08:00
zhengxie
4f47828d64 Update wiki 2013-03-15 20:47:26 +08:00
llj
d1039e16d5 [wiki] improved ui & fixed bugs 2013-03-15 16:57:33 +08:00
zhengxie
f9ac102378 Let user choose wiki name and description 2013-03-15 16:45:06 +08:00
zhengxie
b30aff9bf8 Modified wiki link parsing and add icon to wiki links. 2013-03-15 16:45:06 +08:00
zhengxie
c40f0faa09 Added wiki pages and delete page and fixed minor bugs 2013-03-15 16:45:06 +08:00
llj
4ac14a25f4 improved grp discuss; changed 'recommend' to 'discuss'; deleted 'file comment' 2013-03-15 14:41:20 +08:00
llj
e3064a3176 [group discuss] resigned it 2013-03-12 21:48:47 +08:00
plt
df5d7d22ec Change search box height 2013-03-09 20:27:48 +08:00
lins05
d4525e2845 add search results highlight 2013-03-09 17:05:02 +08:00
llj
2bb4532fb9 [file search] modified ui 2013-03-09 17:05:02 +08:00
lins05
c22c31c80a add file search 2013-03-09 17:05:02 +08:00
zhengxie
ee20df98fc Merge branch 'group-new' into develop 
Conflicts:
	utils/__init__.py
 2013-03-09 12:01:28 +08:00
zhengxie
30a4eaf53b Update group wiki 2013-03-08 19:34:53 +08:00
plt
749a283768 Implement wiki page create and edit 2013-03-07 12:05:30 +08:00
llj
5267b2851d modified other 'checkbox' 2013-03-06 14:37:16 +08:00
llj
1813bb6cb4 [repo share popup] added 'groups' & 'contacts' tabs 2013-03-06 14:37:16 +08:00
plt
5c6b3de991 Redesign group page 2013-03-04 20:25:38 +08:00
llj
74aa842626 modified style for ie 2013-03-04 17:43:29 +08:00
llj
b0c516cdfe modified for ie 7 2013-03-02 15:51:16 +08:00
llj
0062169395 modified ui for other lang 2013-03-02 15:24:33 +08:00
llj
b240a551c2 add styles for org remove notice 2013-03-01 11:27:58 +08:00
xiez
17c898c1a1 Merge pull request #14 from vIiRuS/master 
Added preview support for video and mp3
 2013-02-27 18:50:12 -08:00
llj
788e6376d3 [pdfjs] improved pdf view with pdfjs 2013-02-27 21:37:38 +08:00
Phillip Thelen
8fd6c61b14 merge deleted a bracket. 2013-02-27 11:43:18 +01:00
llj
a5589f1a5c modified a few styles of pubinfo & <label> 2013-02-27 15:28:13 +08:00
Phillip Thelen
0bb42bb400 Added support for previewing Video and mp3 files. 2013-02-26 05:16:18 +01:00
Phillip Thelen
dad3888b0c Added files for mediaelementjs 2013-02-26 05:15:42 +01:00
zhengxie
36a3bd1685 Enable change repo name and desc. 2013-02-25 17:27:12 +08:00
llj
086c03a068 [file encoding] added encoding option & used chardet for Text/Markdown/Sf file 2013-02-24 16:52:10 +08:00
zhengxie
3e2ddb466b Merge branch 'pubinfo' 
Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
 2013-02-23 11:48:06 +08:00
llj
2dce824661 [img view] fixed height bug when width equals max-width 2013-02-22 12:03:50 +08:00
llj
37b0e03df5 rewrote pubinfo 2013-02-21 19:59:58 +08:00
llj
d2848f20f8 improved front-end performance & grp msg move-upward 
* combined js files
* added css sprites
* added size for images (except small icons)
* cleaned up css/js
* removed unused files (images etc.)
 2013-02-05 17:57:47 +08:00
llj
d00d7545fb Merge branch 'msg' 2013-01-31 14:01:26 +08:00
llj
37f284d11a [img_view] enable view prev/next & improved ui 2013-01-31 13:18:25 +08:00
zhengxie
46ee7b6361 Merge branch '1.4' 
Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
 2013-01-30 21:16:52 +08:00
zhengxie
c134f9e84e Display share quota usage. 
Conflicts:
	thirdpart/seaserv/__init__.py
	views.py
 2013-01-29 15:33:53 +08:00
llj
bc51aaccbe added 'recent changes' to group_info & improved 'tabs' 2013-01-25 22:08:37 +08:00
llj
1c664c8fbf [grp_msg] added move_upward 2013-01-25 17:56:02 +08:00
llj
720ac28c22 [aloha] upgraded to 0.22.7 and added textcolor plugin 
* textcolor: fixed plugin bugs, added translation for zh
* image: fixed default.jpg src bug
* added 'ru' support for seaf edit
* rm aloha-0.22.3 and ununsed files in aloha-0.22.7
 2013-01-15 14:48:04 +08:00
llj
dfba47e34e modified group name display in home page 2013-01-12 17:44:08 +08:00
llj
1919a7eb95 modified msg-reply for ie; allow use ie 10 to view pdf with pdf.js 2013-01-10 17:38:33 +08:00
llj
85485eda22 improved share_admin 2013-01-10 16:15:41 +08:00
llj
416aabb906 [repo] modified column with for ff 2013-01-09 21:30:02 +08:00
llj
7f8edd0358 modified some ui (fileshare & grpmember-add popup, path of shared dir's file 2013-01-09 21:15:26 +08:00
llj
cd385c2ca4 modified for ie 2013-01-08 17:44:25 +08:00
llj
53c5e72206 modified md h2 style and repo setting icon 2013-01-05 20:22:59 +08:00
llj
62ca2f2af3 [repo] added sort by name/time for dirents 2013-01-04 17:48:17 +08:00
killing
cd66dc369b Change repo settings icon. 2013-01-04 13:26:18 +08:00
killing
73209e4e9f Setting how many days of history to keep. 2013-01-04 13:05:24 +08:00
zhengxie
37eacd22c3 Merge branch 'feature/share_dir' 
Conflicts:
	utils/__init__.py
	views.py
 2013-01-03 19:30:50 +08:00
zhengxie
f94c4c5a61 Added dir shared link feature 2013-01-03 19:28:57 +08:00
llj
c08bde7724 fixed img view bug 2013-01-03 11:57:14 +08:00
llj
c724b44386 added fileshare to repo page, improved fileshare in file_view, improved 'messages' & apply_form_error 2012-12-29 20:49:33 +08:00
llj
8533181693 [img_view] added 'max-width' 2012-12-28 20:37:38 +08:00
llj
1b82f78b74 [profile edit] modified 'account' ui in home pages and added tip to avatar-link in topbar 2012-12-26 15:01:22 +08:00
llj
97af71f90f fix group-list style bug 2012-12-22 19:12:51 +08:00
llj
86362f78ea [repo] added file star/unstar feature 2012-12-21 19:53:09 +08:00
llj
85c7fef3bc added 'more' for events 2012-12-19 19:09:50 +08:00
llj
71e79d39a1 [Text_file] fixed style overwrite bug 2012-12-17 13:27:38 +08:00
llj
4a6232bb12 [file_view] modified Image/SVG/PDF/Document file view, clean up code and fixed bugs. 2012-12-14 19:56:27 +08:00
llj
0ab3058a43 improved popup(send-link, share-repo, grpmember/admin-add) and textarea 2012-12-12 20:51:59 +08:00
llj
d6b073ff9c fixed bug in 'more-op' of repo page 2012-12-10 15:58:37 +08:00
llj
123b0315e8 [upload/update] fixed bug, modified bar style and improved code 2012-12-08 20:11:39 +08:00
llj
0093973e4a improved file-upload 'add-files' 2012-12-07 11:27:13 +08:00
llj
1489ae1a86 modified file upload/update and user/group avatar change 2012-12-06 17:47:31 +08:00
llj
2000f95f9d modified md view/preview 2012-12-06 17:28:37 +08:00
llj
59ce34048b modified file/dir rename/move/copy popup 2012-12-06 11:36:12 +08:00
llj
fd3796925d improved home-group 2012-12-03 13:47:45 +08:00
llj
a40e947d5c modified 'Text' file view/edit 2012-12-03 11:35:54 +08:00
llj
f9cd63a912 modified rename popup 2012-12-01 15:37:54 +08:00
llj
fbd13ef381 modified md file view, edit, preview;modified shared-file and history-file view for md & seaf 2012-11-28 15:28:38 +08:00
llj
36f382bda8 improved file-edit; redesigned seaf file-view; modified new-file tip, simplemodal style 2012-11-27 15:49:22 +08:00
llj
43ff32acb2 [seaf]modified editor padding, btn and etc. 2012-11-23 11:29:02 +08:00
llj
763286c77e [file-edit]redesigned the ui: big gray bg.. and etc. 2012-11-21 15:15:01 +08:00
llj
feba88f485 [seaf]rm editor highlight border;modified new-file 2012-11-20 19:38:31 +08:00
llj
26b8f295db added 'seaf' file view and edit with aloha;modified new-file 2012-11-20 16:29:27 +08:00
zhengxie
1e79e72a54 Improved file upload and update 2012-11-17 17:31:37 +08:00
llj
542a8e8256 improved style of btn-disabled;added btn disable/enable func 2012-11-15 11:28:57 +08:00
llj
626a6cd7c2 added input-valid for new-group;added btn-disabled for new-group/file/dir 2012-11-14 20:52:28 +08:00
llj
a44d825f4d improved bottom-bar;modified narrow-panel input style 2012-11-13 16:48:14 +08:00
llj
384d9f31ce modified css, js for ie 7 2012-11-12 17:48:26 +08:00
llj
7616c2b52a [button, input]modification for ff, ie 2012-11-12 17:06:45 +08:00
llj
a1fc1cd2c4 modified button & input 2012-11-12 14:12:49 +08:00
llj
f02112789f [css]modified top-bar 2012-11-12 10:56:45 +08:00
llj
c0b5d28580 modified simple-input-popups 2012-11-10 11:31:05 +08:00
llj
30b4af22f5 modified all comfirm popup 2012-11-10 10:27:16 +08:00
llj
3786887568 modified placeholder and textarea style 2012-11-09 11:47:54 +08:00
zhengxie
8786392ab9 Added resize to share repo and send link simplemodal 2012-11-09 10:12:04 +08:00
plt
e0811f728a Improve navigation bar 2012-11-05 13:56:47 +08:00
plt
e5d353d09d Change logo 2012-11-03 21:37:41 +08:00
plt
22aaaa5d10 Change header and logo 2012-11-03 18:05:50 +08:00
zhengxie
892ebc0eea Modified empty tips translation 2012-11-02 19:45:51 +08:00
llj
287c516abd modified lang-selector 2012-11-02 11:39:34 +08:00
plt
b9c52421af Add red top-bar to indicate the current workspace context 2012-11-01 16:54:45 +08:00
plt
767f1097bc Change the color of op-target 2012-10-31 11:49:27 +08:00
llj
5621d23694 translation and js/css modification for en 2012-10-29 21:44:13 +08:00
plt
32703bb424 Change blockquote style in markdown 2012-10-29 14:15:30 +08:00
plt
1805b6a262 Remove bottom line in showing group 2012-10-27 10:43:57 +08:00
plt
9cf34f19eb Change logo img 2012-10-27 10:41:19 +08:00
llj
6baebcd97f added file-star feature(by ls & lj) 2012-10-26 19:50:36 +08:00
llj
0106d08911 [msg-del]modified popup;used ajax 2012-10-25 16:48:08 +08:00
llj
33748182cf modified color of op-btn in msg 2012-10-24 19:10:05 +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
927741d552 Improved css of tips and placeholder 2012-10-23 17:47:00 +08:00
llj
cff0c9aa17 modified group-new-msg-reply 2012-10-23 17:21:42 +08:00
llj
7279405cc8 modified atautocomplete and file-comment 2012-10-23 17:21:42 +08:00
zhengxie
3e7b8b626f Modified group admin removing 2012-10-22 19:43:08 +08:00
zhengxie
e92546c69c Modify group members tip 2012-10-22 19:43:08 +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
zhengxie
56ea2dbd66 Added at complete in file commet 2012-10-20 19:43:56 +08:00
zhengxie
b6f1b8a2e4 Added group admin management 2012-10-20 16:26:49 +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
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
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
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
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
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
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
llj
15bb2ce923 [repo, repo_history]redesign ui 2012-09-15 21:01:06 +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
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
7ef0f4cacb Merge branch 'lj_ie' 2012-09-01 14:47:53 +08:00
llj
916392c566 [ie_textarea]rm default vertical scrollbar 2012-08-31 17:02:41 +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
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
a304faf3ca [editor]modified css for ie 8 2012-08-24 11:53:15 +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
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
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
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
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
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
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
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
cda7b72596 fix long str problem in <pre> for ff 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
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
plt
4ec3d2a2d5 Improve css of footer and paginator 2012-07-04 19:17:04 +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
21f502ee0b Merge branch 'lj' 2012-07-04 10:56:18 +08:00
plt
211893e0b7 Modify css 2012-07-03 18:43:32 +08:00
plt
a9891a761e Fix bug 2012-07-03 17:56:41 +08:00
xiez
340ad516e4 Add file preview feature 2012-07-03 17:55:18 +08:00
llj
5ae730524d modified groups 2012-07-03 17:29:27 +08:00
xiez
c050d7423d Modify css 2012-07-03 17:13:35 +08:00
plt
3a0d175f36 Update icons 2012-07-02 16:42:24 +08:00
llj
8b40a83880 added file op:rename, cp, mv, upload, create 2012-07-02 11:47:04 +08:00
xiez
1be271353e Mofigy group msg reply notification 2012-06-27 19:56:11 +08:00
xiez
24b3f6d359 Merge branch 'lj_grpmsg' into groupmsg-rebase 
Conflicts:
	group/models.py
	group/templates/group/group_info.html
	group/views.py
	media/css/seahub.css
 2012-06-26 19:35:07 +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
llj
1c28e63761 improved group-msg 2012-06-26 17:41:28 +08:00
xiez
da57141684 Add group message feature 2012-06-26 17:41:28 +08:00
llj
7b57fbbaaa show user-profile in popup 2012-06-23 16:12:54 +08:00
xiez
c6146ef370 Modify avatar radius 2012-06-22 19:09:54 +08:00
xiez
4862910132 Modify avatar border-radius 2012-06-22 17:24:07 +08:00
llj
9a7fa79a17 improved set_profile 2012-06-22 11:51:26 +08:00
llj
d8c5604687 improved home-profile 2012-06-21 15:26:03 +08:00
llj
c4bac01f1b modified default avatar 2012-06-21 13:43:59 +08:00
llj
5f021a5624 add 'user-profile' 2012-06-21 13:27:23 +08:00
llj
473cf33b97 show 'profile' in home;add profile-modify in setting 2012-06-21 13:27:23 +08:00
xiez
9c4a54931f Add org account feature 2012-06-20 19:39:21 +08:00
llj
491ba973d0 modified css for ff 2012-06-12 10:56:12 +08:00
xiez
e4c2899124 Merge branch 'lj' 2012-06-12 10:18:41 +08:00
xiez
705f86e68d Add anonymous share feature 2012-06-12 10:15:47 +08:00
llj
0f6c96680b modified css for narrow-panel h2 2012-06-11 14:13:14 +08:00
llj
d97b51d8ce modification for ff 2012-06-11 13:22:22 +08:00
llj
01f65e4f22 modification for ie 2012-06-06 17:34:42 +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
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
llj
c0d3a3dce9 modified 'commit details' 2012-05-31 10:32:48 +08:00
xiez
3b3a882913 Merge branch 'diff' 2012-05-30 19:57:40 +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
llj
2af6249293 modified table 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
llj
f7898023d8 improved ui of avatar_change/add 2012-05-30 11:51:28 +08:00
llj
6f40b55c50 fixed bug for repo-op in myhome 2012-05-29 11:25:49 +08:00
llj
f444794d29 modifed repo-op ui in myhome; modified avatar 2012-05-28 22:10:54 +08:00
llj
eba0d44527 modified topbar avatar & avatar_change/add 2012-05-28 16:38:08 +08:00
llj
6b5c2fef4e modified avatar related pages-base, group_info, avatar_change 2012-05-25 17:15:15 +08:00
llj
f78a520fe2 [text-panel]modified css for ie 2012-05-23 17:36:26 +08:00
llj
4878db22a1 modified icons in repo page 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
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
llj
2ac9c9b7f6 [group-member-add]enable add more than one at one time 2012-05-22 16:18:34 +08:00
llj
539e324ccc modified style of h2, group-member-add 2012-05-19 22:55:43 +08:00
llj
bcdec41248 Center contact_add/edit & 'registration' pages 2012-05-19 22:55:43 +08:00
llj
b395acf9a1 add 'addAutocomplete' func; add autocomplete to add-group-member; modified repo-share 2012-05-19 22:55:43 +08:00
llj
b004f6df92 modifed group-member-icon;rewrite confirm dialog;add confirm to rm group 2012-05-19 22:55:43 +08:00
plt
0b81dbf0ff Improve background color of selected table row 2012-05-18 16:07:57 +08:00
llj
9e4225267f highlight the tr when mouse hover 2012-05-18 14:46:07 +08:00
llj
43d5089057 modified repo, group_info 2012-05-18 11:47:59 +08:00
plt
af96c3085e Improve group css 2012-05-17 23:59:16 +08:00
plt
f635e31d18 Improve top-bar css 2012-05-17 22:40:03 +08:00
llj
24a760758c modified top-bar, repo, contact_list, user admin pages 2012-05-17 20:40:40 +08:00
plt
c4f8ee968b Merge branch 'lj' 2012-05-17 15:41:25 +08:00
plt
eb86ee1207 Modify css of admin link in top-bar 2012-05-17 15:40:15 +08:00
llj
a054f4a3f5 modified base ui, repo, group, contact 2012-05-17 14:16:46 +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
llj
77bf3cf392 modified ui of #main; clean up css 2012-05-14 21:52:18 +08:00
llj
05c2ea419e modified header(logo & margin) 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
llj
4cbeaa2513 [repo-share-form]add autocomplete 2012-05-07 16:53:13 +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
6d50d3a0af Improve header css 2012-05-05 14:13:55 +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
llj
14932fce0d added repo_dir to repo page;modified repo_dir,repo_history 2012-05-04 16:21:01 +08:00
xiez
566e66b8d6 Add seafile version, change 4GB to 2GB, and modify userinfo page 2012-05-03 10:52:43 +08:00
llj
f4f05ab034 split repo into repo & repo_history 2012-04-24 16:53:57 +08:00
llj
4418929850 improved css for btn 2012-04-18 11:26:07 +08:00
llj
ed41db3206 modified pwd_change 2012-04-09 15:10:15 +08:00
llj
e24f17abbb modified reg ui 2012-04-09 14:43:10 +08:00
llj
fbe5f18f64 improved tables 2012-04-01 14:25:59 +08:00