1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 15:23:05 +00:00
Commit Graph

7294 Commits

Author SHA1 Message Date
shanshuirenjia
54a01b495b repair the mobile menu's bug (#2268) 2018-08-08 16:53:26 +08:00
ilearnit
1e0c9984e6 [dist] frontend 2018-08-08 16:15:28 +08:00
llj
f096ccdf3d [group owned repo] enable dir private share for sub folders 2018-08-08 15:37:11 +08:00
zhengxie
864b4da11d Merge branch '6.3'
Conflicts:
	seahub/urls.py
2018-08-08 10:40:48 +08:00
zheng xie
8d5fcd0557
6.3 fix test (#2264)
* wip: Fix tests

* [tests] Update
2018-08-08 10:22:26 +08:00
guopengda
bd8a6a6105 clean_url_frefix (#2251) 2018-08-07 14:13:13 +08:00
llj
bc7184f75b [folder perm] fixup for 'path' 2018-08-07 12:22:36 +08:00
zhengxie
efbfbb42c7 [requirements] Update django to 1.11.15 2018-08-07 10:19:57 +08:00
Daniel Pan
65a659876f Improve css of wiki page 2018-08-06 23:58:23 +08:00
Daniel Pan
fa38dd9151
Rewrite wiki page with react (#2258) 2018-08-06 18:29:12 +08:00
lian
ee8e4135ea Revert "[select2] upgraded it to v4.0"
This reverts commit 62c3519e85.
2018-08-03 16:08:29 +08:00
lian
20cb4ce86f Revert "[select2] fixup after rebase"
This reverts commit 5fe0865629.
2018-08-03 16:07:05 +08:00
lian
c736ca1097 Revert "[select2] share: fixup"
This reverts commit c6152d8f0e.
2018-08-03 16:06:46 +08:00
lian
57e2cef98b Revert "[select2] show 'searching' tip"
This reverts commit 7daec7d742.
2018-08-03 16:05:20 +08:00
lian
4d8b1156e1 Revert "[select2] downgrade it to v4.0.2 to solve the chinese input problem"
This reverts commit 34caf14b2e.
2018-08-03 16:05:12 +08:00
llj
34caf14b2e [select2] downgrade it to v4.0.2 to solve the chinese input problem 2018-08-03 11:20:12 +08:00
llj
7daec7d742 [select2] show 'searching' tip 2018-08-02 17:18:53 +08:00
zhengxie
bf175989f5 [settings] Disable compressor by default 2018-08-02 11:43:18 +08:00
zhengxie
f166271827 [media] Add 6.3.2 media assets 2018-08-02 11:36:54 +08:00
zhengxie
9d46ebe158 Update staticfile storage and clean scripts assets 2018-08-02 11:36:53 +08:00
lian
85d2812ca6
Merge pull request #2247 from haiwen/document-bug
repair editor menu style for different device
2018-08-01 18:32:07 +08:00
lian
a6b7767969
Merge pull request #2253 from haiwen/select2-fixup
Select2 fixup
2018-08-01 16:55:11 +08:00
llj
c6152d8f0e [select2] share: fixup 2018-08-01 16:50:57 +08:00
lian
52c8130ef3
Merge pull request #2252 from haiwen/select2-fix
[select2] fixup after rebase
2018-08-01 14:34:37 +08:00
llj
5fe0865629 [select2] fixup after rebase 2018-08-01 14:24:14 +08:00
shanshuirenjia
d8d7462298 repair mp3 mp4 3d exp. problem 2018-08-01 11:26:56 +08:00
zhengxie
dbce5a6d7c [notification] Fix add_user_to_group msg 2018-08-01 10:41:06 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
shanshuirenjia
998ca7d675 repair the code style 2018-07-31 16:59:46 +08:00
杨顺强
12fb7a18f0 first : modify the editor to be resposed for pc and mobile;
second: change the editor menu style for different device;
2018-07-31 15:40:00 +08:00
lian
9733d50a1a
Merge pull request #2235 from haiwen/select2-upgrade
[select2] upgraded it to v4.0
2018-07-31 15:14:13 +08:00
lian
3418ae31b5 add smart link token api (#2231)
* add smart link token api

* update view file/folder via smart link

use SITE_ROOT when redirect smart link
2018-07-31 11:26:28 +08:00
zhengxie
f6e1c8c03a [travis] Only build master/6.3/6.2 branch 2018-07-30 17:33:25 +08:00
zhengxie
963d532995 [frontend] Update seafile-editor to 0.1.7 2018-07-30 17:17:46 +08:00
zhengxie
e708325a12 [locale] Update .po files 2018-07-30 16:42:57 +08:00
zhengxie
42df563786 [locale] Update .po files 2018-07-30 11:44:57 +08:00
zhengxie
b1e1fa796d [priv] Add new string 2018-07-30 11:35:45 +08:00
llj
4f7f1c166d [group repo] mobile: use dropdown menu for operations 2018-07-30 11:30:33 +08:00
zhengxie
b054441ef9 [frontend] Update seafile-editor to 0.1.6 & dist 2018-07-27 18:35:10 +08:00
cainiao222
c62c728f72 6.3 editor fix (#2239)
* use new api

* delete useless
2018-07-27 18:05:58 +08:00
C_Q
e71b411f00 [frontend] fix npm build (#2240) 2018-07-27 17:13:43 +08:00
lian
77b8c1f148
Merge pull request #2237 from haiwen/raw_path2inner_path
[preview]raw_path -> inner_path
2018-07-27 16:06:32 +08:00
Hu
5de019688a [preview] internal handler use inner_path 2018-07-27 13:26:57 +08:00
zhengxie
26c57f17bc [frontend] Update seafile-editor to 0.1.5 and clean code 2018-07-27 11:48:47 +08:00
llj
62c3519e85 [select2] upgraded it to v4.0 2018-07-26 18:28:17 +08:00
zhengxie
e853708e61 [locale] Add source files 2018-07-26 15:45:37 +08:00
zheng xie
4286742f51
Use contact email instead of username (#2218)
* Use contact email instead of username

* remove contact email

* username center

* [profile] Clean code
2018-07-26 10:30:13 +08:00
Daniel Pan
d3337c44c5
Merge pull request #2228 from haiwen/internal-link
add help of internal-link, change the  name smart-link to internal-link
2018-07-25 11:27:51 +08:00
cainiao222
e589403bc6 add help of internal-link, change the name smart-link to internal-link 2018-07-25 11:16:33 +08:00
zhengxie
13a04f02d0 [api] Update wiki error msg 2018-07-24 18:09:22 +08:00