llj
|
341d029b9f
|
[dropdown widget] improved menu position
|
2016-06-15 17:20:21 +08:00 |
|
Daniel Pan
|
5487461541
|
Merge pull request #1241 from haiwen/revert-1240-dir-file-api
Revert "[api2] update return info when create new file/dir"
|
2016-06-15 13:25:12 +08:00 |
|
Daniel Pan
|
bfd4a8a174
|
Revert "[api2] update return info when create new file/dir"
|
2016-06-15 12:26:48 +08:00 |
|
Daniel Pan
|
bca2226c25
|
Merge pull request #1240 from haiwen/dir-file-api
[api2] update return info when create new file/dir
|
2016-06-15 11:03:02 +08:00 |
|
lian
|
ffdb9ad490
|
[api2] update return info when create new file/dir
|
2016-06-15 10:18:26 +08:00 |
|
Daniel Pan
|
2bff5ef75a
|
Merge pull request #1209 from haiwen/admin-repos
new admin libraries page
|
2016-06-14 14:59:22 +08:00 |
|
lian
|
483c29ab92
|
update args check when search/delete repos
|
2016-06-14 14:47:44 +08:00 |
|
llj
|
2758713cea
|
[system repo admin] modification
|
2016-06-14 14:47:44 +08:00 |
|
llj
|
8c2e16ca36
|
[system repo admin] fix, improvement, supplement, clean
|
2016-06-14 14:47:44 +08:00 |
|
lian
|
a767aeb3d8
|
update
|
2016-06-14 14:47:02 +08:00 |
|
lian
|
72f4297934
|
new admin libraries page
|
2016-06-14 14:46:13 +08:00 |
|
Daniel Pan
|
37f6648a12
|
Merge pull request #1237 from haiwen/repo_del
[repo del] rewrote it with simplemodal
|
2016-06-14 11:14:30 +08:00 |
|
llj
|
2091d20e4b
|
[repo del] rewrote it with simplemodal
|
2016-06-14 11:06:20 +08:00 |
|
Daniel Pan
|
b567379c2c
|
Merge branch '5.1'
Conflicts:
seahub/templates/registration/password_change_form.html
seahub/templates/sysadmin/base.html
seahub/templates/sysadmin/sysadmin_backbone.html
|
2016-06-13 18:25:20 +08:00 |
|
Daniel Pan
|
dd89b0d6d5
|
Merge pull request #1236 from haiwen/ui-fix
[repo del confirm] fix
|
2016-06-13 17:46:07 +08:00 |
|
llj
|
f635d6f125
|
[repo del confirm] fix
|
2016-06-13 17:41:36 +08:00 |
|
Daniel Pan
|
e7f973e0bd
|
Merge pull request #1235 from haiwen/ui-fix
[info bar] fix
|
2016-06-13 17:36:26 +08:00 |
|
Daniel Pan
|
1e66dca52e
|
Merge pull request #1234 from haiwen/seadrive-support
[api] Add version attribute to repo list api.
|
2016-06-13 17:36:10 +08:00 |
|
llj
|
51547a83c7
|
[info bar] fix
|
2016-06-13 17:16:36 +08:00 |
|
zhengxie
|
2e5016b1a3
|
[test] Update dir_shared_items
|
2016-06-13 10:50:26 +08:00 |
|
Daniel Pan
|
ad47cedfd8
|
Merge pull request #1232 from haiwen/enhancement/inst_admin
[inst] Add search user and list admins
|
2016-06-12 17:12:00 +08:00 |
|
Daniel Pan
|
562b86322a
|
Merge pull request #1231 from haiwen/delete-dir-share
rm user check when delete dir share
|
2016-06-12 13:13:14 +08:00 |
|
lian
|
903020f325
|
rm user check when delete dir share
|
2016-06-12 12:19:44 +08:00 |
|
Daniel Pan
|
feae91a89e
|
Merge pull request #1230 from haiwen/download-multi
check total size before download multi file/dir
|
2016-06-12 11:29:44 +08:00 |
|
lian
|
aeb5d1e91b
|
check total size before download multi file/dir
|
2016-06-12 11:26:30 +08:00 |
|
zhengxie
|
3fac2a79c2
|
[inst] Add search user and list admins
|
2016-06-08 16:56:52 +08:00 |
|
Daniel Pan
|
912c3c3f48
|
Merge pull request #1225 from haiwen/enhancement/file_comment
Add notification when comment a file
|
2016-06-07 17:04:23 +08:00 |
|
Daniel Pan
|
6e2a275762
|
Merge pull request #1227 from haiwen/fix/add_group_member_notice
Nofity user when add group member
|
2016-06-07 11:32:23 +08:00 |
|
Daniel Pan
|
0f069aaab2
|
Merge pull request #1228 from haiwen/fix/notice_escape
Escape group name in notice
|
2016-06-07 11:28:58 +08:00 |
|
zhengxie
|
a47069cbb4
|
Remove unused file
|
2016-06-07 11:27:41 +08:00 |
|
Daniel Pan
|
29f2b97b55
|
Merge pull request #1226 from haiwen/fix/get_repos_by_user
Fix anonymous user issue in get repos
|
2016-06-07 11:25:12 +08:00 |
|
zhengxie
|
43e1136896
|
Fix anonymous user issue in get repos
|
2016-06-07 11:10:21 +08:00 |
|
zhengxie
|
4281f0ec57
|
Nofity user when add group member
|
2016-06-06 15:06:05 +08:00 |
|
zhengxie
|
03a032ff1e
|
Escape group name in notice
|
2016-06-06 14:48:01 +08:00 |
|
zhengxie
|
549408450f
|
Move notify users to signal handler
|
2016-06-06 14:35:44 +08:00 |
|
zhengxie
|
00661b9be1
|
Add notification when comment a file
|
2016-06-04 17:25:27 +08:00 |
|
Daniel Pan
|
68bef14eba
|
Merge pull request #1224 from haiwen/feature-remote-wipe
remote wipe: no need for an extra table.
|
2016-06-04 15:38:48 +08:00 |
|
Shuai Lin
|
163663cc86
|
remote wipe: no need for an extra table.
|
2016-06-04 15:14:25 +08:00 |
|
Daniel Pan
|
390c04ec99
|
Merge pull request #1223 from haiwen/myhome-repos
update dir page
|
2016-06-04 13:55:39 +08:00 |
|
lian
|
bec227de26
|
update dir page
when visit a invalid repo dir page, error msg will show.
but then visit a valid repo, error msg still there and no dir page show.
|
2016-06-04 10:24:08 +08:00 |
|
llj
|
9894b352a3
|
Merge pull request #1222 from haiwen/improve-password-change
Improve Web UI for password change
|
2016-06-03 12:41:00 +08:00 |
|
Daniel Pan
|
49b5f9154c
|
Merge pull request #1221 from haiwen/contact-email
Use contact email in user profile page
|
2016-06-03 12:38:59 +08:00 |
|
llj
|
dd32561be5
|
[passwd change] improvement & clean css
|
2016-06-03 12:38:57 +08:00 |
|
lian
|
d346f0962e
|
Use contact email in user profile page
|
2016-06-03 12:19:29 +08:00 |
|
Daniel Pan
|
ae2152548c
|
Improve Web UI for password change
|
2016-06-03 12:00:12 +08:00 |
|
llj
|
d2057b47e2
|
Merge pull request #1220 from haiwen/fix-duplicate
Fix sometimes dirents duplicated in Firefox
|
2016-06-02 21:03:31 +08:00 |
|
Daniel Pan
|
6561269301
|
Fix sometimes dirents duplicated in Firefox
|
2016-06-01 17:22:10 +08:00 |
|
Daniel Pan
|
bf0493ad0f
|
Merge pull request #1218 from haiwen/update-test
update test
|
2016-05-30 20:27:56 +08:00 |
|
lian
|
8b5446c05d
|
update test
|
2016-05-30 18:14:21 +08:00 |
|
xiez
|
c23bc3802f
|
Merge pull request #1215 from haiwen/share-link
Share link
|
2016-05-30 11:12:44 +08:00 |
|