zhengxie
6efe9f0e29
[i18n] Update source files
2018-04-27 16:23:06 +08:00
llj
4ce3cf7080
[info bar] remove unused code
2018-04-27 16:11:34 +08:00
llj
9440c4c4fd
Merge branch '6.2'
2018-04-27 16:02:49 +08:00
lian
19cd3e6c4e
Merge pull request #2088 from haiwen/fix-test
...
Fix test
2018-04-27 02:44:40 -05:00
lian
55014a2527
udpate group transfer test
2018-04-27 15:33:49 +08:00
llj
4a5397e542
[info bar] fix
2018-04-27 15:29:49 +08:00
lian
0a1f929086
only return quota info in pro version
2018-04-27 14:18:24 +08:00
ilearnit
dbccf38f35
[fix] test
2018-04-27 13:42:26 +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
302f980093
Merge pull request #2086 from haiwen/address-book-trans
...
[address-book] trans: added context for 'Departments'
2018-04-26 16:13:40 +08:00
llj
8fa5929bf2
[address-book] trans: added context for 'Departments'
2018-04-26 16:07:28 +08:00
zhengxie
02c0d2834d
[sql] Update mysql/sqlite
2018-04-26 16:02:38 +08:00
zhengxie
bcdb3c90ff
[notifications, institutions] Add missing index
2018-04-26 15:11:21 +08:00
zhengxie
acd4c2456d
Add user deleted signal
2018-04-26 15:00:18 +08:00
Daniel Pan
3ee97bc440
Merge pull request #2083 from haiwen/sort-dir-file
...
update get dir/file info api
2018-04-26 11:49:23 +08:00
lian
d0a4f257d3
update get dir/file info api
...
sort dir/file by parent_dir.
2018-04-26 11:45:30 +08:00
lian
bffa4ed676
Group owned repo ( #2082 )
...
* admin set group quota
* add/delete group owned repo
* modify group owned sub folder permission
* update address book groups api
1. set quota to "-2" when admin create address book group
2. return quota when get address book groups
* add admin group owned library api
admin modify group owned sub folder permission
admin add/delete group owned repo
2018-04-25 16:37:35 +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
C_Q
7e212c4246
[fix] send notices ( #2079 )
...
* [fix] send notices
* WIP
* update fix-send-notices test
* Refactor
2018-04-25 10:51:33 +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
2f79fd0e57
[system admin] side nav: modified text of 'address book' & 'multi-tenancy'
2018-04-23 13:15:05 +08:00
zMingGit
4b097ca10b
Merge pull request #2080 from haiwen/migrate_file_comment
...
Add command to migrate file comment
2018-04-20 18:06:48 +08:00
zhengxie
0e7f2722e6
Add command to migrate file comment
2018-04-20 17:02:31 +08:00
llj
30c0636791
[address book] modification: nav icon, group owner
2018-04-20 12:04:48 +08:00
zhengxie
624c0593b0
[wiki] User with 'rw' perm can edit a wiki page.
2018-04-20 10:42:11 +08:00
zhengxie
a4f6d65c55
[requirements] Add mysqlclient
2018-04-19 15:25:16 +08:00
zhengxie
85ea6eef1a
[django11] Fix seafevents related when move to djagno 1.11
2018-04-19 15:04:48 +08:00
lian
5fcafcb921
Merge pull request #2077 from haiwen/footer-time
...
change footer time
2018-04-19 01:18:08 -05:00
ilearnit
12947aea6d
change footer time
2018-04-19 14:16:55 +08:00
Daniel Pan
9adf6bf683
Merge pull request #2076 from haiwen/refactor-dir-view
...
update dir view
2018-04-19 13:16:05 +08:00
lian
89e25fa965
update dir view
...
return file info when get dir info recursively
2018-04-19 11:45:17 +08:00
llj
9d8ebf3201
Merge pull request #2071 from haiwen/group-options
...
Add group discussion options and file comment options
2018-04-18 16:46:04 +08:00
llj
b383846e87
[group discussion] fixup for 'enable' option
2018-04-18 16:39:20 +08:00
ilearnit
876fa2e138
Add group discussion options and file comment options
2018-04-18 15:05:21 +08:00
ilearnit
a1055b8969
make the change password optional
...
Conflicts:
seahub/wiki/views.py
2018-04-18 13:45:54 +08:00
xiez
55a6ae12e2
Merge pull request #2075 from haiwen/django11
...
Upgrade to Django1.11
2018-04-18 13:21:33 +08:00
zhengxie
dce6242ec1
[notifications] Remove unused code
2018-04-18 11:39:26 +08:00
zhengxie
4d2398e4a7
[tests] Remove http://testserver since Site app is not installed
2018-04-18 11:11:24 +08:00
zhengxie
1cc0d09775
[tests] Fix django_constance in tests
...
Conflicts:
tests/seahub/notifications/management/commands/test_notify_admins_on_virus.py
2018-04-18 11:11:24 +08:00
zhengxie
aa689f9bfe
[Django 1.11] Update requirements and tests
2018-04-18 11:11:23 +08:00
zhengxie
5affd04ceb
[auth] Fix login redirect
2018-04-18 11:00:40 +08:00
Daniel Pan
d3e47f46f8
Merge pull request #2072 from haiwen/wiki
...
[wiki] modification
2018-04-18 10:06:12 +08:00
llj
9306c4762f
[wiki] modification
2018-04-17 16:57:59 +08:00
xiez
326eac4a44
Merge pull request #2061 from haiwen/custom-css
...
custom css
2018-04-17 11:29:27 +08:00
llj
5627db0d23
[info bar] fix
2018-04-16 18:39:19 +08:00
llj
366d56dc89
[system admin] settings: fixup & improvement for 'custom CSS'
2018-04-16 16:13:01 +08:00
zhengxie
5d10466437
[auth] Fix login redirect
2018-04-14 16:39:43 +08:00
haiwen
ce047c10e6
Fix invalid two_factor import
2018-04-14 03:19:42 +00:00
haiwen
3a82e7694e
Merge branch '6.2'
2018-04-14 03:00:03 +00:00
