haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-06 03:36:46 +00:00
Code Issues Releases Wiki Activity
1,556 Commits 134 Branches 451 Tags 2.1 GiB
565e343e8f
Commit Graph

393 Commits

Author SHA1 Message Date
lins05
d296b0754b only use pdf.js to view pdf in Firefox 2012-11-27 17:53:44 +08:00
zhengxie
22b07ffe3c Merge branch 'download' 2012-11-26 10:24:01 +08:00
zhengxie
0cd133657a Fixed upload/update progress bug in chrome 2012-11-24 22:17:08 +08:00
lins05
8887af6930 download a subdir as zip 2012-11-24 17:44:01 +08:00
zhengxie
d4ea157f9d Improved nickname fetching in myhome 2012-11-21 21:17:01 +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
zhengxie
7c9d92ff5f Added user permission control in repo_view_file page 2012-11-09 16:27:41 +08:00
zhengxie
24e0f4c907 i18n for org and seahub mails 2012-11-06 17:23:45 +08:00
lins05
78579659ff improve file revisions 2012-11-06 13:46:38 +08:00
zhengxie
73418cc45d Cleaned share related code 2012-11-06 11:12:49 +08:00
zhengxie
8c0b9cd4d8 i18n for views.py 2012-11-05 14:36:00 +08:00
zhengxie
893f2fffcf Modified unshare 2012-11-05 11:55:32 +08:00
zhengxie
6005458862 Merge branch 'update-file' 2012-11-04 13:35:31 +08:00
zhengxie
ee6b04e885 i18n for recycle and edit page 2012-11-04 13:29:20 +08:00
killing
9eda95c6ad Include current commit id when updating files. 
Seaf-server can then use this commit id to check concurrent update
to the same file.
 2012-11-04 13:06:30 +08:00
zhengxie
5221743afe i18n for sys admin and notifications 2012-11-01 15:09:48 +08:00
zhengxie
cb16012d75 Show a message after sending shared link insteaf of refresh page 2012-11-01 14:00:55 +08:00
zhengxie
ea4f3cee67 Added login required to repo page 2012-11-01 11:50:01 +08:00
zhengxie
fdd0ab13e1 Fixed repo decrypt redirect bug and clean code 2012-11-01 11:28:58 +08:00
killing
b60b27f022 Modify file upload error page. 2012-10-31 11:16:59 +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
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
llj
23ea468d60 [text-diff]redesign ui 2012-10-24 15:40:25 +08:00
llj
0d14e4ad29 [to-group]modified the popup to be like comment-popup 2012-10-20 21:37:02 +08:00
zhengxie
ab4d29262c Handle multi groups when click into group in repo page 2012-10-20 16:28:42 +08:00
lins05
f9e0437628 add text file diff 2012-10-19 18:00:22 +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
3e464137c0 Modify org personal page, and add org root 2012-10-13 17:40:55 +08:00
lins05
7e66170f48 use reverse() instead of hard code url 2012-10-12 19:46:08 +08:00
lins05
e821182a11 fixed a bug in the commit detail link 2012-10-12 19:30:57 +08:00
killing
28d86558e1 Fix bug when showing update file error. 2012-10-12 17:12:54 +08:00
zhengxie
27dc5c999d Fixed bug when comment file in org 2012-10-11 16:47:15 +08:00
killing
2aecb8478c Revert a deleted dir in recycle page. 2012-10-11 14:50:02 +08:00
zhengxie
7088daf7c3 Added pubinfo page 2012-10-11 14:34:08 +08:00
zhengxie
34155446e0 Fixed redirect bug in demo account 2012-10-10 20:11:55 +08:00
zhengxie
d0671d71a1 Added demo account 2012-10-10 20:05:02 +08:00
zhengxie
3e0961ff90 Fixed autocomplete bug when share repo 2012-10-10 19:21:17 +08:00
zhengxie
8efc8eced3 Merge branch 'recycle' 2012-10-09 21:56:54 +08:00
zhengxie
05bf9ea8e6 Modify empty tips 2012-10-09 21:47:54 +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
lins05
33d3758631 fixed "import seafevets" when events disabled 2012-10-09 11:22:55 +08:00
llj
e50022978a Merge branch 'events' 2012-09-29 17:18:21 +08:00
ZhengXie
4ca3810790 Fixed bug in moving files under org context 2012-09-29 16:51:36 +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
xiez
7d0e15123a Modify autocomplete and contacts 2012-09-27 17:52:04 +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
lins05
bac82d56c8 add link to commit details 2012-09-25 20:07:46 +08:00
lins05
2960b68b26 show file last modifed time in repo_view_file 2012-09-25 16:51:00 +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
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
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
83e430efdb [file_comment]show comments when enter file-view from link in grp msg 2012-09-20 10:45:09 +08:00
llj
9085a9e4dc [file_view]redesign comment feature;modified history_file_view 2012-09-19 20:42:55 +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
181a028b8d Merge branch 'lj_fileview' 2012-09-17 13:06:43 +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
xiez
fa447e729f Fixed sending file shared link bug 2012-09-15 21:17:32 +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
236591ba0e Merge branch 'http-cache' into master2 2012-09-15 10:10:13 +08:00
xiez
32f7463a1d Added innpub messages 2012-09-14 22:15:14 +08:00
killing
d264a37dcc Enable browser cache for getting file. 2012-09-14 19:35:19 +08:00
xiez
c8d708980c Fix recommend in org context 2012-09-14 11:39:33 +08:00
xiez
99986828ee Restore permission check 2012-09-13 22:12:11 +08:00
xiez
c81a9bc23c Some updates 2012-09-13 17:45:15 +08:00
xiez
339f9796d7 Raise 404 when repo or path is invalid when show repo page 2012-09-13 17:31:27 +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
98067689ea remove a unused url/function 2012-09-13 14:24:03 +08:00
lins05
bf445f0a0a use libreoffice pdf convertor 2012-09-13 14:01:32 +08:00
xiez
47f1a025a8 Fixed path bug in repo 2012-09-13 13:53:26 +08:00
xiez
29df42dc64 Use class based view to clean repo code 2012-09-13 13:31:32 +08:00
xiez
134f290993 Add repo_history_view page, and move message block to base 2012-09-12 17:11:27 +08:00
xiez
51da061d8e Clean code 2012-09-12 11:35:43 +08:00
llj
17b78ce7a4 Merge branch 'lj_fileop' 2012-09-07 16:45:33 +08:00
xiez
9b7528daa1 Show error msg in ajax when add/rename file or dir 2012-09-07 11:03:17 +08:00
lins05
5bf1743882 redirect to repo history when revert file from repo histoy view 2012-09-07 10:58:42 +08:00
lins05
5b423f6f6f redirect to parent dir after revert a file 2012-09-07 10:24:29 +08:00
llj
2c989de69e [file-op]modified mv/cp ui;modified op-list popup 2012-09-06 19:51:56 +08:00
xiez
4bf9851c65 Modify org msg 2012-09-06 16:57:54 +08:00
xiez
4e76418e70 Unset inner pub repo 2012-09-06 11:03:49 +08:00
xiez
9eff5fea03 Modify group create, and clean code 2012-09-06 10:19:34 +08:00
xiez
cdf017da1a Fixed bug in remove repo 2012-09-04 21:05:20 +08:00
xiez
69dde60743 Change op button 2012-09-04 17:15:19 +08:00
xiez
22ee4fe65a Added button to click into group in repo page 2012-09-03 20:54:51 +08:00
xiez
1e8014839f Added share src in inner pub page 2012-09-03 19:36:47 +08:00