1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 07:52:14 +00:00
Commit Graph

9655 Commits

Author SHA1 Message Date
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
42a7b06134
Merge pull request #3333 from haiwen/revert-3326-update_txt_file_save_mechanism
Revert "Update txt file save mechanism"
2019-04-19 19:51:26 +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
f898a4fcb7
Merge pull request #3296 from haiwen/oauth-redirect
redirect user back after login
2019-04-19 17:58:40 +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
Daniel Pan
7fd3c07ea5
Merge pull request #3325 from haiwen/mode-grid
Grid view mode four edition
2019-04-19 14:45:09 +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
ilearnit
7e541a7bba fix edit file perm 2019-04-19 06:19:47 +00: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
Daniel Pan
70eb5ca291
Merge pull request #3323 from haiwen/tree-view-contextmenu-improve
repair bug
2019-04-18 18:14:12 +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
Daniel Pan
3abf7fb61b
Merge pull request #3320 from haiwen/update-editor
update Seafile editor version
2019-04-18 17:23:58 +08:00
cainiao222
8361b11353 update rich editor 2019-04-18 17:22:56 +08:00
Michael An
66673b8810 update seafile-editor version 2019-04-18 17:19:47 +08:00
lian
8eae22a58d Revert "add vsd format map to DOCUMENT (#3247)"
This reverts commit 0af2e14e3a.
2019-04-18 16:32:35 +08:00
Daniel Pan
ecb353f7d7
Merge pull request #3319 from haiwen/delete-bug-repair
repair delete bug
2019-04-18 16:22:29 +08:00
shanshuirenjia
5b7794f1da repair delete bug 2019-04-18 16:20:43 +08:00
Daniel Pan
e060f6e602
Merge pull request #3318 from haiwen/fix-shared-with-all
fix shared with all
2019-04-18 16:13:53 +08:00
ilearnit
59a925dd3a fix shared with all 2019-04-18 08:11:01 +00:00
sniper-py
41e132d9ab update_role_emailuser from ccnet_api (#3315) 2019-04-18 16:07:54 +08:00
Daniel Pan
f41410909f
Merge pull request #3316 from haiwen/dirent-menu-bug-repair
repair menu bug
2019-04-18 16:07:37 +08:00