llj
30f098a5c0
[mobile] top bar: modified styles of icons
2018-01-05 14:00:41 +08:00
zhengxie
d37144ef75
Merge branch '6.2'
...
Conflicts:
seahub/templates/base.html
static/scripts/app/views/dir.js
static/scripts/common.js
2017-12-28 15:47:18 +08:00
zhengxie
1d613f070b
Update gitignore
2017-12-28 15:33:04 +08:00
llj
32019fe305
Merge pull request #1963 from haiwen/mv-multi-fix
...
[dir view] mv multi: fix
2017-12-27 16:53:18 +08:00
llj
f88c9c5f74
[dir view] mv multi: fix
2017-12-27 16:49:11 +08:00
xiez
5e1662798d
Merge pull request #1953 from haiwen/lock-file
...
update lock feature
2017-12-27 15:35:36 +08:00
xiez
b3122bffb5
Merge pull request #1961 from haiwen/2fa-login
...
[2fa] login: redesign the UI
2017-12-27 15:22:36 +08:00
zming
9a40039001
abstract
2017-12-27 15:17:42 +08:00
lian
2fe5db8c76
update lock feature
...
Don't allow delete/rename/move a file when it is locked
2017-12-27 15:03:47 +08:00
llj
472e421fe8
[2fa] login: improved UI
2017-12-27 12:01:56 +08:00
Daniel Pan
905bf9976d
Merge pull request #1959 from haiwen/search-file-api
...
update search file api
2017-12-26 13:55:06 +08:00
llj
06894e3e52
[2fa] login: redesign the UI
2017-12-25 16:04:57 +08:00
xiez
baeb8ccacf
Merge pull request #1952 from haiwen/invite-multi
...
[invite people] enable to invite multiple guests at one time
2017-12-25 13:32:42 +08:00
llj
c161be41ad
[invite multi] fixed indentions
2017-12-25 12:09:26 +08:00
Daniel Pan
a6fe949ebc
Merge pull request #1960 from haiwen/new-topbar-icon
...
[mobile] topbar: modified icon styles
2017-12-25 11:42:25 +08:00
llj
2aba574cb6
[mobile] topbar: modified icon styles
2017-12-25 10:55:04 +08:00
Daniel Pan
8f4fe04fc0
Merge pull request #1958 from haiwen/new-topbar-icon
...
[mobile] topbar: replaced icons
2017-12-23 18:09:13 +08:00
lian
4df96ba6dc
update search file api
...
search file in 'all', 'mine', 'shared', 'group', 'public' repos
2017-12-23 16:38:22 +08:00
llj
c061c60522
[mobile] topbar: replaced icons
2017-12-23 14:09:40 +08:00
xiez
70a1e5795b
Merge pull request #1955 from haiwen/storage
...
update multi storage backend feature
2017-12-23 11:57:23 +08:00
xiez
3ff7a3ebfc
Merge pull request #1956 from haiwen/update-config
...
update config to upload more than 1000 files
2017-12-22 16:31:34 +08:00
zming
49312f24bd
update config to upload 1000 files
2017-12-22 13:56:38 +08:00
lian
56ed754646
update multi storage backend feature
...
1. If not enable user role feature OR
haven't configured `storage_ids` option in user role setting:
Return storage info getted from seafile_api.
And always put the default storage as the first item in the returned list.
2. If have configured `storage_ids` option in user role setting:
Only return storage info in `storage_ids`.
Filter out the wrong stotage id(s).
Not change the order of the `storage_ids` list.
2017-12-22 12:59:55 +08:00
zming
9adadb6e7d
tests
2017-12-22 12:13:42 +08:00
zhengxie
11f3fe4835
[locale] Update po files
2017-12-19 16:11:31 +08:00
zhengxie
9dfd2b054a
[locale] Update source files
2017-12-19 15:54:34 +08:00
xiez
e27c7a9114
Merge pull request #1950 from haiwen/multi-backend
...
Multi backend
2017-12-19 15:53:17 +08:00
lian
d4cf67e324
multi storage backend
...
1. add multi storage backend support
2. add 'storage_ids' user role
2017-12-19 15:41:36 +08:00
llj
d621e79bba
[invite people] enable to invite multiple guests at one time
2017-12-19 12:05:51 +08:00
xiez
a4f4535301
Merge pull request #1951 from haiwen/thumbnail
...
return 400 http status code when failed to create thumbnail
2017-12-18 14:27:25 +08:00
lian
75cbfd0e3b
return 400 http status code when failed to create thumbnail
2017-12-18 14:25:06 +08:00
Daniel Pan
531c29d72e
Merge pull request #1948 from haiwen/folder-icon
...
[folder icon] change back to the yellow ones
2017-12-15 13:45:31 +08:00
llj
952b291857
[folder icon] change back to the yellow ones
2017-12-15 13:38:18 +08:00
llj
163a8e3ee7
Merge pull request #1947 from haiwen/search-fix
...
[search result] fixed UI for mobile
2017-12-15 11:48:38 +08:00
llj
352f20a0bb
[search result] fixed UI for mobile
2017-12-15 11:44:54 +08:00
llj
f2326e520b
Merge pull request #1946 from haiwen/fileupload-improvement
...
[fileupload] improvement: always full show the popup when upload file…
2017-12-14 17:26:18 +08:00
llj
a3600ff488
[fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page
2017-12-14 17:23:01 +08:00
llj
0ef2a4def0
Merge pull request #1944 from haiwen/file-view-comment
...
[file view] enable 'click icon button to show/hide comment panel'
2017-12-14 15:06:23 +08:00
llj
3e2895eb60
[file view] enable 'click icon button to show/hide comment panel'
2017-12-14 14:59:24 +08:00
llj
b04205a8da
Merge pull request #1943 from haiwen/sysadmin-links
...
[system admin] links: added 'token'
2017-12-14 11:54:05 +08:00
llj
9729bdca5c
[system admin] links: added 'token'
2017-12-14 11:34:10 +08:00
llj
e0880c65f6
Merge pull request #1942 from haiwen/sysadmin-search
...
[system admin] UI: modified library/user/group/link search
2017-12-13 18:28:53 +08:00
llj
025ace5f55
[system admin] UI: modified library/user/group/link search
2017-12-13 18:18:22 +08:00
Daniel Pan
0dac3d38ca
Merge pull request #1941 from haiwen/feedback
...
added transition to show/hide of feedback messages
2017-12-13 18:15:47 +08:00
xiez
78cd00bd13
Merge pull request #1938 from haiwen/search-link
...
search link
2017-12-13 17:56:57 +08:00
zming
cd260c0718
review
2017-12-13 17:26:50 +08:00
zming
b82c141afe
review again
2017-12-13 14:33:13 +08:00
zming
d246ce70d0
review
2017-12-13 12:06:31 +08:00
llj
b16a829ead
added transition to show/hide of feedback messages
2017-12-12 17:13:01 +08:00
Daniel Pan
dcdfa35584
Merge pull request #1940 from haiwen/mvcp-multi-fix
...
[dir view] mv/cp multi dirents: add feedback msg
2017-12-12 14:10:43 +08:00
