haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-05 03:07:01 +00:00
Code Issues Releases Wiki Activity
1,315 Commits 133 Branches 451 Tags 2.1 GiB
d252d5eed5
Commit Graph

346 Commits

Author SHA1 Message Date
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
xiez
d138bee164 Fixed bug in org repo share, and clean code 2012-09-03 16:14:15 +08:00
xiez
29c9ff11df Added org repo share 2012-09-03 12:04:14 +08:00
lins05
20fc024f15 quote file/dir names in url 2012-09-02 20:23:57 +08:00
lins05
db3a7469de fixed a bug in rename 2012-09-02 20:10:49 +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
5ad09999c7 Add context switch decorator 2012-08-31 17:28:50 +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
7c4884a7f4 Change public repo to innerpub repo 2012-08-30 20:27:28 +08:00
xiez
98142ab219 Add public home 2012-08-30 20:27:27 +08:00
llj
869222d863 [file-op]added feedback message 2012-08-27 11:16:02 +08:00
xiez
37c0f934bc Add file comment feature 2012-08-26 11:50:57 +08:00
xiez
0d8a1d47b1 Fix user add bug 2012-08-24 11:23:49 +08:00
lins05
ece64e5f5e allow anyone who can access a repo to revert it 2012-08-23 16:58:38 +08:00
lins05
981ff56486 improve newline/encoding detection 2012-08-22 17:08:52 +08:00
llj
7f20d67df3 modified file revert 2012-08-21 21:04:36 +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
killing
9068c400c9 Clean file upload html files and add upload error pages. 2012-08-16 20:25:32 +08:00
xiez
40480f8b22 Send email when reset password 2012-08-16 17:01:09 +08:00
xiez
338561cb83 Use user.set_password to change user password, instead of using raw rpc 2012-08-16 14:31:37 +08:00
xiez
930bd31c30 Add password reset 2012-08-16 11:00:54 +08:00
xiez
e0c5529557 Add sys_staff_required decorator 2012-08-16 10:48:59 +08:00
xiez
33a2c1491c clean code 2012-08-15 10:58:08 +08:00
killing
dc65e319a1 Update file upload code. 2012-08-14 21:13:11 +08:00
xiez
c9e37ac5c4 Modify group recommend. 
* Get all groups a repo shared, then find out groups that user joined.
 2012-08-14 17:53:58 +08:00
xiez
4f64802e22 Modify group recommend 2012-08-13 21:26:58 +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
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
lins05
519287d5d9 create new file on web 2012-08-11 17:19:43 +08:00
lins05
b56cf1882d add 'open-local-file' link 2012-08-11 10:33:16 +08:00
xiez
f15fecdcf1 Fix bug 2012-08-10 21:20:01 +08:00
xiez
bfefa7df70 Add basic recommend feature 2012-08-10 21:17:28 +08:00
lins05
ecfb415ec4 fixed a bug in list_file_revision 2012-08-10 13:32:12 +08:00
xiez
a99ed91e49 Fix bug in repo_file_get 2012-08-10 10:43:51 +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
c8887461b1 improved source file edit 2012-08-09 20:45:29 +08:00
llj
ae1dbd49bd added func: source file edit 2012-08-09 20:45:29 +08:00
plt
074e781831 Remove back_local 2012-08-08 17:05:35 +08:00