zhengxie
1372b010e6
Merge branch 'extra-msg'
2014-06-10 17:00:04 +08:00
zhengxie
56d7ac70ba
Merge branch 'manage-repo-shared-link'
2014-06-10 16:27:16 +08:00
zhengxie
40f9f87507
Refactor share links in repo settings page
2014-06-10 16:26:50 +08:00
zhengxie
1c16555810
Merge branch 'sort-lib'
2014-06-10 15:56:10 +08:00
zhengxie
da5de60728
Refactor ajax::my_shared_and_group_repos
2014-06-10 15:55:43 +08:00
imwhatiam
65ffcc0133
sort repo by name/time at 'owned/shared/be-shared/group/pub' repo page.
2014-06-10 15:48:45 +08:00
imwhatiam
54137e5162
[repo setting page] list ALL shared links of this repo / add tabs at left panel
2014-06-10 13:54:51 +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
imwhatiam
a35acab27f
search group at Organization-Groups page
2014-06-10 13:50:24 +08:00
zhengxie
0cc54342c5
Added missing file
2014-06-10 13:39:35 +08:00
zhengxie
3eea0e3647
Replace use message post save signal
2014-06-10 13:34:56 +08:00
zhengxie
dd9f5c04a7
Merge branch 'imwhatiam-del-received-msg'
2014-06-10 11:36:10 +08:00
zhengxie
d30c0a3baa
Refactor user message
2014-06-10 11:35:41 +08:00
zhengxie
1974a195e0
Merge branch 'del-received-msg' of git://github.com/imwhatiam/seahub into imwhatiam-del-received-msg
2014-06-10 10:48:16 +08:00
zhengxie
cba3ff680f
Merge branch '3.0'
...
Conflicts:
seahub/share/views.py
2014-06-10 10:46:24 +08:00
lins05
c625ca3a77
[api] added repo_history_changes api
...
Also include commit_id in events api
2014-06-10 10:14:17 +08:00
llj
f969c465ec
[repo] fixed a small ui bug
2014-06-09 11:39:34 +08:00
xiez
fe576c11a0
Merge pull request #224 from dverbeek84/master
...
Update login.html
2014-06-07 14:35:57 +08:00
xiez
2c3a60ec03
Merge pull request #229 from Malizor/master
...
Allow to preview more audio file formats
2014-06-07 14:34:57 +08:00
Nicolas Delvaux
6cd11ade73
Fix a typo in a comment
2014-06-07 00:57:56 +02:00
Nicolas Delvaux
2c550b53cf
Allow the preview of '.oga' and '.ogg' files, resolves #227
2014-06-07 00:42:05 +02:00
Nicolas Delvaux
42ae9217b7
Recognize '.oga', '.ogg', '.aac', '.ac3', '.wma' and '.flac' as audio files
2014-06-07 00:40:43 +02:00
Danny Verbeek
4f750b19de
Update login.html
...
Sensitive form field has not disabled autocomplete
This may cause security issues.
2014-06-04 12:02:12 +02:00
zhengxie
d1a4eb9a95
[api2] Fix a few typos
2014-06-04 13:53:04 +08:00
poetwang
1a9834228e
[api] Fix Chinese filename encode
2014-06-04 13:42:15 +08:00
llj
c97aa55ac4
[search] rewrote 'highlight keyword in file view'
2014-06-04 11:43:09 +08:00
zhengxie
859fc90f66
Fix copy/move file api argument bug
2014-06-03 17:57:23 +08:00
zhengxie
583a1fa1d2
Fix org repo settings, and org repo related code in api2
2014-06-03 17:49:17 +08:00
zhengxie
7dbd3a68c9
Fix for org repo password flushing and file save as..
2014-05-29 16:50:16 +08:00
zhengxie
8b30eff69e
Fix a few bugs for multi-tenancy
...
Squashed commit of the following:
commit 2d7a7867df01abc2e347ee5b0af957275b367ac2
Author: zhengxie <xiez1989@gmail.com >
Date: Wed May 28 15:48:30 2014 +0800
Fix org virtual repos
commit 85c9981e7f1ac1f15dcc66eada0e482b05b91179
Author: zhengxie <xiez1989@gmail.com >
Date: Tue May 27 16:45:32 2014 +0800
Fix share permission editing in share admin
commit c35efec6f6db7157266537f6cf74b321fb386aab
Author: zhengxie <xiez1989@gmail.com >
Date: Tue May 27 16:35:53 2014 +0800
Fix listing Shared/Group repos
commit 3400118e5778f8840575f02ead560c7f1cb61a00
Author: zhengxie <xiez1989@gmail.com >
Date: Tue May 27 15:05:17 2014 +0800
Fix share/unshare repo to users
commit 4c663ca8767fe34d903ca3828695253eb50f36eb
Author: zhengxie <xiez1989@gmail.com >
Date: Fri May 23 18:33:22 2014 +0800
Fix share/unshare inner pub repos
2014-05-28 16:05:15 +08:00
zhengxie
feb293ab36
Fix unable to log bug in seahub/utils
2014-05-23 15:44:33 +08:00
zhengxie
85c5f3eef8
Remove unused imports
2014-05-23 13:44:53 +08:00
zhengxie
d5f1c76146
Merge branch '3.0'
2014-05-23 13:38:07 +08:00
zhengxie
25a1f4a2c8
Fix user traffic checking bug when record is empty
2014-05-23 13:37:17 +08:00
zhengxie
70fd48e30c
Fix org repo creation bug
2014-05-21 12:07:03 +08:00
zhengxie
fa31c39409
Show error message when change/reset password of ldap user
2014-05-19 11:44:59 +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
5aeae5ffcf
[repo create] enable cache for loading 'repo_crypto.js'
2014-05-17 14:12:52 +08:00
zhengxie
fc81f373fa
Merge branch 'imwhatiam-add-user-from-csv-file'
2014-05-16 17:44:47 +08:00
zhengxie
4dee96b25d
[sysadmin] Refactor user import
2014-05-16 17:43:36 +08:00
zhengxie
97c99498db
Merge branch 'add-user-from-csv-file' of git://github.com/imwhatiam/seahub into imwhatiam-add-user-from-csv-file
2014-05-16 16:33:22 +08:00
zhengxie
811456022b
Refactor group repo related code
2014-05-16 12:29:04 +08:00
zhengxie
fef858cc74
Refactor send notices command
2014-05-15 17:58:14 +08:00
imwhatiam
cb2e8078a3
[notification] new version of email notice
2014-05-15 17:58:14 +08:00
zhengxie
a94a446351
Hash avatar filenames
2014-05-14 15:33:09 +08:00
imwhatiam
0ff15e7a96
[useradmin] add user from csv file
2014-05-09 18:18:08 +08:00
llj
d9ece1ddb0
[repo del] fixed bugs
2014-05-09 15:45:34 +08:00
llj
e026d486dc
[dir share popup] fixed ui problem for languages with long words
2014-05-09 11:56:13 +08:00
xiez
d597bd80d1
Merge pull request #183 from Neurones67/master
...
share views: Fix missing parameter in copy_file
2014-05-09 11:52:19 +08:00
lins05
cec666b130
[api] relax android device id check
...
Android official document says the device id should be 16 chars in hex repr,
but some users report that their device ids is only 14 or 15 chars long.
So we accept any device id with a length of (0,16].
2014-05-08 10:48:03 +08:00
