Daniel Pan
|
ca2bef6e73
|
Improve icon for grid/list mode switch in folder share link
|
2016-03-09 14:05:01 +08:00 |
|
Daniel Pan
|
8c59095071
|
Merge pull request #1054 from haiwen/new-file-dir-api
[api-v2.1] add new file/dir api according to old file/dir api
|
2016-03-09 13:43:34 +08:00 |
|
lian
|
49ed1fd386
|
[api-v2.1] add new file/dir api according to old file/dir api
|
2016-03-09 10:12:16 +08:00 |
|
xiez
|
969537931b
|
Merge pull request #1052 from haiwen/user-options
update get user option
|
2016-03-08 11:01:29 +08:00 |
|
zhengxie
|
e844735cc2
|
[tests] Update tests
|
2016-03-08 10:59:46 +08:00 |
|
lian
|
4197393268
|
update user options
|
2016-03-07 18:14:35 +08:00 |
|
zhengxie
|
56ad0d3f04
|
Fix travis config, and send share link api
|
2016-03-07 16:41:26 +08:00 |
|
zhengxie
|
72d30b2495
|
Merge branch '5.0'
Conflicts:
seahub/api2/endpoints/dir_shared_items.py
seahub/api2/urls.py
seahub/templates/repo.html
seahub/utils/http.py
seahub/views/__init__.py
seahub/views/ajax.py
seahub/views/repo.py
tests/seahub/views/test_libraries.py
|
2016-03-07 16:04:36 +08:00 |
|
lian
|
7823d500e5
|
add dir revert api & update file revert api
|
2016-03-07 15:30:28 +08:00 |
|
xiez
|
cf3619bf92
|
Merge pull request #1047 from haiwen/email
[api2] add send share/upload link api
|
2016-03-07 13:31:57 +08:00 |
|
lian
|
0f311f0c4e
|
[api2] add send share/upload link api
|
2016-03-07 13:23:11 +08:00 |
|
llj
|
dafa52668f
|
Merge pull request #1046 from haiwen/fileicon
Show 24px file icon for low DPI screen
|
2016-03-07 11:52:46 +08:00 |
|
Daniel Pan
|
e124bc6eb6
|
Merge pull request #1050 from haiwen/login_focus
[login] added 'focus' to username input
|
2016-03-05 20:58:54 +08:00 |
|
Daniel Pan
|
69a69f9213
|
Merge pull request #1051 from haiwen/rm_seaf
[search] removed 'seaf' from customed file types
|
2016-03-05 20:58:33 +08:00 |
|
Daniel Pan
|
cdf4454137
|
Merge pull request #1048 from haiwen/grid-view
Grid view
|
2016-03-05 20:58:03 +08:00 |
|
llj
|
4aa50c9aea
|
[search] removed 'seaf' from customed file types
|
2016-03-05 17:55:39 +08:00 |
|
llj
|
4251b85246
|
[login] added 'focus' to username input
|
2016-03-05 17:31:15 +08:00 |
|
llj
|
cefd38b98d
|
[dir view] grid view: bugfix & improvement
|
2016-03-05 16:41:26 +08:00 |
|
llj
|
eaf51187c0
|
[dir view] grid view: show 'name' tip, added magnificPopup preview for images, & etc.
|
2016-03-05 11:19:19 +08:00 |
|
Daniel Pan
|
24e2870831
|
Show 24px file icon for low DPI screen
|
2016-03-04 18:29:12 +08:00 |
|
zhengxie
|
762852a560
|
Upgrade django version
|
2016-03-04 17:22:54 +08:00 |
|
Daniel Pan
|
255c3657f3
|
Merge pull request #1045 from haiwen/5.0-is_safe_url
[utils] Update is_safe_url
|
2016-03-04 17:17:52 +08:00 |
|
zhengxie
|
4d0ac16a47
|
[utils] Update is_safe_url
|
2016-03-04 16:17:47 +08:00 |
|
Daniel Pan
|
f04e152e41
|
Merge pull request #1034 from haiwen/grid-view
Grid view
|
2016-03-03 19:09:35 +08:00 |
|
llj
|
abec40b07c
|
[dir view] clean up views/dirent.js, views/dirent-grid.js
|
2016-03-03 17:47:36 +08:00 |
|
llj
|
9a89536ae5
|
[dir view] enable 'thumbnail' for grid view
|
2016-03-03 16:37:18 +08:00 |
|
llj
|
80d51d4464
|
[dir view] bugfix for 'decrypt lib', position of grid item's op menu, and etc.
|
2016-03-03 11:12:44 +08:00 |
|
Daniel Pan
|
7449608a0f
|
Merge pull request #1040 from haiwen/library-settings
[lib setting] folder perm: add 'add folder', bugfix & etc.
|
2016-03-02 18:33:36 +08:00 |
|
Daniel Pan
|
ce8ed1a4a3
|
Merge pull request #1024 from haiwen/file-shared-link
[api-v2.1] add file share links api
|
2016-03-02 15:09:18 +08:00 |
|
lian
|
c257b6deb8
|
[api2] update err msg of owa api
|
2016-03-02 13:39:25 +08:00 |
|
Daniel Pan
|
81e38a29cf
|
Merge pull request #1041 from haiwen/owa-api
[api2] add new owa file api
|
2016-03-02 11:13:00 +08:00 |
|
lian
|
edd4d96de2
|
[api2] add new owa file api
|
2016-03-02 10:04:59 +08:00 |
|
Daniel Pan
|
707346ce7d
|
Add permission setting dialog
|
2016-03-01 21:24:48 +08:00 |
|
Daniel Pan
|
c28fe89d4e
|
Merge pull request #1042 from haiwen/5.0-user_reset
Update init user reset password, and clean code
|
2016-03-01 21:09:30 +08:00 |
|
Daniel Pan
|
1fa7c8fd5e
|
Add lock/unlock function and fix a bug in DirentGridView menu event binding
|
2016-03-01 17:32:30 +08:00 |
|
zhengxie
|
a14c10a8fc
|
Update init user reset password, and clean code
|
2016-03-01 16:56:24 +08:00 |
|
Daniel Pan
|
d6d514f7e3
|
Merge pull request #1039 from haiwen/default-lib
update admin repo view check
|
2016-02-29 17:27:34 +08:00 |
|
lian
|
9e88a7281b
|
update admin repo view check
|
2016-02-29 17:20:32 +08:00 |
|
llj
|
b90c3d5bf7
|
[lib setting] folder perm: add 'add folder', bugfix & etc.
|
2016-02-29 17:01:12 +08:00 |
|
Daniel Pan
|
463b48c788
|
Make open-via-client in community edition and clean code for file/dir icons
|
2016-02-29 15:29:29 +08:00 |
|
Daniel Pan
|
003838b8f1
|
Fix CSS problems
|
2016-02-28 22:17:08 +08:00 |
|
Daniel Pan
|
3de67a1f15
|
Add rename
|
2016-02-28 19:35:33 +08:00 |
|
Daniel Pan
|
43a5861ea4
|
Add mv/cp to grid view
|
2016-02-28 19:35:33 +08:00 |
|
Daniel Pan
|
3a4ad38ea5
|
Add share dialog
|
2016-02-28 19:35:33 +08:00 |
|
Daniel Pan
|
e5766ec06e
|
Update dirent del function
|
2016-02-28 19:35:32 +08:00 |
|
Daniel Pan
|
f49547bbfe
|
Clean dirent-grid.js
|
2016-02-28 19:35:32 +08:00 |
|
Daniel Pan
|
0a1600a26d
|
Add grid/list view icon font
|
2016-02-28 19:35:32 +08:00 |
|
Daniel Pan
|
23e3d2d088
|
Add right click context menu
|
2016-02-28 19:35:32 +08:00 |
|
Daniel Pan
|
3caeee4c54
|
Add create file/folder in grid view
|
2016-02-28 19:35:32 +08:00 |
|
Daniel Pan
|
5873f1af95
|
Remember view mode in cookie
|
2016-02-28 19:35:32 +08:00 |
|