1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-10 13:44:02 +00:00
Commit Graph

5247 Commits

Author SHA1 Message Date
llj
c39b0b5ff3 rm unused files 2016-07-11 17:03:58 +08:00
Daniel Pan
70692d1fb6 Merge pull request #1267 from haiwen/wopi
[OWA] udpate permission when view file via OWA
2016-07-05 14:03:13 +08:00
Daniel Pan
708cb750cc Merge pull request #1262 from haiwen/download-dir-zip
update download dir/multi
2016-07-04 17:52:46 +08:00
llj
f9500c4f61 [download zip] improvement, bugfix 2016-07-04 15:40:11 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
lian
8ccf782728 [OWA] udpate permission when view file via OWA 2016-07-01 17:18:09 +08:00
xiez
1e3b088e30 Merge pull request #1268 from haiwen/update-test
update share/upload link test
2016-07-01 17:17:27 +08:00
lian
369c9f3bf8 update share/upload link test 2016-07-01 17:06:27 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
Daniel Pan
70021ebc18 Merge pull request #1264 from haiwen/transfer-repo-comment
[transfer repo] add more comment
2016-06-29 15:21:45 +08:00
lian
f39333c8c7 [transfer repo] add more comment 2016-06-29 15:17:48 +08:00
Daniel Pan
523c76864c Merge pull request #1263 from haiwen/transfer-repo
update repo share
2016-06-29 14:52:31 +08:00
lian
ed10512a53 update repo share
1. reshare repo after user/admin transfer repo
2. show org repo share out list at share popup in org mode
2016-06-28 16:49:41 +08:00
Daniel Pan
85bb2cd076 Merge pull request #1261 from haiwen/enhancement/user_permissions
Add role permissions
2016-06-28 14:38:25 +08:00
Daniel Pan
8f4b7648ac Fix license file 2016-06-28 10:03:26 +08:00
Daniel Pan
a57e8b798c Fix the license file 2016-06-28 10:00:15 +08:00
zhengxie
528b33ec0e Add role permissions 2016-06-27 16:41:55 +08:00
zhengxie
421725c4c8 Fix tests 2016-06-27 13:44:15 +08:00
xiez
3259a9255c Merge pull request #1260 from haiwen/update-device-test
update admin device test
2016-06-27 12:08:32 +08:00
lian
38c5485dd5 update admin device test 2016-06-27 11:59:01 +08:00
xiez
7204849d7f Merge pull request #1121 from haiwen/2fa
support two factor authentication
2016-06-27 11:05:23 +08:00
Daniel Pan
e7aaae4363 Merge pull request #1251 from haiwen/trash-pagination
[system admin] trash repos: list by page
2016-06-27 11:01:44 +08:00
llj
b2cda939aa UI fix (#1257) 2016-06-23 16:48:29 +08:00
llj
1a2cfee678 For mobile (#1255)
* [UI] bugfix; modified 'file view'

* [for mobile] modified shared/history file view

* modified 'header', 'dir view' for mobile
2016-06-22 16:51:03 +08:00
Daniel Pan
cf1017513a Code clean (#1217)
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
Daniel Pan
fd742d6b02 Merge pull request #1252 from haiwen/file-api
update file api
2016-06-20 18:31:17 +08:00
lian
8de5551991 update file api
1. return checked file name when creat a new file
2. update test
2016-06-20 18:19:53 +08:00
llj
18a800cb5d [system admin] trash repos: list by page 2016-06-20 15:47:26 +08:00
Daniel Pan
8dba980b2e Merge pull request #1244 from haiwen/file-dir-api-endpoint
[api-2.1] update file/dir api
2016-06-20 14:02:48 +08:00
lian
8af68348c3 [api2] check parent dir permission when in FileView 2016-06-17 18:33:40 +08:00
lian
3716c76750 [api-2.1] update file/dir api 2016-06-17 18:26:35 +08:00
Daniel Pan
c6bf00bde0 Merge pull request #1249 from haiwen/new-help
[help] new help
2016-06-17 16:35:27 +08:00
llj
9e2617e77b [help] new help 2016-06-17 15:29:15 +08:00
Daniel Pan
b28413a38b Merge pull request #1247 from haiwen/change-wiped-at-to-datetime-field
Updated wiped_at field to a DateTime type.
2016-06-17 12:10:22 +08:00
Shuai Lin
313216cde3 Updated wiped_at field to a DateTime type. 2016-06-17 11:51:11 +08:00
Daniel Pan
ca96fc1db9 Merge pull request #1243 from haiwen/admin-devices
[sysadmin] devices: fix & improvement
2016-06-16 10:51:29 +08:00
llj
8c0707c647 [sysadmin] devices: fix & improvement 2016-06-16 10:44:16 +08:00
Daniel Pan
54d1719857 Merge pull request #1242 from haiwen/dropdown-improvement
[dropdown widget] improved menu position
2016-06-15 19:58:56 +08:00
llj
341d029b9f [dropdown widget] improved menu position 2016-06-15 17:20:21 +08:00
Daniel Pan
5487461541 Merge pull request #1241 from haiwen/revert-1240-dir-file-api
Revert "[api2] update return info when create new file/dir"
2016-06-15 13:25:12 +08:00
Daniel Pan
bfd4a8a174 Revert "[api2] update return info when create new file/dir" 2016-06-15 12:26:48 +08:00
Daniel Pan
bca2226c25 Merge pull request #1240 from haiwen/dir-file-api
[api2] update return info when create new file/dir
2016-06-15 11:03:02 +08:00
lian
ffdb9ad490 [api2] update return info when create new file/dir 2016-06-15 10:18:26 +08:00
Shuai Lin
4af51464ab 2fa: fixed api undefined variable error. 2016-06-14 15:32:23 +08:00
Daniel Pan
2bff5ef75a Merge pull request #1209 from haiwen/admin-repos
new admin libraries page
2016-06-14 14:59:22 +08:00
lian
483c29ab92 update args check when search/delete repos 2016-06-14 14:47:44 +08:00
llj
2758713cea [system repo admin] modification 2016-06-14 14:47:44 +08:00
llj
8c2e16ca36 [system repo admin] fix, improvement, supplement, clean 2016-06-14 14:47:44 +08:00
lian
a767aeb3d8 update 2016-06-14 14:47:02 +08:00
lian
72f4297934 new admin libraries page 2016-06-14 14:46:13 +08:00