1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-23 17:20:29 +00:00
Commit Graph

48 Commits

Author SHA1 Message Date
zhengxie
d4b8c01d07 Merge branch 'develop'
Conflicts:
	utils/__init__.py
2013-04-19 16:57:57 +08:00
Phillip Thelen
9bae443d94 Users now can preview stl and obj files in the browser 2013-04-17 04:43:06 -07:00
zhengxie
a957a616f6 Handle case that get_commits returns empty 2013-04-16 11:32:58 +08:00
plt
23467e08ca Add more preview text file types 2013-04-15 12:01:01 +08:00
zhengxie
6099b5cec1 Merge branch 'poet' 2013-04-13 14:20:06 +08:00
zhengxie
94f2e75ea5 Fixed circular import problem when events is enabled 2013-04-08 16:53:31 +08:00
poetwang
34d3c70b22 [api2] Add file last modifyied time 2013-04-06 17:38:13 +08:00
zhengxie
9b29fbdb6b Fixed bug in gen_file_get_url 2013-04-05 15:06:32 +08:00
lins05
525010fe8a fixed a bug of stats connection leak 2013-04-04 18:54:23 +08:00
lins05
ccd2605af1 add index to UserStarredFile 2013-03-30 20:38:14 +08:00
lins05
5e45bb2724 fix bugs and add unique constraint to StarredFiles table 2013-03-30 20:29:59 +08:00
plt
ab35c26728 [group] Add support for public group 2013-03-29 11:46:28 +08:00
lins05
bd7a969759 refactor search code 2013-03-28 16:40:36 +08:00
zhengxie
e3b101d22c Parsing link when view md file 2013-03-26 14:21:05 +08:00
lins05
d5b050eb55 lazily connect to elasticsearch 2013-03-25 10:25:04 +08:00
lins05
a257760de4 fixed get_user_traffic_stat 2013-03-19 15:56:42 +08:00
lins05
f3d0e46d42 add user traffic stat 2013-03-18 20:37:29 +08:00
lins05
cc1193148f improve search 2013-03-16 14:02:54 +08:00
lins05
d4525e2845 add search results highlight 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
plt
71fec8a3b2 Remove seaserv 2013-03-09 10:35:53 +08:00
zhengxie
30a4eaf53b Update group wiki 2013-03-08 19:34:53 +08:00
zhengxie
151a158f4a Move views.py to views/, and refactor file view 2013-03-08 10:21:34 +08:00
zhengxie
52703e6464 Fixed bug in moving/copying public repo 2013-03-04 13:35:26 +08:00
zhengxie
faec2bc12f Handle exception when calculate last modification time. 2013-02-28 17:27:13 +08:00
Phillip Thelen
0bb42bb400 Added support for previewing Video and mp3 files. 2013-02-26 05:16:18 +01:00
zhengxie
07b0dc3f78 Sort starred files by last modified 2013-02-21 17:11:27 +08:00
zhengxie
9dddbcbf5c Merge branch '1.4'
Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
2013-02-01 11:02:09 +08:00
zhengxie
2edeb9d9c2 Fixed typos 2013-01-31 11:49:54 +08:00
zhengxie
46ee7b6361 Merge branch '1.4'
Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
2013-01-30 21:16:52 +08:00
chuyskywalker
2a28c0dd5f Fixup some minor english grammar mistakes. 2013-01-23 05:38:52 -08:00
lins05
2b03f33f5b improve get_(org)_user_events 2013-01-23 12:06:55 +08:00
zhengxie
f2ee3c614b List history of read-only library, and fixed typo in share repo to all 2013-01-21 11:34:18 +08:00
zhengxie
d5bea5d833 No need to do md5 since uuid4 is already random 2013-01-19 19:23:48 +08:00
zhengxie
0007951241 Loaded HTTP_SERVER_ROOT from settings first 2013-01-19 17:57:37 +08:00
zhengxie
fa8fcb6fda Fixed random token generation bug 2013-01-19 17:50:38 +08:00
lins05
0ff4b32247 improve open-local message 2013-01-10 13:21:08 +08:00
lins05
0d62163c8a improve file preview related code 2013-01-09 17:35:33 +08:00
zhengxie
db23497e69 Added email sending settings 2013-01-09 17:30:31 +08:00
zhengxie
aa7741adf4 Ignore previewd file extension, and change copyright 2013-01-09 11:49:43 +08:00
zhengxie
ca5f21c585 Added SEAFILE_CONF_DIR environment var, and remove max_upload_file_size and http_server_root from settings 2013-01-08 11:12:07 +08:00
killing
d330bf4d36 Allow selecting how many deleted files to show in recycle. 2013-01-04 13:07:31 +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
lins05
d6a8b86c4f show last modified in file list
* Also handles the situation when list contributors failed
2013-01-03 17:35:00 +08:00
lins05
7bdd993e05 fixed empty li bug in events 2013-01-03 17:28:25 +08:00
zhengxie
5f0f010227 Renamed utils.py 2012-12-28 16:16:40 +08:00