xiez
|
c23bc3802f
|
Merge pull request #1215 from haiwen/share-link
Share link
|
2016-05-30 11:12:44 +08:00 |
|
lian
|
cb7414be67
|
update permission check when set an exist repo as personal/gorup wiki repo
|
2016-05-30 10:53:23 +08:00 |
|
lian
|
3ae74298b3
|
update permission check of share/upload link
|
2016-05-30 10:52:58 +08:00 |
|
Daniel Pan
|
f2e1ebcb26
|
Merge pull request #1212 from haiwen/enhancement/constance
Add setting to enable/disable constance(web settings)
|
2016-05-27 11:11:34 +08:00 |
|
zhengxie
|
346c228495
|
Add ENABLE_SETTINGS_VIA_WEB setting and remoke CONSTANCE_ENABLED
|
2016-05-27 10:33:10 +08:00 |
|
zhengxie
|
1b9b18c2cb
|
Add setting to enable/disable constance(web settings)
|
2016-05-26 15:57:37 +08:00 |
|
Daniel Pan
|
cd62d8d572
|
Merge pull request #1211 from haiwen/improve-login
Improve login
|
2016-05-26 15:24:35 +08:00 |
|
Daniel Pan
|
4f1a4aa492
|
Merge pull request #1210 from haiwen/search-user
update search user api
|
2016-05-26 14:13:05 +08:00 |
|
lian
|
08bb474d11
|
update search user api
|
2016-05-26 11:48:26 +08:00 |
|
zhengxie
|
0936f360bd
|
Fix clear login attempts bug, and update login tests
|
2016-05-26 11:38:49 +08:00 |
|
Daniel Pan
|
18ee06be50
|
Improve login function
|
2016-05-25 13:41:51 +08:00 |
|
Daniel Pan
|
ce2648e646
|
Merge pull request #1206 from haiwen/head-commt-id
return head commit id info from repos api
|
2016-05-21 13:27:48 +08:00 |
|
lian
|
e4ac653e34
|
return head commit id info from repos api
|
2016-05-21 12:12:01 +08:00 |
|
xiez
|
36e3ec2d73
|
Merge pull request #1198 from haiwen/share-link
update audit when view file via shared dir
|
2016-05-19 10:36:47 +08:00 |
|
lian
|
160963c272
|
update audit when view file via shared dir
|
2016-05-18 17:11:56 +08:00 |
|
zhengxie
|
c4fb7d51b4
|
[tests] Update tests
|
2016-05-17 18:14:17 +08:00 |
|
zhengxie
|
f12215ec5e
|
[shib] Fix shib complete url bug
|
2016-05-17 17:48:57 +08:00 |
|
Daniel Pan
|
87c6b613c5
|
Merge pull request #1192 from haiwen/user-info-traffic
rm hyperlink of traffic in user info popup
|
2016-05-17 15:40:28 +08:00 |
|
lian
|
3aad5fdbdf
|
rm hyperlink of traffic in user info popup
|
2016-05-17 15:10:31 +08:00 |
|
Daniel Pan
|
4e0a5c5e05
|
Merge pull request #1191 from haiwen/admin-user-info
add account view to sysadmin app router
|
2016-05-17 14:46:28 +08:00 |
|
lian
|
ca1a817dbd
|
add account view to sysadmin app router
|
2016-05-17 14:09:24 +08:00 |
|
xiez
|
80a3b1e7d7
|
Merge pull request #1185 from haiwen/share-link-upload
remember username when upload file from upload-link
|
2016-05-13 16:26:11 +08:00 |
|
zhengxie
|
2e4839dcf1
|
[test] Update test
|
2016-05-13 16:17:55 +08:00 |
|
lian
|
97a39ead0d
|
remember username when upload file from upload-link
|
2016-05-13 14:46:20 +08:00 |
|
zhengxie
|
13cc30c33c
|
Update locales and add missing trans context
|
2016-05-11 10:36:54 +08:00 |
|
Daniel Pan
|
45ced42002
|
Merge pull request #1182 from haiwen/share-link
update share link api url to make it more RESTful
|
2016-05-10 13:50:05 +08:00 |
|
lian
|
7fc60fb5cc
|
update share link api url to make it more RESTful
|
2016-05-10 10:44:28 +08:00 |
|
Daniel Pan
|
ed173f5a56
|
Merge pull request #1181 from haiwen/repo-history-change
rm encrypted repo password check when get repo history
|
2016-05-09 15:55:05 +08:00 |
|
lian
|
2d7f2a8416
|
rm encrypted repo password check when get repo history
|
2016-05-09 15:01:35 +08:00 |
|
Daniel Pan
|
b41333902b
|
Merge pull request #1179 from haiwen/uploadblks
[api2] Add api to check missing blocks before uploading
|
2016-05-07 16:27:27 +08:00 |
|
Daniel Pan
|
1c860a9590
|
Merge pull request #1178 from haiwen/activities-api
add avatar_url info when get activities
|
2016-05-07 11:50:24 +08:00 |
|
lian
|
93befba419
|
add avatar_url info when get activities
|
2016-05-07 11:48:26 +08:00 |
|
xiez
|
44a01ea6aa
|
Merge pull request #1175 from haiwen/update-trans-string
update trans string when share repo to group
|
2016-05-07 10:25:34 +08:00 |
|
zhengxie
|
c2f07f22d1
|
[i18n] Update settings.html and source file
|
2016-05-06 17:04:34 +08:00 |
|
zhengxie
|
73ae8b1399
|
[i18n] Update source file
|
2016-05-06 16:37:33 +08:00 |
|
lian
|
6665908bca
|
rm console log
|
2016-05-06 15:27:55 +08:00 |
|
Daniel Pan
|
45a634b3be
|
Merge pull request #1176 from haiwen/fix-group-transfer
Fix group transfer
|
2016-05-06 15:09:04 +08:00 |
|
lian
|
e71ca6d84b
|
unset admin after transfer success
|
2016-05-06 14:52:28 +08:00 |
|
Daniel Pan
|
804695bbe2
|
Fix group transfer
|
2016-05-06 14:48:48 +08:00 |
|
lian
|
c73e07f50d
|
update trans string when share repo to group
|
2016-05-06 14:37:48 +08:00 |
|
xiez
|
ced2e1651b
|
Merge pull request #1173 from haiwen/org_trans
[i18n] Add context marker to "Organization"
|
2016-05-06 11:32:31 +08:00 |
|
zhengxie
|
0150f009e6
|
[i18n] Add context marker to "Organization"
|
2016-05-05 14:40:16 +08:00 |
|
Daniel Pan
|
3ee50820f1
|
Merge pull request #1157 from haiwen/dialog-a11y
Add accessiblity support to simplemodal
|
2016-05-04 13:28:20 +08:00 |
|
llj
|
d8b7778ccd
|
[accessibility] 'folder perm': ui fix
|
2016-05-04 11:58:26 +08:00 |
|
llj
|
c3900f0e62
|
[accessibility] dialog: added 'dialogTitle', modified label/input, improved 'share.js', bugfix
|
2016-05-04 11:58:26 +08:00 |
|
llj
|
f466979760
|
accessibility improvement; bugfix & clean up
|
2016-05-04 11:51:56 +08:00 |
|
Daniel Pan
|
ef980da1ec
|
Add accessiblity support to simplemodal
|
2016-05-04 11:51:56 +08:00 |
|
Daniel Pan
|
62d85c697d
|
Merge pull request #1169 from haiwen/admin-sort-pub-link
sort admin pub links
|
2016-05-03 13:50:58 +08:00 |
|
lian
|
d50f919880
|
sort admin pub links
|
2016-05-03 13:44:43 +08:00 |
|
Daniel Pan
|
c6ae8e6384
|
Merge pull request #1168 from haiwen/clean-deivce-error
add admin clean device errors api
|
2016-04-30 11:51:19 +08:00 |
|