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

4917 Commits

Author SHA1 Message Date
Daniel Pan
ca7e40c138 Merge pull request #1116 from haiwen/log-api
add admin log api
2016-04-12 17:44:36 +08:00
lian
05d01cb356 add admin log api 2016-04-12 17:37:16 +08:00
Daniel Pan
c9f836f31d Merge pull request #1115 from haiwen/icon
[icons] modification
2016-04-12 17:21:45 +08:00
llj
ce65a157d0 [icons] rm '.non-text-link' 2016-04-12 17:15:20 +08:00
llj
d4f5bc4817 [icons] modification 2016-04-12 15:53:51 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
Daniel Pan
b3d5cb07b7 Merge pull request #1112 from haiwen/group_fix
[group] fixed wiki url
2016-04-11 18:12:44 +08:00
llj
9b97c8bf59 [group] fixed wiki url 2016-04-11 18:08:56 +08:00
Daniel Pan
287f7d4fea Merge pull request #1111 from haiwen/activities
update commit desc
2016-04-11 13:51:17 +08:00
lian
78a13bd81f update commit desc 2016-04-11 12:20:08 +08:00
xiez
32b2532e48 Merge pull request #1099 from hu-berlin-cms/feature/contact_email_reply-to
Support contact_email in email sending
2016-04-09 15:54:31 +08:00
xiez
a759ca50ca Merge pull request #1084 from haiwen/update-config
update True/False check when use constance.config
2016-04-09 15:38:14 +08:00
zhengxie
5801349d30 [tests] Add test 2016-04-09 14:35:56 +08:00
zhengxie
e86118cfbc Update virus mail 2016-04-09 14:35:45 +08:00
xiez
06b5fd107e Update settings.py 2016-04-09 13:40:13 +08:00
zhengxie
c1e7102316
Change logger to INFO 2016-04-09 11:49:04 +08:00
zhengxie
bca48cd876 Update per_page to 100 2016-04-09 11:44:39 +08:00
zhengxie
4f1e2b849c Add pagination in institutions 2016-04-09 11:34:35 +08:00
Daniel Pan
99f0c340e5 Merge pull request #1107 from haiwen/pdf_fix
[pdf file view] bugfix
2016-04-08 10:02:18 +08:00
llj
c9c1d12d2d [pdf file view] bugfix 2016-04-07 18:52:47 +08:00
Daniel Pan
f3a269826a Merge pull request #1106 from haiwen/focus
add 'focus' effect for checkbox, button, select
2016-04-07 17:17:10 +08:00
llj
798df91484 add 'focus' effect for checkbox, button, select 2016-04-07 16:39:11 +08:00
zhengxie
761279cf80
[i18n] Update locales 2016-04-07 11:53:03 +08:00
Daniel Pan
06ee8419a6 Merge pull request #1105 from haiwen/checkbox
redesigned all checkbox; bugfix & improvement; removed unused code & …
2016-04-07 11:24:54 +08:00
llj
77aac3d811 redesigned all checkbox; bugfix & improvement; removed unused code & file 2016-04-07 11:06:48 +08:00
Daniel Pan
f48fa5ef1f Merge pull request #1102 from haiwen/logo
Update logo to HiDPI
2016-04-07 10:44:48 +08:00
Daniel Pan
57f4eb9b4c Update logo to HiDPI 2016-04-06 19:44:11 +08:00
Daniel Pan
0ef47d34ec Merge pull request #1101 from haiwen/center-text
center the text of password change dialog
2016-04-06 14:59:31 +08:00
Daniel Pan
e6f653ccc1 center the text of password change dialog 2016-04-06 10:48:25 +08:00
Daniel Pan
d5170f7a18 Merge pull request #1098 from haiwen/rewrite
Restructure views
2016-04-05 18:06:20 +08:00
Daniel Pan
131b9e4f55 fixes 2016-04-05 17:51:44 +08:00
lian
d700780ffa Merge pull request #1093 from hu-berlin-cms/feature/test_contact_email_search
Extended test of user search
2016-04-05 17:16:46 +08:00
Enno Gröper
fd6fd1eec0 Sending Links: conform api to web gui code 2016-04-03 11:15:22 +00:00
Daniel Pan
eadb9d374e Remove .click() in myhome-repos.js 2016-04-01 16:10:03 +08:00
Daniel Pan
36b141a83c Fixes 2016-04-01 15:57:42 +08:00
Daniel Pan
900b06e349 Rewrite group disccussions/member/settings with popover view 2016-04-01 15:22:28 +08:00
Daniel Pan
45a7ba13e7 Restructure views
Conflicts:
	seahub/templates/libraries.html
	static/scripts/app/router.js
	static/scripts/app/views/group.js
	static/scripts/app/views/organization.js
2016-04-01 10:39:11 +08:00
Daniel Pan
dd906d7f68 Improve dropdown 2016-03-31 21:39:12 +08:00
Daniel Pan
b9ba54f635 use dropdown for publib create button 2016-03-31 21:11:19 +08:00
Daniel Pan
d07e7be840 Improve devices page to support focus 2016-03-31 19:56:36 +08:00
Daniel Pan
00566e24bc Improve login page 2016-03-31 19:55:14 +08:00
Enno Gröper
d85fdccddf Tests for contact_email support in share link emails 2016-03-31 12:06:16 +02:00
Enno Gröper
b64e882a54 Improve share-link tests
Tests for correct from header and support testing Reply-To header and rewrite of From.
Support testing shared_link email, too.
2016-03-31 12:06:15 +02:00
Enno Gröper
1ddd527eda Support contact_email in email headers 2016-03-31 12:06:15 +02:00
Enno Gröper
f4741483ad Test searching by contact_email 2016-03-31 12:04:35 +02:00
Daniel Pan
a07a959fa4 Merge pull request #1096 from haiwen/fix-device
Fix a bug in device-item template
2016-03-31 17:07:29 +08:00
Daniel Pan
e2095c469c Fix a bug in device-item template 2016-03-31 17:03:58 +08:00
llj
67a10ee4ce Merge pull request #1090 from haiwen/cleaning
Clean
2016-03-31 15:43:39 +08:00
llj
fc00fda841 [api2] removed unused template files 2016-03-31 15:02:17 +08:00
Daniel Pan
f87a016995 Merge pull request #1095 from haiwen/update
update code when transfer org repo
2016-03-31 14:54:49 +08:00