haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-27 03:01:26 +00:00
Code Issues Releases Wiki Activity
9,709 Commits 141 Branches 457 Tags 2.7 GiB
1790940bc8
Commit Graph

1494 Commits

Author SHA1 Message Date
Daniel Pan
38198e63eb
Merge pull request #3592 from haiwen/dir-tool-bug 
repair bug
 2019-05-30 18:00:12 +08:00
shanshuirenjia
64f6ee4411 repair bug 2019-05-30 17:39:18 +08:00
Daniel Pan
c19b24d859
Merge pull request #3589 from haiwen/repair-access-log-bug-2 
Repair access log bug 2
 2019-05-30 16:48:55 +08:00
shanshuirenjia
c832cd0fca repair code error 2019-05-30 16:39:59 +08:00
shanshuirenjia
3e8ce021f8 repair code error 2019-05-30 16:20:03 +08:00
shanshuirenjia
a762d3b9b3 repair access log -bug 2019-05-30 16:12:33 +08:00
zxj96
d485c2c58a Modify variable name 2019-05-30 16:01:18 +08:00
zxj96
f7dee15902 modify some style and parameter 2019-05-30 14:56:39 +08:00
Michael An
df4633040b update 2019-05-30 14:48:25 +08:00
zxj96
3fc5137409 Compare initial size 2019-05-30 14:31:24 +08:00
Michael An
6fa42daacc Update lib-content-toolbar.js 2019-05-30 14:13:23 +08:00
Michael An
fed0b0ca00 delete details choice and fix wiki comment panel 2019-05-30 14:00:51 +08:00
Michael An
382a9e92c4 weixin 2019-05-30 11:38:57 +08:00
Daniel Pan
bbaa587098
Merge pull request #3578 from haiwen/add-comment 
update comment panel
 2019-05-30 11:15:38 +08:00
Daniel Pan
23c64ffaf6
Merge pull request #3582 from haiwen/repaire_insert_img 
Repaire insert img
 2019-05-30 11:11:22 +08:00
zxj96
087f3680ab modify style 2019-05-30 10:57:21 +08:00
zxj96
91da729cb0 repaire file doubleClick bug 2019-05-30 10:45:23 +08:00
Michael An
3b5d9e2e36 update comment panel 2019-05-30 10:38:07 +08:00
zxj96
0e8c2b6283 repaire insert img bug 2019-05-30 10:22:40 +08:00
shanshuirenjia
233a0f1629 repair dir trash bug 2019-05-29 18:44:38 +08:00
zxj96
4c68ee85f3 reult --> result 2019-05-29 16:44:37 +08:00
Daniel Pan
6719b0a7af
Merge pull request #3574 from haiwen/repo-history-update 
[repo history] added 'go back' & etc.
 2019-05-29 16:35:03 +08:00
llj
cc24ce8378 [repo history] added 'go back' & etc. 2019-05-29 16:26:25 +08:00
王健辉
eafbaeed0d repair code 2019-05-29 16:25:40 +08:00
shanshuirenjia
fb53e41a18 optimized code 2019-05-29 15:57:45 +08:00
shanshuirenjia
b83a4fd583 optimized wiki page refresh code 2019-05-29 15:30:21 +08:00
zxj96
21d4dc0cde Replace fileName weith sizeName 2019-05-29 15:20:34 +08:00
zxj96
ae8365854e Solve the problem of inaccurate sorting of the database 2019-05-29 15:11:18 +08:00
zxj96
835fcb8ddb optimization code 2019-05-29 14:43:22 +08:00
王健辉
eed0a5bf73 add has_index 2019-05-29 14:06:13 +08:00
zxj96
8eba860bcb File size sort 2019-05-29 13:57:12 +08:00
Daniel Pan
dbb210f72f
Merge pull request #3569 from haiwen/lib-icons 
[lib icon] added icons for 'preview' & 'cloud-edit' libraries
 2019-05-29 12:33:27 +08:00
llj
801a468c2a [lib icon] added icons for 'preview' & 'cloud-edit' libraries 2019-05-29 12:24:06 +08:00
Michael An
e1e9ca8bd1 fix mobile style (#3567) 2019-05-29 11:48:00 +08:00
杨顺强
9df8ee0d6e Expire validate repair (#3566) 
* repair validate bug

* change limit state checkbox state to disabled

* modify limit share message style
 2019-05-29 10:43:30 +08:00
王健辉
559cd94b7d improve file history (#3564) 2019-05-28 18:21:47 +08:00
Michael An
e92bc848b2 long name comment (#3537) 
* long name comment

* reviewer dialog name
 2019-05-28 17:53:51 +08:00
杨顺强
742a327e1c Add delete message 2 (#3560) 
* add delete Folder(file) message

* add delete my-libs repo message

* add group-view delete repo message

* optimzed code
 2019-05-28 17:48:44 +08:00
zxj96
3959433a8f Standard loading (#3557) 
* Loading circle

* Fix compilation warning

* Change cur-view-content from display:flex to display:block
 2019-05-28 15:16:27 +08:00
Michael An
b0ae1d7812 button align (#3555) 2019-05-28 14:38:29 +08:00
sniper-py
d7c17005b6 Work winxin login and department (#3532) 
* admin work weixin department

* list work weixin department members

* add work-weixin django app

* work weixin login

* add SocialAuthUser model and update uid

* update work weixin departments frontend

* improve admin work weixin login and departments

* add sysadmin react fake view and del sys_file_scan_records_react.html

* user bind work weixin account
 2019-05-28 11:44:19 +08:00
Michael An
5389650033 close side panel in mobile (#3549) 
* close side panel in mobile

* button margin
 2019-05-28 11:22:08 +08:00
杨顺强
28495b9f62 add access log menu item (#3550) 2019-05-28 10:43:17 +08:00
zxj96
025924e5c2 modify upload-remind-dialog.js btn color (#3548) 2019-05-28 10:22:49 +08:00
杨顺强
d057518f5f Share bug repair 2 (#3547) 
* repair share default data bug

* repair folder-img size
 2019-05-28 08:56:13 +08:00
zxj96
2e853b001d Add publish icon (#3544) 
* Add an icon to publish libraries

* use paddingLeft replace tr

* Increase th

* optimization code
 2019-05-27 18:35:34 +08:00
llj
4640cd9e99 [repo history] rewrote it with react (#3541) 
* [repo history] rewrote it with react

* [repo history] update
 2019-05-27 17:48:58 +08:00
Daniel Pan
07881f6ff9
Improve search in file move/copy dialog (#3543) 2019-05-27 17:13:15 +08:00
Michael An
405699d6fd search page style 2019-05-27 15:00:13 +08:00
zxj96
036a165fc6 Add lock btn to dropdown-menu 2019-05-27 11:19:46 +08:00
Michael An
a24c7730bd history page style 2019-05-23 16:04:37 +08:00
Michael An
259e4f0546 adjust my library style in mobile 2019-05-23 11:56:47 +08:00
Michael An
a470f5946b adjust detail panel 2019-05-22 18:37:53 +08:00
Michael An
0a77f2b95a wiki width 2019-05-22 15:22:38 +08:00
Michael An
a778f2bd5f wiki style change 2019-05-22 13:31:08 +08:00
shanshuirenjia
e1a9dc60be repair upload bug 2019-05-21 15:26:57 +08:00
zxj96
a1a08a9fc8 Make create-repo-dialog consistent with share-dialog 2019-05-21 13:31:16 +08:00
Daniel Pan
c680810419
Merge pull request #3500 from haiwen/fix-index-viewer 
not link bug
 2019-05-20 22:12:51 +08:00
Michael An
cbf2fa715e translate slate nodes to tree nodes in wiki page 2019-05-20 18:23:08 +08:00
Daniel Pan
3b7f167bf5
Merge pull request #3499 from haiwen/repo-status-3 
Repo status 3
 2019-05-20 11:13:06 +08:00
shanshuirenjia
9d8d4af420 modify tip style 2019-05-20 10:49:56 +08:00
Daniel Pan
36b244dd7b
Merge pull request #3497 from haiwen/tree-view 
Tree view
 2019-05-20 09:56:42 +08:00
Michael An
049c29209b update 2019-05-19 18:24:06 +08:00
Michael An
86371553c5 update tree class 2019-05-19 17:34:13 +08:00
Michael An
33b0e6a5c8 tree view 2019-05-19 11:21:16 +08:00
Daniel Pan
2b08c6bbb0
Merge pull request #3491 from haiwen/folder-perm 
[folder permission] modification for folder in department repo
 2019-05-17 17:14:02 +08:00
王健辉
ba2ac6ca49 repo-status-interface 2019-05-17 16:30:56 +08:00
shanshuirenjia
8eede90d59 repair code error 2019-05-17 16:04:42 +08:00
llj
553fe1001f [folder permission] modification for folder in department repo 2019-05-17 15:53:59 +08:00
zxj96
cf5894503d Give hint when permission is not enough 2019-05-17 14:47:06 +08:00
zxj96
94246d1d67 Fix bug when fixing enter 2019-05-17 14:17:52 +08:00
Daniel Pan
53a6926b23
Merge pull request #3481 from haiwen/repire_empty_name 
Fix a bug created when the name is empty
 2019-05-17 11:32:20 +08:00
Michael An
61282ab0a9 hide send share btn when press delete link btn 2019-05-17 11:14:40 +08:00
zxj96
e538bbc284 Add new-wiki-dialog.js 2019-05-17 11:11:59 +08:00
zxj96
d70051f087 When it is empty, submit btn is disabled 2019-05-17 11:09:05 +08:00
Daniel Pan
5cd000ecd3
Merge pull request #3484 from haiwen/translation 
modify translation content
 2019-05-17 10:57:32 +08:00
zxj96
a35a0e8abc modify translation content 2019-05-17 10:55:21 +08:00
Daniel Pan
19a9a2ce35
Merge pull request #3476 from haiwen/folder-perm 
Folder perm
 2019-05-17 10:09:42 +08:00
zxj96
398c9f3f96 Fix a bug created when the name is empty 2019-05-17 10:01:57 +08:00
llj
32eac3f826 [folder perm] modification for department repo 2019-05-17 09:14:26 +08:00
llj
4f38429d35 [user setting] modification 2019-05-16 18:23:26 +08:00
llj
31a5e955cc [folder perm] added it for department repo 2019-05-16 17:28:04 +08:00
Daniel Pan
c2ff293ec4
Merge pull request #3474 from haiwen/file-view 
[file view] removed 'open via client'
 2019-05-16 17:19:09 +08:00
llj
8f54bbf6ff [department] folder permission 2019-05-16 14:19:55 +08:00
llj
d3b6789cfa [user setting] modified 'language setting' 2019-05-16 13:53:43 +08:00
llj
057917126e [file view] removed 'open via client' 2019-05-16 12:25:12 +08:00
Daniel Pan
56cdd087b2
Merge pull request #3468 from haiwen/fix-translation 
Fix warnings in org page
 2019-05-16 11:38:29 +08:00
shanshuirenjia
a262e06d3f repair new file bug 2019-05-15 18:43:40 +08:00
Michael An
e7f3ef027a fix org page warnings 2019-05-15 18:31:18 +08:00
Michael An
93a99421bc fix translation and warnings 2019-05-15 18:31:17 +08:00
Daniel Pan
9221d2a7e2
Merge pull request #3471 from haiwen/dl-fixup 
[shared file view] fixed download url for file from shared dir
 2019-05-15 18:31:01 +08:00
llj
f187c101c8 [shared file view] fixed download url for file from shared dir 2019-05-15 18:24:20 +08:00
Michael An
1e96ce74e1 press submit btn then collapse advanced-search 2019-05-15 17:52:31 +08:00
Daniel Pan
126a61b784
Merge pull request #3469 from haiwen/share-admin-bug-repair 
share admin bug repair
 2019-05-15 17:44:50 +08:00
shanshuirenjia
993bff6054 share admin bug repair 2019-05-15 17:40:28 +08:00
Daniel Pan
944bd84b42
Merge pull request #3465 from haiwen/file-view-ui 
[file view] modified UI
 2019-05-15 17:30:39 +08:00
llj
a189369fe5 [file view] modified UI 2019-05-15 16:13:11 +08:00
llj
f9a09e17b6 [user settings] email notice: added explanation 2019-05-15 15:45:34 +08:00
llj
04b1083594 [folder permission] group permission: fixup for 'edit perm' 2019-05-15 15:06:43 +08:00
Michael An
7050e48ec0 translation (#3461) 2019-05-15 12:22:11 +08:00
ilearnit
3a84040870 add sub-folder permission (#3354) 
* add sub-folder permission

* [folder permission] fixup
 2019-05-15 08:01:48 +08:00
zxj96
b5bd705516 Open the edit page when the content is not empty (#3458) 
* Open the edit page when the content is not empty

* Use size instead of content

* change func name

* Replace getMarkdownSize with showColumnMarkdownFile
 2019-05-14 16:58:59 +08:00
Michael An
b266592463 add send share email (#3457) 2019-05-14 16:38:43 +08:00
zxj96
3cc43d9041 Resolve warring (#3454) 
* Resole project warrings

* Delete extra blank lines

* resolve dir-column-nav warnings
 2019-05-14 10:15:09 +08:00
Michael An
9f8fc78d14 fix search page (#3453) 2019-05-13 22:14:41 +08:00
杨顺强
3f0ba9b395 repair share dialog generator share link bug (#3451) 
* repair share dialog generator share link bug

* optimized code

* repair bug
 2019-05-13 20:01:53 +08:00
zxj96
de8cb4cb2d change button color to wiki-delete-dialog (#3452) 2019-05-13 20:01:24 +08:00
zxj96
8d6dfab07a Sharing dialog improvements (#3449) 2019-05-13 18:36:58 +08:00
Michael An
31d39b6fa4 add link choice (#3450) 2019-05-13 17:54:48 +08:00
Michael An
a9453d64dd fix style (#3447) 2019-05-13 17:20:33 +08:00
Michael An
454b6766de fix style (#3448) 2019-05-13 16:28:52 +08:00
llj
d18267344b [user setting] modification 2019-05-13 13:30:39 +08:00
llj
7ad7705b26 [user setting] modification (#3445) 2019-05-13 12:17:40 +08:00
Michael An
30d7542670 fix warnings (#3444) 2019-05-13 11:55:49 +08:00
llj
2d61cdb0cb User setting redesign (#3443) 
* [user settings] modification

* [user setting] side nav: show current item & improvement

* [user stting] webdav password: redesigned it

* [user settings] language setting: redesigned it
 2019-05-13 08:50:05 +08:00
zxj96
edc223e520 Session optimization (#3423) 2019-05-12 15:05:53 +08:00
sniper-py
4539dd88e6 search view by react (#3403) 
* search results react

* adjust style

* adjust style

* update
 2019-05-11 22:43:54 +08:00
Michael An
0a232cebff fix warnings (#3441) 2019-05-11 20:38:17 +08:00
songjiaqi1
beb841926a fix warning (#3440) 2019-05-10 20:34:48 +08:00
杨顺强
c813347030 optimized css style (#3439) 2019-05-10 16:53:24 +08:00
zxj96
4d00ba9d58 Column update (#3434) 2019-05-10 15:40:01 +08:00
shanshuirenjia
27e4aca544 update empty-published lib tip 2019-05-10 15:05:21 +08:00
王健辉
2d552a9351 repair code 2019-05-10 12:10:10 +08:00
王健辉
60034a0dae add get all departments api 2019-05-09 21:26:20 +08:00
王健辉
3b60ab2b67 transfer repo to department 2019-05-09 15:38:44 +08:00
Daniel Pan
fd08ab181c
Merge pull request #3432 from haiwen/update-data 
Automatically update pages without having to manually update the page
 2019-05-09 15:26:40 +08:00
zxj96
893adc8f49 Automatically update pages without having to manually update the page 2019-05-09 14:49:21 +08:00
sniper-py
51a14db321 show nickname in revoke org admin success message (#3429) 2019-05-09 14:46:23 +08:00
sniper-py
94cac47ab1 admin add org user required nickname (#3425) 2019-05-09 12:10:17 +08:00
Daniel Pan
07f4c7c27e
Merge pull request #3406 from haiwen/button-sequence 
add lock button and adjust sequence
 2019-05-08 19:54:08 +08:00
Michael An
490989718a update 2019-05-08 17:59:26 +08:00
Daniel Pan
7eeaca6027
Merge pull request #3428 from haiwen/update-dialog 
dialog input autofocus
 2019-05-08 17:39:22 +08:00
shanshuirenjia
44087c4314 repair password-bug 2019-05-08 17:15:50 +08:00
Michael An
2ab8c9acfd update 2019-05-08 16:11:36 +08:00
Michael An
c1e86e937a dialog input autofocus 2019-05-08 15:34:23 +08:00
Michael An
96c678c870 add lock button and adjust sequence 2019-05-08 13:54:57 +08:00
llj
cd2a73eee5
Merge pull request #3421 from haiwen/user-setting-m 
[user settings] modification
 2019-05-08 11:06:10 +08:00
llj
309305bdc9 [user settings] modification 2019-05-08 10:59:27 +08:00
Daniel Pan
61d2fadc52
Merge pull request #3420 from haiwen/dtable-store-improve 
Dtable store improve
 2019-05-07 21:24:32 +08:00
shanshuirenjia
3bfaea8914 optimized code 2019-05-07 21:15:37 +08:00
Daniel Pan
e5155a79b7
Merge pull request #3419 from haiwen/modify-download-link 
Change dl to dl=1
 2019-05-07 20:20:17 +08:00
zxj96
c94ee98c58 Change dl to dl=1 2019-05-07 18:28:42 +08:00
shanshuirenjia
615330980f optimized code 2019-05-07 17:58:53 +08:00
Daniel Pan
1dd6edfe53
Merge pull request #3414 from haiwen/user-settings 
[user settings] rewrote it with react
 2019-05-07 15:31:54 +08:00
llj
f4725faf0b [user settings] rewrote it with react 2019-05-07 14:57:22 +08:00
Daniel Pan
369888ec1c
Merge pull request #3405 from haiwen/move-file-list 
Move file list
 2019-05-07 12:38:21 +08:00
zxj96
12ac2d3c24 Add a semicolon 2019-05-07 10:14:29 +08:00
zxj96
cd56076f0d Modify some formatting issues 2019-05-07 10:06:24 +08:00
shanshuirenjia
690cd7a4c7 revert component file 2019-05-06 17:36:05 +08:00
shanshuirenjia
a82d70a18a delete error code 2019-05-06 17:36:05 +08:00
shanshuirenjia
0a8a176cc4 rename component 2019-05-06 17:36:05 +08:00
shanshuirenjia
6c8f43c6be rename component 2019-05-06 17:35:44 +08:00
shanshuirenjia
a115c4990e change api 2019-05-06 17:35:44 +08:00
shanshuirenjia
e2c1a26c34 add data api 2019-05-06 17:35:44 +08:00
shanshuirenjia
abdaeb8683 Packaged data interface 2019-05-06 17:34:52 +08:00
Daniel Pan
f6def3868a
Merge pull request #3400 from haiwen/org-page 
Org page
 2019-05-06 17:21:00 +08:00
Michael An
19f41c2b06 update 2019-05-06 16:57:05 +08:00
Daniel Pan
51b9e55536
Merge pull request #3411 from haiwen/share-module-improve 
repair generator password bug
 2019-05-06 16:49:40 +08:00
shanshuirenjia
deb68ee365 repair generator password bug 2019-05-06 16:08:34 +08:00
Leo
d9b62c8555 add can publish repo permission (#3402) 
add can_publish_repo user role permission
 2019-05-06 15:50:44 +08:00
Daniel Pan
e6ea2aa129
Merge pull request #3408 from haiwen/save-improvement 
react-grid-data interaction improvement
 2019-05-06 15:26:13 +08:00
Michael An
4f426988a1 fix add admin dialog bug 2019-05-06 14:29:19 +08:00
sniper-py
80d75e2d74 Library can not be transferred to owner. (#3404) 2019-05-06 13:58:23 +08:00
Michael An
5a4d437dd4 update codes 
fix warnings
 2019-05-06 13:45:11 +08:00
zxj96
1becee4041 react-grid-data interaction improvement 2019-05-06 13:28:34 +08:00
zxj96
3b2c834209 modify code 2019-05-06 10:06:49 +08:00
Michael An
9574c5943f move dialog 2019-05-05 17:43:22 +08:00
zxj96
00c35d011f File move to list view and inaccurate refresh after moving 2019-05-05 17:20:37 +08:00
shanshuirenjia
d70bb96195 repair code error 2019-05-05 13:25:02 +08:00
shanshuirenjia
f4d048f16e repair code error 2019-05-05 13:16:32 +08:00
shanshuirenjia
45daa70089 repair new department bug 2019-05-05 12:00:41 +08:00
Michael An
b183c7c3ab update main panel 2019-05-03 10:03:04 +08:00
Michael An
1ef0cdd68c add main panel topbar 2019-05-03 10:03:04 +08:00
Michael An
400f4e4aea use Link instead A tag 2019-05-03 10:03:03 +08:00
Michael An
9d2ad20767 fix groupID 2019-05-03 10:03:03 +08:00
Michael An
5c1b94df84 fix org logs time 2019-05-02 17:33:31 +08:00
Michael An
ace95037e2 fix next page 2019-04-30 18:17:00 +08:00
Daniel Pan
7262413d21
Merge pull request #3395 from haiwen/file-view 
[file view] modification for browser compatibility
 2019-04-30 12:18:13 +08:00
llj
2347e517be [file view] modification for browser compatibility 2019-04-30 12:14:23 +08:00
Michael An
7c2fb46e31 fix-org-member 2019-04-30 11:48:24 +08:00
Michael An
9fbd04e74c adjust button position 2019-04-30 11:26:32 +08:00
shanshuirenjia
29856a30e7 delete unnecessary class name 2019-04-30 10:08:30 +08:00
shanshuirenjia
20c183c2b3 optimized css style 2019-04-29 21:11:58 +08:00
Michael An
4ccae5ed73 fix org scroll 2019-04-29 17:26:48 +08:00
Daniel Pan
1c5aa513fc
Merge pull request #3254 from haiwen/add-inviti-people 
init invite people
 2019-04-29 16:17:14 +08:00
Daniel Pan
9acb051f04
Merge pull request #3390 from haiwen/fix-tag-Zindex 
Add z-index
 2019-04-29 15:57:52 +08:00
杨顺强
d4871da49e
Merge pull request #3389 from haiwen/resolve-list-bug 
Solve browser scaling bugs
 2019-04-29 14:48:24 +08:00
zxj96
701eec1adc Solve browser scaling bugs 2019-04-29 14:22:20 +08:00
shanshuirenjia
a1abe1893b delete data grid translate 2019-04-29 14:15:28 +08:00
Daniel Pan
520bd5c3e1
Merge pull request #3386 from haiwen/delete-drafts 
Do not display the drafs button when isDocs=false
 2019-04-29 11:24:37 +08:00
zxj96
1813865831 Change variable name 2019-04-29 11:14:53 +08:00
Daniel Pan
092579a21a
Merge pull request #3377 from haiwen/change-group 
select groups
 2019-04-29 10:24:08 +08:00
Daniel Pan
93f75c71ec
Merge pull request #3384 from haiwen/thumbnail-center 
Thumbnail center
 2019-04-29 10:22:57 +08:00
Daniel Pan
dc1806ded9
Merge pull request #3380 from haiwen/data-grid-bug-repair 
repair delete column bug
 2019-04-29 10:21:54 +08:00
zxj96
f97c1d10f3 Add semicolon 2019-04-29 10:21:38 +08:00
shanshuirenjia
5c1c5dcae8 repair data-grid-scroll bug 2019-04-29 10:17:43 +08:00
Michael An
9be08051ea select groups 2019-04-29 10:09:38 +08:00
zxj96
8f823e06e7 modify dir-icon width 2019-04-29 10:06:32 +08:00
zxj96
9133097f62 Set dir-icon to a width 2019-04-28 16:54:28 +08:00
shanshuirenjia
b21007aa26 repair code bug 2019-04-28 16:21:06 +08:00
sniper-py
22bb7b211f invite link in popup 2019-04-28 14:19:50 +08:00
shanshuirenjia
63b42a83d2 repair delete column bug 2019-04-28 12:00:08 +08:00
Michael An
87f9afc047 fix prop typs 2019-04-28 11:59:13 +08:00
sniper-py
86b7a6c861 Invitations Modal 2019-04-28 11:30:43 +08:00
ilearnit
b119d78dfb init invite people 2019-04-28 11:30:43 +08:00
Michael An
155c7bef49 add z-index detail panel 2019-04-28 10:59:56 +08:00
zxj96
a558668f41 Do not display the drafs button when isPro=false 2019-04-28 10:59:19 +08:00
shanshuirenjia
5a04a22ad6 open draft in new window 2019-04-26 17:08:16 +08:00
Daniel Pan
169fd8af3d
Merge pull request #3369 from haiwen/fix-wiki-bug 
fix index.md bug && update url wikis-->published
 2019-04-26 16:04:44 +08:00
Daniel Pan
822c982935
Merge pull request #3374 from haiwen/update-history-ui 
fix history page
 2019-04-26 15:42:22 +08:00
王健辉
a51fdb51c7 fix code 2019-04-26 15:34:22 +08:00
Michael An
ca55562bbc fix history page 2019-04-26 15:33:11 +08:00
Daniel Pan
5e9785e3fc
Merge pull request #3373 from haiwen/fix-file-history-page-bug 
fix file history page bug
 2019-04-26 14:42:52 +08:00
王健辉
7bd80c7a0c fix file history page bug 2019-04-26 14:35:30 +08:00
Michael An
f9e451de7e org user gettext 2019-04-26 14:27:42 +08:00
Michael An
4641cb2c9d update 2019-04-26 12:12:01 +08:00
ilearnit
fdff270e5c fix index.md bug && update url wikis-->published 2019-04-26 04:04:52 +00:00
Daniel Pan
ee419a6048
Merge pull request #3331 from haiwen/file-history-page-rewirte 
file history page rewrite
 2019-04-26 11:40:41 +08:00
zxj96
93c19384ee Center the thumbnail 2019-04-26 11:34:52 +08:00
shanshuirenjia
b176873974 optimized onsearched handle 2019-04-26 11:34:11 +08:00
Daniel Pan
2c6cf81159
Merge pull request #3368 from haiwen/add-org-exit 
add org admin exit
 2019-04-26 10:58:52 +08:00
ilearnit
f560bc138e add org admin exit 2019-04-26 02:27:43 +00:00
Daniel Pan
f0cab10129
Merge pull request #3367 from haiwen/data-grid-improve-2 
Data grid improve 2
 2019-04-26 10:21:17 +08:00
shanshuirenjia
fd7343ed39 add contextmenu style 2019-04-26 07:45:07 +08:00
shanshuirenjia
109afb9058 complete data-grid improve 2019-04-26 07:16:01 +08:00
Daniel Pan
779bc6eceb
Merge pull request #3362 from haiwen/delete-share-btn 
Delete share btn
 2019-04-25 20:14:37 +08:00
zxj96
bea5cadddf optimization code to dirent-list-item 2019-04-25 18:40:27 +08:00
zxj96
b79894cb72 optimization code 2019-04-25 18:28:52 +08:00
Michael An
0e1b95617e update 2019-04-25 17:08:55 +08:00
zxj96
2c83d6882c modify bug to mutiple-dir-operation-toolbar 2019-04-25 17:04:31 +08:00
Michael An
804109cfa1 add search icon 2019-04-25 16:50:40 +08:00
zxj96
9f0bf9aba0 Add judgement from cdoc-editor-topbar 2019-04-25 16:45:23 +08:00
zxj96
4002e1aad0 modify some style 2019-04-25 16:29:41 +08:00
zxj96
17dba3e3c7 When canGenerateShareLink is equal to false delete share 2019-04-25 15:09:28 +08:00
Michael An
f7e3b13f09 adjust new file suffix 2019-04-25 13:43:51 +08:00
Michael An
3f67bd62e4 update 2019-04-25 11:32:20 +08:00
Michael An
eaeb75fddc adjust style 2019-04-25 10:50:06 +08:00
王健辉
0d2f5cc5ed repair code 2019-04-24 21:27:12 +08:00
Michael An
e95a2cedb8 use inner link 2019-04-24 17:24:11 +08:00
Daniel Pan
abff0ecad5
Merge pull request #3356 from haiwen/fix-collab 
collaborate server button
 2019-04-24 15:33:00 +08:00
Daniel Pan
88a86409d3
Merge pull request #3357 from haiwen/fix-tag 
change translation
 2019-04-24 15:31:16 +08:00
Daniel Pan
e9201be344
Merge pull request #3349 from haiwen/list-optimization 
List optimization
 2019-04-24 15:27:04 +08:00
zxj96
d2d23379ba merge code 2019-04-24 15:24:27 +08:00
zxj96
813a702ab5 modify function name 2019-04-24 15:16:26 +08:00
王健辉
ed4ca6bc4e transform size 2019-04-24 14:49:39 +08:00
zxj96
0c4dea01c5 Remove spaces 2019-04-24 14:42:29 +08:00
zxj96
9cd68756ff Restore code 2019-04-24 14:39:46 +08:00
Michael An
9e3d1c38e5 change translation 2019-04-24 14:30:28 +08:00
zxj96
c7d9eb8ec0 Display quantity up 2019-04-24 13:52:09 +08:00
zxj96
870c32113c Use one variable instead of two 2019-04-24 13:37:48 +08:00
王健辉
11c8aef036 add more button 2019-04-24 11:55:48 +08:00
zxj96
2e9ff52024 style modify 2019-04-24 10:33:33 +08:00
zxj96
9c3c63c743 Modify some format 2019-04-24 10:24:09 +08:00
zxj96
301effa623 optimization code 2019-04-24 10:10:28 +08:00
Michael An
e3d3b242b8 fix file suffixes 2019-04-23 22:59:55 +08:00
Michael An
31228181bf add file filter 2019-04-23 17:31:40 +08:00
zxj96
978288eb39 Modify some naming conventions 2019-04-23 16:50:17 +08:00
Michael An
2eb1e15b05 insert iamge 2019-04-23 16:45:39 +08:00
zxj96
791713a746 delete direntList.lenght to dirent-grid-view.js 2019-04-23 16:04:28 +08:00
zxj96
7245d9dcc5 modify state 2019-04-23 15:58:06 +08:00
zxj96
42362e9ece delete ref 2019-04-23 15:51:47 +08:00
zxj96
56cf16108d Modify some naming 2019-04-23 15:32:11 +08:00
zxj96
624871fc9c Use state change directory array 2019-04-23 14:43:47 +08:00
Daniel Pan
309aa08ce8
Merge pull request #3346 from haiwen/repo-label 
[my libs] added 'label current state'
 2019-04-23 13:57:46 +08:00
Michael An
d0ca3f2344 collab server 2019-04-23 13:55:07 +08:00
llj
95daaded6f [my libs] added 'label current state' 2019-04-23 13:34:49 +08:00
王健辉
972f3cf91d modify error describe 2019-04-23 11:53:27 +08:00
王健辉
91fe132354 modify res data judge 2019-04-23 11:53:26 +08:00
王健辉
02fa5933f2 repair code 2019-04-23 11:53:26 +08:00
王健辉
4cdc2d3e82 load rename history records && more history records 2019-04-23 11:53:26 +08:00
王健辉
cffda3ebf9 file history page rewrite 2019-04-23 11:53:26 +08:00
Daniel Pan
22f7daa8b0
Merge pull request #3345 from haiwen/dirent-item-improve 
Dirent item improve
 2019-04-23 10:51:35 +08:00
shanshuirenjia
4c37bc0363 repair grid-item locked bug 2019-04-23 10:49:07 +08:00
shanshuirenjia
32b7234051 repair locked bug 2019-04-23 10:32:12 +08:00
Daniel Pan
db4a866c98
Merge pull request #3343 from haiwen/update_txt_file_save_mechanism 
fix canEdit in read only and lock
 2019-04-23 10:06:13 +08:00
LeoSirius
7aec581ab5 fix canEdit in read only and lock 2019-04-22 22:11:26 +08:00
shanshuirenjia
05ebc4936b repair history.back bug 2019-04-22 18:39:44 +08:00
zxj96
002c3a0dcc Large catalog optimization 2019-04-22 18:34:36 +08:00
Daniel Pan
ee16a419b1
Merge pull request #3341 from haiwen/publish-library 
adjust publish repo
 2019-04-22 18:34:13 +08:00
Michael An
b0790ab3e2 adjust publish repo 2019-04-22 18:31:27 +08:00
Daniel Pan
c41ae34f0d
Merge pull request #3340 from haiwen/app-nav-improve 
repair history.back&history.go bug
 2019-04-22 18:13:27 +08:00
shanshuirenjia
88e480b575 repair history.back&history.go bug 2019-04-22 18:05:18 +08:00
Daniel Pan
19a6f20098
Merge pull request #3336 from haiwen/fix-delete-tag-bug 
fix delete file tag
 2019-04-22 16:17:28 +08:00
Daniel Pan
f41017be9e
Merge pull request #3338 from haiwen/menu-improve 
Menu improve
 2019-04-22 15:21:01 +08:00
shanshuirenjia
c4165798c4 improve class naming 2019-04-22 15:15:51 +08:00
shanshuirenjia
8b05873b37 improve code 2019-04-22 14:00:16 +08:00
Michael An
223b84edda fix rename file tag bug 2019-04-22 13:42:22 +08:00
Daniel Pan
a8852dccc2
Merge pull request #3334 from haiwen/update_txt_file_save_mechanism 
fix warning in other format of files
 2019-04-22 13:32:43 +08:00
shanshuirenjia
2f0ea56aa8 optimized code 2019-04-22 12:18:35 +08:00
LeoSirius
0de9829258 add space between buttons 2019-04-22 12:12:43 +08:00
Michael An
17744246c3 fix file count 2019-04-22 12:07:45 +08:00
Michael An
6035d53b4c fix delete file tag 2019-04-22 11:46:16 +08:00
Daniel Pan
5dda067933
Merge pull request #3332 from haiwen/Add-container-contextmenu 
Add container contextmenu
 2019-04-22 11:39:04 +08:00
zxj96
6a17bb284d Modify function naming 2019-04-22 11:34:51 +08:00
LeoSirius
571eb92766 optimize code detail 2019-04-22 11:31:39 +08:00
shanshuirenjia
ddb7ec369e delete item-dropdown-menu unnecessary code 2019-04-22 11:19:26 +08:00
zxj96
24990fd9e9 Add icon to about 2019-04-22 11:11:08 +08:00
LeoSirius
e8185211f3 update txt saving mechanism to mobile client 2019-04-22 11:04:08 +08:00
Daniel Pan
01e5030205
Merge pull request #3309 from haiwen/fix-warnings 
fix warnings
 2019-04-22 10:42:26 +08:00
shanshuirenjia
546313a3a7 revert code to last version 2019-04-22 10:29:41 +08:00
Michael An
ed118d330b fix tag error 2019-04-22 10:19:17 +08:00
zxj96
3068a826d3 Content level centered 2019-04-22 10:16:41 +08:00
zxj96
3c925ec3b2 Use the same parameter 2019-04-22 09:57:33 +08:00
zxj96
de872cbf7e Modify some code structure 2019-04-21 20:42:39 +08:00
zxj96
8e389ca7bc Modify some code structure 2019-04-21 20:41:14 +08:00
shanshuirenjia
025fe6e29d repair bug 2019-04-21 17:56:55 +08:00
shanshuirenjia
57d3865c7f repair bug 2019-04-21 17:31:28 +08:00
shanshuirenjia
3a3b9e213a improve tree-node-menu code 2019-04-21 16:44:15 +08:00
shanshuirenjia
d90d486864 delete unnecessary code 2019-04-21 16:29:26 +08:00
shanshuirenjia
79462f5fd3 package text-dropdown-menu for text-button dropdown menu 2019-04-21 16:27:20 +08:00
shanshuirenjia
a3c9ae98b7 repair import bug 2019-04-21 16:25:43 +08:00
shanshuirenjia
bafc77f17e rename dropdown-menu to item-dropdown-menu 2019-04-21 15:23:32 +08:00
shanshuirenjia
da09d856cc optimized toolbar more operation menu 2019-04-21 14:02:12 +08:00
shanshuirenjia
681adcf27b improve dropdown-menu 2019-04-21 13:57:58 +08:00
shanshuirenjia
c827c880f9 package drop-down menu component 2019-04-21 10:43:34 +08:00
LeoSirius
dc81840916 delete extra blanks 2019-04-19 22:44:41 +08:00
LeoSirius
9df8dcf64f fix with confilt files 2019-04-19 22:40:47 +08:00
LeoSirius
993885fc39 fix 2019-04-19 22:32:19 +08:00
Leo
5a5c98dbbf
Merge branch 'master' into update_txt_file_save_mechanism 2019-04-19 21:59:11 +08:00
LeoSirius
58440a94b9 fix warning in other format of files 2019-04-19 21:32:54 +08:00
Daniel Pan
b95e5075c6
Revert "Update txt file save mechanism" 2019-04-19 19:51:11 +08:00
zxj96
430d99d9f3 modify some code 2019-04-19 18:45:49 +08:00
Daniel Pan
8317d40f71
Merge pull request #3326 from haiwen/update_txt_file_save_mechanism 
Update txt file save mechanism
 2019-04-19 18:42:51 +08:00
zxj96
3e0a8620dd Add drag from dirent-grid-item 2019-04-19 18:40:31 +08:00
LeoSirius
001235945f optimize code detail 2019-04-19 18:30:28 +08:00
Daniel Pan
52fd986b31
Merge pull request #3327 from haiwen/fix-mobile-markdown 
fix mobile style
 2019-04-19 17:51:11 +08:00
zxj96
ca7857e654 Add the ability to create files and selected states 2019-04-19 17:36:37 +08:00
Daniel Pan
be2d44c1dc
Merge pull request #3329 from haiwen/fix-add-draft-perm 
fix add / publish draft
 2019-04-19 16:48:14 +08:00
Daniel Pan
fafbf39759
Merge pull request #3330 from haiwen/delete-new-draft-func 
delete create draft module
 2019-04-19 16:47:30 +08:00
ilearnit
4d6467c697 fix add / publish draft 2019-04-19 08:19:01 +00:00
Michael An
63f4b93d6f adjust small screen button position 2019-04-19 16:00:21 +08:00
shanshuirenjia
f3d3cd331b repair new draft bug 2019-04-19 15:50:27 +08:00
Daniel Pan
270b0dff8a
Merge pull request #3324 from haiwen/file-view-mobile 
[file view] modification for mobile
 2019-04-19 15:11:45 +08:00
Daniel Pan
065aa840d4
Merge pull request #3328 from haiwen/fix-edit-file-perm 
Fix edit file permission
 2019-04-19 14:52:26 +08:00
Michael An
c9c07dce85 cloud-edit fix 2019-04-19 14:44:24 +08:00
Michael An
0a180c086a fix margin 2019-04-19 14:36:58 +08:00
zxj96
31bf2fd41f delete create-file code 2019-04-19 12:01:47 +08:00
LeoSirius
fad00989f1 optimize save button's status 2019-04-19 11:57:07 +08:00
zxj96
dceb0a5e5b Add return[] from dirent-grid-view.js 2019-04-19 11:06:25 +08:00
zxj96
4852f850ab Modify format 2019-04-19 10:56:37 +08:00
zxj96
ad1ec11039 modify dirent-grid-item.js 2019-04-19 09:57:45 +08:00
zxj96
c39eea699f modify img position 2019-04-19 09:54:29 +08:00
zxj96
9965735be3 Grid view mode four edition 2019-04-18 22:36:07 +08:00
llj
7a0bcfc8e4 [file view] modification for mobile 2019-04-18 18:19:54 +08:00
LeoSirius
cdc9d4865e change the mechanism of saving txt file, use md file's way of saving 2019-04-18 18:18:11 +08:00
shanshuirenjia
14b3257534 prveventDefault event 2019-04-18 18:10:34 +08:00
shanshuirenjia
c30aac483a repair bug 2019-04-18 18:02:40 +08:00
Daniel Pan
24b10652ac
Merge pull request #3322 from haiwen/dirent-menu-improve 
repair cloud-edit&perview bug
 2019-04-18 17:37:34 +08:00
Daniel Pan
a9033b8a37
Merge pull request #3321 from haiwen/editor-update 
Editor update
 2019-04-18 17:36:29 +08:00
shanshuirenjia
959001b1bf repair cloud-edit&perview bug 2019-04-18 17:32:34 +08:00