lian
f2e32f3073
Merge pull request #2282 from haiwen/copy-file
...
update copy dirent api
2018-08-23 17:57:38 +08:00
llj
ffca232d4d
6.3 perm error ( #2294 )
...
* Add login url to context
* [backbone] turn to login page when 403
2018-08-23 13:41:17 +08:00
llj
1b0e3e1264
[dir view] enable 'copy file/dir to current folder'
2018-08-21 16:58:49 +08:00
llj
3414cfe10d
[org address book] fixup
2018-08-20 19:04:24 +08:00
zheng xie
775d6871f7
Merge pull request #2281 from haiwen/6.3-org_address_book-fe
...
[org admin] added 'address-book'
2018-08-20 13:21:59 +08:00
llj
5b8dc61e6f
[misc] fixup
2018-08-18 11:05:08 +08:00
llj
ff90c7cfb4
[org admin] added 'address-book'
2018-08-17 14:01:48 +08:00
llj
c24d527a03
[fileupload] show 'Network error' instead of 'Unknown error' ( #2266 )
2018-08-16 16:46:07 +08:00
llj
3dad80d722
[group] fixup for adding a group owned repo
2018-08-16 10:56:10 +08:00
llj
3fcfeab7f4
[dir view] fixup for 'group owned repo'
2018-08-15 12:35:49 +08:00
lian
0d4d277361
Merge pull request #2272 from haiwen/share-and-folderPerm
...
Share and folder perm
2018-08-14 14:01:28 +08:00
lian
2ab9b5b900
Merge pull request #2273 from haiwen/new-group-owned-repo-fix
...
[group] fixup for adding the first owned repo when there are no repos …
2018-08-14 13:15:07 +08:00
llj
21c723ecf5
[group] fixup for adding the first owned repo when there is no repos in the group.
2018-08-13 17:30:55 +08:00
llj
cfb9c9b319
[folder perm] modification for group owned repo
2018-08-13 16:28:05 +08:00
llj
76183310e0
[share] share to group: modified group list
2018-08-10 17:32:09 +08:00
llj
d7510c0773
[group repo list, dir view] modification after 'enable users to share personal libraries to departments'
2018-08-10 16:45:20 +08:00
llj
c9053902a8
Merge pull request #2267 from haiwen/address-book-folder-share
...
[group owned repo] enable dir private share for sub folders
2018-08-09 11:49:28 +08:00
lian
8bb7b15082
Folder perm group ( #2261 )
...
* update shareable-groups api
return all groups, include address book groups
* update folder perm select group
send ajax groups request every time set folder perm
2018-08-08 17:52:16 +08:00
llj
f096ccdf3d
[group owned repo] enable dir private share for sub folders
2018-08-08 15:37:11 +08:00
llj
bc7184f75b
[folder perm] fixup for 'path'
2018-08-07 12:22:36 +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
f166271827
[media] Add 6.3.2 media assets
2018-08-02 11:36:54 +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
llj
c6152d8f0e
[select2] share: fixup
2018-08-01 16:50:57 +08:00
llj
5fe0865629
[select2] fixup after rebase
2018-08-01 14:24:14 +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
llj
62c3519e85
[select2] upgraded it to v4.0
2018-07-26 18:28:17 +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
cainiao222
1cf9becf2c
fix smart-link
2018-07-17 18:54:59 +08:00
lian
82658abbe0
update share.js
...
request groups web api to get group list when share repo to group
2018-07-17 13:47:24 +08:00
cainiao222
349ea9368c
frontend add smart-link
2018-07-11 17:44:32 +08:00
lian
e976b6107f
convert repo path
2018-07-11 17:23:34 +08:00
llj
040348e6f4
[address book] group: show repo owner and etc.
2018-06-15 14:22:10 +08:00
llj
ce23a58edf
[group owned repo] share: enable 'share to user/group'
2018-06-15 14:22:10 +08:00
zMingGit
e387c92b99
can set sub-path permission with admin ( #1962 )
...
* can set sub-path permission with admin
* fixup after rebase
2018-05-18 13:46:43 +08:00
llj
8bf23d9e88
[address book] added 'rename', 'set perm', 'details' for group owned library, and etc.
...
* added feedback for invalid quota input
* modified empty tips for group
* added 'New Department Library'
* [group owned repo] added 'rename', 'set permission', 'details'
2018-05-18 12:12:01 +08:00
llj
8ae359afbe
[address book] fixup & improvement
2018-05-18 12:12:01 +08:00
llj
b0df96a948
[user panel] group owned library: enable group admin to set folder perm
2018-05-18 12:12:01 +08:00
llj
97b0e98c7d
[address book] modified group quota shown and etc.
2018-05-10 12:13:47 +08:00
llj
266b6330b1
[address book] added check for invalid input when set group quota
2018-05-09 18:01:02 +08:00
llj
c0c449db48
[group] removed arrows in 'group setting' & 'group members' popups
2018-05-09 11:24:08 +08:00
llj
4a761aac0f
added 'invite people' link to 'share' & 'group manage members' popup
2018-05-08 16:12:04 +08:00
Daniel Pan
38a902b22d
Merge pull request #2099 from haiwen/address-book-group-lj0507
...
Address book group
2018-05-08 10:39:36 +08:00
lian
1fd1f43177
filter out address book group when: ( #2092 )
...
1. share library/folder
2. set folder permission
2018-05-08 10:24:58 +08:00
llj
bed8636724
[address book] modification for UI
2018-05-07 19:55:41 +08:00
llj
1b6a8479da
[user panel] added 'group owned library' function
2018-05-04 14:43:17 +08:00
llj
b87f0312d7
[js] use uncompressed js.cookie.js, for the sake of 'dist'
2018-04-28 15:11:33 +08:00
zhengxie
8d10466ce9
Merge branch '6.2'
...
Conflicts:
media/css/seahub.css
seahub/notifications/management/commands/send_notices.py
seahub/notifications/models.py
seahub/templates/js/templates.html
seahub/views/__init__.py
seahub/views/file.py
tests/seahub/notifications/management/commands/test_send_notices.py
tests/seahub/notifications/test_models.py
2018-04-27 11:00:43 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book
...
Address book
2018-04-25 16:26:12 +08:00
llj
5e5813072c
[address book] modification
2018-04-25 16:19:15 +08:00
llj
f1a24470ad
[address book] add 'show/set group quota', 'list/create/delete group libraries' functions
2018-04-24 20:08:20 +08:00
llj
30c0636791
[address book] modification: nav icon, group owner
2018-04-20 12:04:48 +08:00
llj
b383846e87
[group discussion] fixup for 'enable' option
2018-04-18 16:39:20 +08:00
llj
9306c4762f
[wiki] modification
2018-04-17 16:57:59 +08:00
haiwen
3a82e7694e
Merge branch '6.2'
2018-04-14 03:00:03 +00:00
lian
488c8802a3
update multi storages backend
...
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
2018-04-13 13:27:05 +08:00
xiez
2ade5eb2de
Merge pull request #2049 from haiwen/stop-zip-process
...
cancel zip task
2018-03-30 15:19:37 +08:00
llj
26dd0baff4
[cancel zip task] fixup & improvement; also added it for 'shared dir view' page
2018-03-30 14:53:20 +08:00
ilearnit
d29ab8a9ac
if close query zip window then stop zip process
2018-03-30 12:24:40 +08:00
llj
cd0c7a1170
[wiki] added 'wiki list' and 'wiki' pages
...
Conflicts:
seahub/wiki/urls.py
static/scripts/app/views/side-nav.js
2018-03-26 13:31:41 +08:00
llj
a6026628fb
[my libs] fixed js
2018-03-16 14:55:00 +08:00
llj
1182a80989
Merge branch '6.2'
2018-03-15 11:26:02 +08:00
zming
f870a6d556
trash event
2018-03-13 18:31:01 +08:00
llj
6d4000fc20
[fileupload] show error message when failed to get upload url
2018-03-02 16:11:27 +08:00
llj
88478dee1d
[upgrade jquery] modifications, & cleaned up code & files
2018-02-05 16:47:56 +08:00
llj
4fd7b7acd7
[share] fix
2018-01-30 18:04:50 +08:00
zming
5f9033b5ff
sysadmin can share repo with admin permission
2018-01-30 17:38:30 +08:00
lian
ed8200b52a
add api for getting groups that user can share repo to
2018-01-17 18:22:48 +08:00
llj
5d2aa8af05
[system admin] added 'address book'
2018-01-04 18:06:05 +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
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
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
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
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
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
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
llj
b16a829ead
added transition to show/hide of feedback messages
2017-12-12 17:13:01 +08:00
llj
6b31bae382
[dir view] mv/cp multi dirents: add feedback msg
2017-12-11 16:55:21 +08:00
llj
07dea7eca4
new design
2017-12-05 17:53:45 +08:00
Daniel Pan
c35ca85e1f
Merge pull request #1895 from haiwen/click-to-select
...
[share.js] download/upload link: added 'click to select' feature
2017-11-14 10:29:58 +08:00
llj
fbbfebe09a
[group] fix
2017-11-13 14:28:21 +08:00
llj
ac18d5ee85
[share.js] download/upload link: added 'click to select' feature
2017-11-13 13:45:40 +08:00
zMingGit
f5d1be1f59
share permission refactor ( #1843 )
...
* rebuild
* share admin
* use seafile_api
* rebase 6.2
* complete test
* api changed
* some error
* break up to two method
* review
* js review
2017-11-01 18:13:51 +08:00
llj
1577275095
small fix
2017-11-01 15:42:03 +08:00
llj
946002b5c6
[dir view] file comment: fix
2017-10-13 18:00:37 +08:00
llj
b772a62b1a
[my libs] repo 'folder perm': fix
2017-10-13 16:08:43 +08:00
llj
101872d5c4
[my libs] repo 'share links': fixed 'icon url'
2017-10-13 14:53:26 +08:00
llj
6ac3f5ae6e
[devices] fix
2017-10-10 16:16:37 +08:00
Daniel Pan
5c095ee516
Merge pull request #1842 from haiwen/file-comment
...
[dir view] added 'file comment'
2017-09-26 02:06:09 -05:00
