haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity
2,016 Commits 146 Branches 460 Tags
2ed4f2a3c850eaa2f3b51c48eeb43a000df9d88f
Commit Graph

2016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lins05
b42d8172b9 improve office preview page loading 2013-05-29 15:35:55 +08:00
lins05
666014ee0f update search/office-convert settings related 2013-05-29 12:22:39 +08:00
lins05
d6fcce54ef move office convert js to office_convert_js.html 2013-05-29 11:56:11 +08:00
lins05
6bdaccec0a use seahub to serve office convert requests 2013-05-28 17:43:41 +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
lins05
a7c3ccd580 use pdf2htmlEX instead of pdf2swf 2013-05-28 17:43:41 +08:00
llj
5d3362cd28 [group discuss] fixed bugs about reply 2013-05-28 16:49:42 +08:00
zhengxie
e73ba47134 Fixed small bugs 2013-05-28 10:38:59 +08:00
zhengxie
52ec394a18 Refactor message 2013-05-27 16:32:05 +08:00
zhengxie
b160db9701 Fixed download library bug using api 2013-05-25 10:01:30 +08:00
zhengxie
a96d7641fb Modified url for payment 2013-05-24 16:44:24 +08:00
plt
11ac9ee546 Redesign the download url for a pubfile 2013-05-24 14:25:28 +08:00
xiez
962378393c Merge pull request #53 from viktorlindgren/master 
Autofocus on password field
 2013-05-23 02:25:55 -07:00
lins05
dceeff95bb fixed events_count 2013-05-23 11:26:37 +08:00
viktorlindgren
733bd28304 Autofocus om password field 2013-05-22 21:31:10 +03:00
lins05
526447896a comment js code for seahub.message in base.html 2013-05-22 18:38:21 +08:00
zhengxie
2b1bfaeac4 Merge branch 'file_link' 
Conflicts:
	seahub/views/__init__.py
 2013-05-22 17:09:47 +08:00
zhengxie
63083a5e1b Clean code in events 2013-05-22 17:07:35 +08:00
plt
e581ff24ef Improve get_events 2013-05-22 16:21:36 +08:00
zhengxie
6d9ce2cb7d Refactor events 2013-05-22 15:19:46 +08:00
lins05
a81c1a583e move search related to seahub_extra 2013-05-22 11:53:53 +08:00
llj
7f1ccc52e3 [search] added 'advanced search' for top-search-form and search-result page 2013-05-22 11:53:53 +08:00
lins05
0fbc6cd0f2 allow search files with specified suffix(es) 2013-05-22 11:53:53 +08:00
lins05
5539334bec allow search in a repo/wiki 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
llj
e7520b08d0 [pubfile, get_dirents] fixed bugs & cleaned up the code, added get_group_repos ajax api 2013-05-21 21:48:33 +08:00
zhengxie
f0b2571509 Merge same file events 2013-05-21 11:57:48 +08:00
zhengxie
d91d64a0e7 Change events from 10 to 20 2013-05-21 11:24:55 +08:00
zhengxie
d0d6f6d49d Convert file/folder link in file activity 2013-05-21 11:18:11 +08:00
zhengxie
d7eae6c7a5 Merge branch '1.6' 2013-05-20 15:59:33 +08:00
zhengxie
16bd203b7e Update server version and timestamp 2013-05-20 13:42:22 +08:00
zhengxie
bcc3fd5bbe Temporarily comment out user message 2013-05-20 13:27:44 +08:00
zhengxie
5281beb011 Added allowed_hosts to settings 2013-05-20 10:33:39 +08:00
plt
58660afcae Improve coding of pubfile 2013-05-19 15:38:39 +08:00
zhengxie
7995cb6fe0 load seahub.settings in utils, and fixed bug in file revisions 2013-05-18 14:17:23 +08:00
zhengxie
66cce706d1 Merge branch 'event' 
Conflicts:
	seahub/views/__init__.py
 2013-05-18 13:26:11 +08:00
xiez
8ef4c0aa62 Merge pull request #51 from HenriWahl/master 
improved german django.po
 2013-05-17 20:15:18 -07: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
4c8f674841 Merge branch 'feature/payment' 2013-05-18 11:08:47 +08:00
zhengxie
99f1c05096 Fixed api2 bugs 2013-05-18 11:01:33 +08:00
lins05
a0169f6389 improve .gitignore 2013-05-18 10:51:24 +08:00
HenriWahl
fb648d9629 improved german django.po 2013-05-17 20:09:55 +02:00
lins05
422435d8ef fixed settings.py for server release 
After migrating to django 1.5, seahub/settings.py becomes
seahub/seahub/settings.py
 2013-05-17 18:39:15 +08:00
zhengxie
8212dc3834 Added payment 2013-05-17 17:20:08 +08:00
plt
eb58367647 Move system admin functions to sysadmin.py 2013-05-17 13:41:37 +08:00
plt
e48fea29c8 Add pubfile support 2013-05-17 11:12:32 +08:00
plt
3049aaa61c Show user quota in admin user list 2013-05-16 20:12:14 +08:00