Commit Graph

1489 Commits

Author SHA1 Message Date
Rémy Boulanouar
6bcff7828f Fix mention in comments like (@dblk) (#3655)
* Fix mention in comments like (@dblk)

* Better fix to avoid making link for "Hello@DblK"
2016-10-16 22:17:59 -04:00
Thibault Meyer
93f1eabe30
rename variable + fix wiki link 2016-10-04 18:58:14 +02:00
Thibault Meyer
9d66497abc
Can disable GIT interactions by HTTP protocol 2016-09-18 10:54:33 +02:00
Unknwon
7e15ff9486
Update locales
Add new locale Serbian (Cyrillic)
2016-09-15 20:03:36 -04:00
Daniel Oaks
b3d9ca4ccd Add the ability to explore organizations (#3573)
* Add ability to explore organizations

* Use right icon for org explore links
2016-09-01 09:08:05 -04:00
Unknwon
7c1fbed057 Fix panic when attempt login with non-exist user 2016-09-01 05:12:34 -04:00
Thibault Meyer
bc902b8f74 Feature #3492: Add option to hide footer load times (#3562)
* Add option to hide footer load times

* Rename option variable + minor changes
2016-09-01 01:01:32 -04:00
Unknwon
8ee14db51e Update locales 2016-09-01 00:35:04 -04:00
Rémy Boulanouar
5d35578811 Update size of SHA to fix #3538 (#3563) 2016-08-31 14:22:17 -07:00
Unknwon
dadd35b636 #3559 fix template error 2016-08-31 13:59:23 -07:00
Unknwon
99c2ae7b35 #3515 use alert instead 500 for duplicated login source name 2016-08-31 00:56:10 -07:00
Unknwon
8516dfcb6c #2018 able to sync now for mirrors
- Refactor code to use sync.UniqueQueue
- Closes #3509
2016-08-30 16:18:33 -07:00
Unknwon
c1ecb6c60a modules/sync: add UniqueQueue 2016-08-30 15:50:30 -07:00
Unknwon
43297148b2 modules/sync: rename SingleInstancePool to ExclusivePool 2016-08-30 15:19:53 -07:00
Unknwon
6f90835f95 Make bindata 2016-08-30 05:24:34 -07:00
Unknwon
643142acab Web editor: support upload files 2016-08-30 05:23:59 -07:00
Unknwon
7c31f235da Web editor: support upload files 2016-08-30 05:12:37 -07:00
Unknwon
780cc2d110 router/repo: code refactoring 2016-08-30 02:08:38 -07:00
Unknwon
28cf0e6aaa #3459 code quality improvement 2016-08-29 20:00:06 -07:00
Thibault Meyer
92fb30c526 Load a set of predefined labels (#3459)
* Can use a predefined set of labels

* Change UI

* Fix HTML file indentation

* Avoid reading file from other directory (security issue)

* Apply a better fix

* Remove not used variable

* Merge upstream/develop

* Do modifications

* Raname

* remove binding + rename variable
2016-08-29 19:02:49 -07:00
Unknwon
62b0dc4853 Web editor: fix cannot create new file in subdirectory 2016-08-29 00:10:21 -07:00
Unknwon
ba27d71abe Web editor: improve edit file 2016-08-28 04:31:42 -07:00
Unknwon
0114fdcba4 Web editor: improve delete file process 2016-08-28 01:41:44 -07:00
Unknwon
dad5c15520 #2901 allow setting preferred licenses
- Closes #3488
2016-08-28 00:06:22 -07:00
Unknwon
6e171c5225 Web editor: improve edit file tooltip 2016-08-27 15:25:01 -07:00
Unknwon
13c106af77 label: adjust forecolor boundary 2016-08-27 12:44:39 -07:00
Unknwon
f8a48ffaad Web editor: improve code quality 2016-08-24 21:35:03 -07:00
Unknwon
0b273ac4d5 #3383 code cleanup 2016-08-24 16:05:56 -07:00
Unknwon
ec332cf903 Minor naming improvement 2016-08-17 16:10:07 -07:00
Unknwon
a00c932bbc General code quality improvement 2016-08-16 23:06:38 -07:00
Unknwon
4042d1f0c3 models/issue: improve quality and performance of NewIssue function 2016-08-15 18:40:32 -07:00
Unknwon
4a46613916 markdown: fix treating pure number as SHA1
- Detect non-exist commit and return 404 not 500
2016-08-15 15:27:19 -07:00
Unknwon
8637e67e6f Fix outdated edit can’t overwrite changes 2016-08-15 02:06:35 -07:00
Unknwon
cd89f6c502 Web editor: improve edit file and diff preview 2016-08-14 23:52:24 -07:00
Unknwon
660e7a178a modules/sync: move sync objects to independent module 2016-08-14 23:52:24 -07:00
Unknwon
15845cb287 Code clean up for new config options 2016-08-14 23:52:24 -07:00
Richard Mahn
d0a0239bac Squashed commit of the following:
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

    Removed Upload stats as the upload table is just a temporary table

commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600

    Fix for CodeMirror mode

commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600

    Made tabbing in editor use spaces

commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600

    Fix for data-url

commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600

    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file

commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600

    Code cleanup

commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600

    Code cleanup

commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600

    Code cleanup and fixes

commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600

    Fixes per Unknwon's requests

commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go

commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600

    Fix in gogs.js

commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600

    Update for using CodeMirror mode addon

commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600

    Update for Edit

commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go

commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600

    Feature for editing, creating, uploading and deleting files
2016-08-14 23:52:24 -07:00
Unknwon
3f7f4852ef #2246 fully support of webhooks for pull request 2016-08-14 03:32:24 -07:00
Unknwon
5544a7037b Add new dependency 2016-08-11 17:12:55 -07:00
Andrey Nering
dbed39ba05 On showing diff/file, use the tab_width specified on .editorconfig, if any (#3241)
Closes #3182
2016-08-11 17:07:09 -07:00
Andrey Nering
25b23c4bc9 Do not show non-image attachment in a <img> tag. Fixes #3215 (#3311) 2016-08-11 16:16:36 -07:00
Thibault Meyer
7eafe3213f Fix #3321: commit tag shortener (#3418)
* Fix #3321: commit tag shortener

* Check short commit

* remove debug

* Edit unit tests

* Show 10-char short SHA
2016-08-11 15:34:00 -07:00
Unknwon
a47aef5460 #2852 code cleanup 2016-08-11 14:55:10 -07:00
Odin Ugedal
1dd003bd4c Add initial support for unix sockets (#2852) 2016-08-11 14:46:33 -07:00
Unknwon
5077408d78 #3233 code cleanup and minor issue fix 2016-08-11 10:53:51 -07:00
Andrew
0885784f13 Wiki mirroring implementation (#3233)
* Implement wiki mirroring, add Update mirrors operation to admin dashboard

* bindata.go update after merge

* Implement checking Git repo endpoint existence, support for BB included

* Remove admin dashboard operation
Fix bindata.go

* Apply gofmt to repo model file

* Try to remove bindata from PR

* Revert accepted wiki names change in favor of better system

* Remove unused imports
2016-08-11 10:18:51 -07:00
Unknwon
d625e41c6c #3408 minor code fix 2016-08-11 07:41:01 -07:00
Thibault Meyer
6a81632e36 Fix typo CacheInternal -> CacheInterval (#3432) 2016-08-11 05:59:11 -07:00
Unknwon
29f76f3936 Update locales [CI SKIP] 2016-08-10 11:54:52 -07:00
Thibault Meyer
99812a80fd Fix #3420: Bad commit URL generation (#3424) 2016-08-10 11:35:06 -07:00
Unknwon
b85927e488 #3091 show Git configs on admin panel 2016-08-10 11:01:42 -07:00
Unknwon
87b408a2e5 Update bindata.go [CI SKIP] 2016-08-09 23:58:15 -07:00
Thibault Meyer
fc68fb951c Feature #3398: Redefine global mirror interval (#3409)
* add mirror::GLOBAL_INTERVAL on app.ini

* rename key to DEFAULT_INTERVAL

* add key on default app.ini + move code
2016-08-09 23:47:16 -07:00
Unknwon
edd786446c #3158 skip RUN_USER check on Windows 2016-08-09 17:41:18 -07:00
Unknwon
b0b88d9bc5 #3091 add config option for Git GC 2016-08-09 17:24:32 -07:00
Unknwon
f70343660d Little code refactoring 2016-08-09 12:56:00 -07:00
Unknwon
9e8a8867ea #3325 use correct word for .gitignore 2016-08-09 12:16:21 -07:00
Unknwon
90af997fec #3399 500 for upstream pulls page if user has forked repository 2016-08-08 13:02:55 -07:00
Unknwon
e5bf4281b5 #2825 early response 200 when ?go-get=1 2016-08-07 14:29:16 -07:00
Unknwon
99385db0c4 #3320 code cleanup 2016-08-07 11:01:47 -07:00
Sandro Santilli
90dd0657b5 Add support for federated avatars (#3320)
* Add support for federated avatars

Fixes #3105

Removes avatar fetching duplication code
Adds an "Enable Federated Avatar" checkbox in user settings
(defaults to unchecked)

Moves avatar settings all in the same form, making
local and remote avatars mutually exclusive

Renames UploadAvatarForm to AvatarForm
as it's not anymore only for uploading

* Run gofmt on all modified files

* Move Avatar form in its own page

* Add go-libravatar dependency to vendor/ dir

Hopefully helps with accepting the contribution.
See also #3214

* Revert "Add go-libravatar dependency to vendor/ dir"

This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82.

* Make federated avatar setting a global configuration

Removes the per-user setting

* Move avatar handling back to base tool, disable federated avatar in offline mode

* Format, handle error

* Properly set fallback host

* Use unsupported github.com mirror for importing go-libravatar

* Remove comment showing life exists outside of github.com

... pity, but contribution would not be accepted otherwise

* Use Combo for Get and Post methods over /avatar

* FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR

* Fix persistance of federated avatar lookup checkbox at install time

* Federated Avatars -> Enable Federated Avatars

* Use len(string) == 0 instead of string == ""

* Move import line where it belong

See
https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md

Pity the import url is still the unofficial one, but oh well...

* Save a line (and waste much more expensive time)

* Remove redundant parens

* Remove an empty line

* Remove empty lines

* Reorder lines to make diff smaller

* Remove another newline

Unknwon review got me start a fight against newlines

* Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE

On re-reading the diff I figured what Unknwon meant here:
https://github.com/gogits/gogs/pull/3320/files#r73741106

* Remove newlines that weren't there before my intervention
2016-08-07 10:27:38 -07:00
Unknwon
ec92565f23 #3393 fix missing sub-url prefix in relative avatar link 2016-08-07 10:13:05 -07:00
Andrey Nering
2772791fda Improve diff highlight (#3390)
- Try to reduce memory allocations
- Add possibility to disable diff highlight (can improve performance for large diffs)
- Tweaking with cost for prettier (cleaner) diffs
- Do not calculate diff when the number of removed lines in a block is not equal to the number of added lines (this usually resulted in ugly diffs)
2016-08-07 09:49:47 -07:00
Unknwon
ee28fd9255 Update locales [CI SKIP] 2016-08-03 12:24:53 -07:00
Unknwon
991ce42c48 #2162 improve repository advance options UI display
Enable/disable input based on user chosen options for wiki and issue tracker.
2016-07-31 01:26:43 +08:00
Unknwon
3e22ae3412 Update locales 2016-07-30 22:28:23 +08:00
Unknwon
899e799459 #1601 support delete issue comment 2016-07-26 02:48:17 +08:00
Unknwon
2295fafb34 repo/settings/options: take naming style examples out of locale string 2016-07-25 16:55:51 +08:00
Unknwon
a562228c5e Add org.getUserTeams to reduce redundant code 2016-07-24 18:09:45 +08:00
Unknwon
e74630ae3b #1384 add pagination for repositories 2016-07-24 14:32:46 +08:00
Unknwon
1f2e173a74 Refactor User.Id to User.ID 2016-07-24 01:08:22 +08:00
Unknwon
46e96c008c Use struct for UI settings 2016-07-24 00:23:54 +08:00
Unknwon
4e822c1911 conf: change default mirror checking interval to 10m 2016-07-23 20:20:09 +08:00
Unknwon
d7bdc1de8d #3107 fix mention regex does not include dash 2016-07-23 17:29:34 +08:00
Unknwon
c912494609 #3076 detect invalid tag name git error 2016-07-23 15:59:19 +08:00
Unknwon
599716bb1b Update locales [CI SKIP] 2016-07-22 22:21:26 +08:00
Dennis Chen
6488ee12be avatar: make custom and generated avatars equal (#3301)
Sets all avatars to use PNG image format.
Keeps avatars consistent at 290x290px resolution.

Signed-off-by: Dennis Chen <barracks510@gmail.com>
2016-07-21 15:31:14 +08:00
Unknwon
5aa2bf86f4 Update locales and .gopmfile 2016-07-17 09:25:30 +08:00
Unknwon
e3d3d424b2 Minor fix for go vet 2016-07-16 15:15:00 +08:00
Unknwon
971e2c3bd6 Upgrade octicon to 4.3.0 2016-07-16 12:45:13 +08:00
Unknwon
c083d76567 #2937 able to prohibit user login 2016-07-16 10:22:16 +08:00
Unknwon
f1b8d52eb3 #2854 fix no mail notification when issue is closed/reopened 2016-07-16 00:36:39 +08:00
Unknwon
7ca5f8f119 models/repo: remove redundant info for some repo methods
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
2016-07-15 21:53:43 +08:00
Unknwon
194a742fb9 #2798 fix assign operation not take effect 2016-07-15 17:06:17 +08:00
Unknwon
089bacd54e Update bindata and CSS 2016-07-15 14:13:30 +08:00
Unknwon
a752f09055 #2709 validate username attribute fetched from LDAP 2016-07-12 07:07:57 +08:00
Kim Carlbäcker
f4ab50501e [Fix] Don't display way too large files #1513 (#3253)
* Add MaxDisplayFileSize setting

* Don't show files that are too large

* Localized FileTooLarge

* Change IsFileTooBig => IsFileTooLarge
2016-07-12 06:21:26 +08:00
Unknwon
a1f717f65a Update locale 2016-07-09 23:59:13 +08:00
Unknwon
9fcf66f0e0 Minor fix for #3246 2016-07-09 13:42:05 +08:00
Pablo Saavedra
98b152030d The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true (#3246)
Executed go fmt

getEngine() not handles DB parameters (#2972) (#2974)

Uses .AllCols() for Update in updateMirror()

Spanish traslation removed

Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function
2016-07-09 13:22:28 +08:00
Pheng Heong TAN
467d7dacb6 Modify behaviour of repo-delete. (#3232)
Re: issues gogits/gogs#2863 and gogits/gogs#3231

As a result of modifications to the contents of the conf folder, `make bindata`
was run, causing an update to bindata.go.

Meta
-----
This commit will be rebased onto the 'develop' branch.
2016-07-09 13:13:57 +08:00
Unknwon
401bf944ef Use SecurityProtocol to replace UseSSL in LDAP config
Initially proposed by #2376 and fixes #3068 as well.
2016-07-08 07:25:09 +08:00
Unknwon
4b25bdfbc4 #3058 #3059 support correct page size and link header 2016-07-04 17:27:06 +08:00
Unknwon
6aa00f7bcf #2968 use HTTP_ADDR to replace localhost 2016-07-02 18:54:48 +08:00
Unknwon
6f6b37f148 #3078 update default app.ini 2016-07-01 22:27:52 +08:00
j.yao.SUSE
99c3a9390f change setting.go -> LocalUrl default value to (#3078) 2016-07-01 22:26:15 +08:00
Unknwon
e84ac64964 Do not show filename not have suffifx .md 2016-07-01 15:34:03 +08:00
Unknwon
6f7276278d #3174 genetate bindata 2016-06-29 23:25:41 +08:00
Andrey Nering
743d22669a Re-work MAX_DIFF_LINES: supress diff per file, not the whole diff (#3174) 2016-06-29 23:11:00 +08:00
Cosmin Stroe
84841c8c4b Stricter parsing of issue URLs and commit URLs. (#3121) 2016-06-29 23:07:39 +08:00
Unknwon
274a2ca528 Update locale bindata 2016-06-28 00:26:18 +08:00
Sandro Santilli
8a248696e9 Use a gopher as default avatar (rather than the gravatar logo) (#3208)
Also changes the avatar from a jpeg to a png, to allow for
transparent background. The indexed png is also smaller in size.

Note that at the moment the default avatar is only used when
the user requested a custom avatar and the custom avatar file
is not found (should never happen).

In the future the default avatar could be used as a default
return when by-mail avatar lookups fail too (both gravatar
and libravatar support passing a default)
2016-06-27 18:12:30 +08:00
Franz Schmidt
8b35c194ec Fixes #3110 (#3136) 2016-06-27 17:02:39 +08:00
Unknwon
4bbb878d20 Minor fix for #3194
- Update locale bindata
2016-06-27 16:38:35 +08:00
Unknwon
26342b0c24 Update locale 2016-06-12 18:03:51 +08:00
Paul Tötterman
fb970b9d87 Add ServerName to tls.Config in LDAP auth (#3104)
From https://godoc.org/crypto/tls#Config

    ServerName is used to verify the hostname on the returned
    certificates unless InsecureSkipVerify is given. It is also included
    in the client's handshake to support virtual hosting unless it is
    an IP address.

This is needed for certificate validation without InsecureSkipVerify.
2016-06-01 01:11:28 -07:00
Unknwon
0240f520ab #2954 minor fix for when to set HTML alternative 2016-05-30 01:50:20 -07:00
Unknwon
8df3ba96f3 #2954 use text/plain as default email content format 2016-05-30 01:32:01 -07:00
Sandro Santilli
d35a1c30f4 Do not write HTML in text/plain mail part (#2954)
* Do not write HTML in text/plain mail part

Fixes #2928

* Pass text/plain first, text/html second

* Do not send plain/text email if html2text failed (untested)
2016-05-30 01:18:49 -07:00
Unknwon
8a2347592d locale: update Czech 2016-05-12 14:31:06 -04:00
Unknwon
f473895c41 bindata: follow up data clean 2016-05-11 12:17:52 -04:00
Unknwon
fbf43c31e5 Add Czech support 2016-05-11 12:00:47 -04:00
Kim Carlbäcker
3df8eb60e3 PDF-Previews in file-lists now working (#3000) 2016-04-26 21:48:44 -04:00
Unknwon
7049cb9d97 Add new language support
- Update language choose dropdown to fit more languages
2016-04-25 13:40:23 -04:00
Unknwon
78b8b63774 #2992 set default style name when empty in AfterSet 2016-04-22 18:36:05 -04:00
Cosmin Stroe
ba314a7a36 Support alphanumeric issue style (ABC-1234) for external issue tracker (#2992) 2016-04-22 18:28:08 -04:00
Kim Carlbäcker
ce36fd7a49 Fixed #2909 (#2979) 2016-04-19 16:35:36 -04:00
Unknwon
3257df0da3 Update locales 2016-04-11 18:38:25 -04:00
Unknwon
ac53bb593d #2878 print error of JSON unmarshal and always returns a valid object 2016-03-26 16:42:20 -04:00
Unknwon
b1d41cfa60 #1692 add admin APIs to add/remove a user from teams 2016-03-25 18:04:02 -04:00
Nikko Miu
9a43fcb61c Changed EscapePound function with string replace function 2016-03-24 20:48:52 -05:00
Unknwon
5ec8ef0230 Update locales 2016-03-23 15:56:56 -04:00
Unknwon
004fb30ebe Remove code for checking ssh-keygen 2016-03-19 20:31:23 -04:00
Unknwon
3fb4f7f498 Prepare release 2016-03-19 14:51:41 -04:00
Unknwon
9e09e48502 #2850 fix potential SSH commands dislocation
When use builtin SSH server with concurrent operations, there are probabilities
One connection could use the command from another connections.

Fix this by set SSH_ORIGINAL_COMMAND for each command, not set in global scope.
2016-03-18 06:13:16 -04:00
Unknwon
c79774e8d4 Update locales 2016-03-18 04:03:13 -04:00
Odin Ugedal
8540043c45 Make separate string variables for space 2016-03-15 21:28:55 +01:00
Odin Ugedal
f57adf3637 Fix relative links in markdown files
Replace spaces with "%20" in "urlPrefix", before markdon processing.
The spaces were causing blackfriday (markdown processor) to behave
strange. This fixes #2545.
2016-03-15 20:43:46 +01:00
Unknwon
9976fc6782 Generate bindata for #2823 2016-03-14 16:46:36 -04:00
Unknwon
9bd9ad4205 #1692 add CRUD issue APIs
- Fix go-gogs-client#10
- Related to #809
2016-03-13 23:20:22 -04:00
Unknwon
dd6faf7f9b Convert all API handers to use *context.APIContext 2016-03-13 18:49:16 -04:00
Unknwon
db4da7beec Add APIContext 2016-03-13 17:37:44 -04:00
Unknwon
b4f47a7623 #1891 attempt to fix invalid csrf token 2016-03-12 20:56:03 -05:00
Unknwon
af8eccc02e Update glide.lock 2016-03-12 14:44:28 -05:00
Unknwon
820be19cf5 Merge pull request #2796 from saboya/custom_app_data_path
Making AppDataPath customizable.
2016-03-12 13:53:37 -05:00
Alec S
ebea20b4e7 remove errant debug statement 2016-03-11 16:44:09 -06:00
Unknwon
73e98c91c3 Update locales 2016-03-11 15:47:49 -05:00
Unknwon
2bf8494332 #13 finish user and repository search
Both are possible on explore and admin panel
2016-03-11 15:33:12 -05:00
Unknwon
514382e2eb Rename module: middleware -> context 2016-03-11 11:56:52 -05:00
Unknwon
5267dce210 Fix ref comment from commit create empty feed 2016-03-11 05:11:58 -05:00
Unknwon
eed9966ad6 #2727 fix incompatible SQL in PostgreSQL 2016-03-09 23:18:39 -05:00
Rodrigo Saboya
3cacec9163 Making AppDataPath customizable. 2016-03-09 22:53:42 -03:00
Unknwon
0e9bc2d410 Fix pull request availability check 2016-03-06 23:57:46 -05:00
Unknwon
0ea0c5ec4f Prepare release 2016-03-06 19:55:38 -05:00
Unknwon
58f0c68151 Some minor changes 2016-03-06 16:40:04 -05:00
Unknwon
c18f67ac6a Add Finnish support 2016-03-05 21:13:04 -05:00
Unknwon
a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -05:00
Unknwon
045f14fbd0 #1146 finsih UI work for access mode of collaborators
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
2016-03-05 18:08:42 -05:00
Unknwon
414eb22ef9 #1597 fix activitity feeds for pull requests 2016-03-05 12:58:51 -05:00
Unknwon
a2f13eae55 #1157 some avatar setting changes
- Allow to delete current avatar
2016-03-05 00:51:51 -05:00
Unknwon
2a931937a8 Update locales 2016-03-04 18:51:18 -05:00
Unknwon
2d2d85bba4 #1597 support pull requests in same repository 2016-03-04 15:43:01 -05:00
Unknwon
9df6ce48c5 Minor fixes for #2746 2016-03-04 13:32:17 -05:00
Josh Frye
1ca171dbe9 Add ability to delete single wiki pages. 2016-03-04 09:26:52 -05:00
Unknwon
f6759a731a #2748 fix redirect loop with auto-signin 2016-03-04 09:15:11 -05:00
Unknwon
260723e2cc Minor fixes for #2745 2016-03-03 23:24:22 -05:00
Josh Frye
f3358f5927 Repo setting to delete and disable wiki 2016-03-03 16:12:48 -05:00
Unknwon
f946040fa9 #1891 attempt to fix expected invalid CSRF token
- Remove unused config settings `[picture] service`
2016-03-03 15:09:43 -05:00
Unknwon
9e89584cb4 Allow setting git operations timeouts
- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull
2016-02-29 19:29:49 -05:00
Unknwon
ea80274229 #2700 fix sqlite3 can't create issue with more than one label 2016-02-29 18:45:12 -05:00
Unknwon
8055a0bdac Post work for #2637
Improve test cases, config settings, also show SSH config settings on admin config panel.
2016-02-27 20:48:39 -05:00
Unknwon
83c74878df Merge pull request #2637 from Gibheer/ssh-publickeys
allow native and ssh-keygen public key check
2016-02-27 18:55:14 -05:00
Unknwon
4438b7793b Add new config option for builtin SSH server
Config option [server] SSH_LISTEN_PORT to the port the builtin SSH server will be listen.
It can be different from SSH_PORT which is supposed to be exposed in the clone URL.
This should solve the problem when user runs Gogs inside Docker container
and still want to use builtin SSH server.
2016-02-25 00:21:48 -05:00
Unknwon
baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
Josh Frye
c27038e392 Test mailer button. Addresses #1531 2016-02-24 09:48:05 -05:00
Unknwon
d324500959 Prepare to release 2016-02-24 01:14:43 -05:00
Gibheer
e721c5cf86 use StartSSHServer instead of DisableSSH
DisableSSH doesn't check the kind of ssh server to use, so that was
wrong. Use StartSSHServer instead.
2016-02-23 15:43:52 +01:00
Gibheer
e3570ae45d seperate ssh constants from schema constants
The contants were placed in the same section as the scheme ones, which
may lead to confusion.
2016-02-23 15:41:44 +01:00
Unknwon
72ce06eab8 #2682 fix missing slash for go-get meta 2016-02-23 00:12:04 -05:00
Unknwon
912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Unknwon
ac78bae7b5 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
Unknwon
926e75d721 #2334 strip whitespace for migrate URL
Also fix a possible race condition while install
2016-02-20 17:32:34 -05:00
Unknwon
d5a3021a7d Make markdown as an independent module 2016-02-20 17:10:05 -05:00
Unknwon
d8a994ef24 Move cron module to independent package
Make it easier to keep track of upstream changes and bug fixes
2016-02-20 15:58:09 -05:00
Unknwon
7140dbac95 Fix #857 2016-02-20 15:10:34 -05:00
Adam Strzelecki
a9981d8099 Update bindata for LDAP changes 2016-02-20 14:17:24 +01:00
Adam Strzelecki
5649556a33 LDAP: Make a bit more detailed log traces
This is useful especially to check whether we fetch right attributes, using
right LDAP search base and in right order.
2016-02-20 14:12:32 +01:00
Adam Strzelecki
834d92a47b LDAP: Fetch attributes in Bind DN context option
This is feature is workaround for #2628 (JumpCloud) and some other services
that allow LDAP search only under BindDN user account, but not allow any LDAP
search query in logged user DN context.

Such approach is an alternative to minimal permissions security pattern for
BindDN user.
2016-02-20 14:12:32 +01:00
Adam Strzelecki
e2f95c2845 LDAP: Use single connection in BindDN mode auth
According to RFC 4511 4.2.1. Processing of the Bind Request "Clients may send
multiple Bind requests to change the authentication and/or security
associations or to complete a multi-stage Bind process. Authentication from
earlier binds is subsequently ignored."

Therefore we should not use 2 connections, but single one just sending two bind
requests.
2016-02-20 14:01:47 +01:00
Unknwon
341da3cea7 Fix inappropriate markdown post process end tag check
When <code> is nested inside <pre>, the next end tag token would not able to be the same
as outer-most start tag. So we only check outer-most start and end tag token to be the same.
2016-02-19 17:39:50 -05:00
Unknwon
2408df3f35 Merge pull request #2663 from Download-Fritz/MirrorForks
#2505 Allow to fork and disallow to create PRs for mirrors.
2016-02-19 15:04:50 -05:00
Download-Fritz
a467184e13 #2505 Allow to fork and disallow to create PRs for mirrors. 2016-02-19 20:33:06 +01:00
Unknwon
736a46dff9 Merge pull request #2659 from joshfng/fix-issue-email-format
Fix issue email formatting. Addresses #2331
2016-02-18 16:19:23 -05:00
Josh Frye
0f1b26ed1e Fix issue email formatting. Addresses #2331 2016-02-18 16:08:20 -05:00
Unknwon
338af89d56 #2650 fix possbility that use email as pusher user name
Remove the possibility of using email as user name when user actually push
through combination of email and password with HTTP.

Also refactor update action function to replcae tons of arguments with
single PushUpdateOptions struct.
And define the user who pushes code as pusher, therefore variable names shouldn't
be confusing any more.
2016-02-17 22:47:06 -05:00
Gibheer
12403bdfb0 allow native and ssh-keygen public key check
This commit adds the possibibility to use either the native golang
libraries or ssh-keygen to check public keys. The check is adjusted
depending on the settings, so that only supported keys are let through.

This commit also brings back the blacklist feature, which was removed in
7ef9a05588. This allows to blacklist
algorythms or keys based on the key length. This works with the native
and the ssh-keygen way.

Because of #2179 it also includes a way to adjust the path to
ssh-keygen and the working directory for ssh-keygen. With this,
sysadmins should be able to adjust the settings in a way, that SELinux
is okay with it. In the worst case, they can switch to the native
implementation and only loose support for ed25519 keys at the moment.
There are some other places which need adjustment to utilize the
parameters and the native implementation, but this sets the ground work.
2016-02-16 23:01:56 +01:00
Unknwon
9cf4fe043b Add env var check for update 2016-02-15 23:11:22 -05:00
Unknwon
632c27802c Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon
58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon
aa5e837c65 fix #2454 2016-02-14 20:26:49 -05:00
Unknwon
de3be370f7 Remove unused tests
Module httplib will be replaced a well done third-party package
soon, so remove its unused tests
2016-02-13 18:11:15 -05:00
Josh Frye
8ab5399e83 Make log path required 2016-02-12 10:10:02 -05:00
Josh Frye
1feecd6beb Add helper text for log path. 2016-02-12 09:24:09 -05:00
Josh Frye
a3e8c32a30 Add install option for log path 2016-02-12 09:19:45 -05:00
Unknwon
5258ee3740 Update locales and update sponsor 2016-02-11 13:34:21 -05:00
Unknwon
297e772c20 #2485 fix payloads mixed up for webhook
When repository contains a Slack type hook,
it changes original payload content.

This patch fixes it by using a local object to store
newly created Slack payload instead of assigning
back to the same variable.
2016-02-10 15:21:39 -05:00
Andrey Nering
e40d94bb4f Implementing the "theme-color" meta tag.
Used by Android >= 5.0 to make the top bar colored.

Reference: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
2016-02-08 17:03:18 -02:00
Unknwon
08ff1b7d4b Merge pull request #2579 from nanoant/patch/fix-ldap-username
Fix #2221 LDAP username attribute must be fetched
2016-02-07 12:27:10 -05:00
Adam Strzelecki
3808638df1 Fix #2221 LDAP username attribute must be fetched
This is fix-up for 573305f. Forgot to fetch AttributeUsername value from the
LDAP server, so the setting was effectively not working as intended.
2016-02-07 18:18:29 +01:00
Unknwon
ee53204e02 Improve db path prompt when install 2016-02-07 11:51:53 -05:00
Unknwon
f15a2f9b25 Merge pull request #2528 from andreynering/diff-sintax-highlight-733
Enable syntax highlighting on diff view
2016-02-07 11:49:11 -05:00
Unknwon
acfc942ad7 Generate CSS for #2561 2016-02-05 14:53:45 -05:00
Unknwon
4e96a4a62b Merge pull request #2406 from bkcsoft/feature/markdown-custom-url-scheme
Feature/markdown custom url scheme
2016-02-05 13:11:45 -05:00
Unknwon
8e40f86d2c #2556 handle space in image URL 2016-02-04 22:51:40 -05:00
Andrey Nering
2bfb8bb5fd Enable sintax highlighting on diff view. Close #733 2016-02-04 18:21:47 -02:00
Unknwon
ddf9fa06c7 Minor fix for #2530 2016-02-04 13:03:34 -05:00
Unknwon
739d5aa1d3 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page
Hide other teams & repos from organization page
2016-02-04 12:52:11 -05:00
Unknwon
04be8c0de5 #2554 reinitialize all repos from the db
- Update locales
2016-02-04 12:51:00 -05:00
Unknwon
1c74612b3c Minor fix for #2444 2016-02-01 20:55:12 -05:00
Unknwon
3abad75a1b Fix one user may block entire listen loop for builtin SSH 2016-02-01 12:10:49 -05:00
Unknwon
4848620594 #2229 adjust URL verbose depth for reverse proxy sub-path 2016-01-31 15:38:20 -05:00
Florian Kaiser
9cf95e4e37 Organization owners see all repositories & teams 2016-01-31 16:14:24 +00:00
Florian Kaiser
8c4588c4c9 Refactor .IsAdminTeam to .IsTeamAdmin and requireAdminTeam to requireTeamAdmin 2016-01-31 15:30:07 +00:00
Florian Kaiser
e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser
abc5abce30 Allow modification of a release if Content is empty (fix #2516) 2016-01-30 13:39:02 +00:00
Unknwon
112a7cab31 #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Unknwon
a4a23c0268 Merge pull request #2508 from MilesPong/develop
Fixed gravatar url
2016-01-29 05:44:00 -05:00
miles@Oscar
beefc53e59 Using https for gravatar 2016-01-29 13:06:17 +08:00
miles@Oscar
1becf01cfa Fixed gravatar url 2016-01-29 11:05:41 +08:00
Unknwon
b900150b1d Update locales 2016-01-28 06:15:49 -05:00
Kim "BKC" Carlbäcker
1ab8a60d73 Not working, but slightly better... 2016-01-27 21:48:57 +01:00
Kim "BKC" Carlbäcker
3a9fd81f59 Custom URL-Schemas for Markdown 2016-01-27 02:02:03 +01:00
Unknwon
e33ddac9bf Minor fix for #2396 2016-01-25 14:04:46 -05:00
Unknwon
71b9537393 Merge pull request #2396 from bkcsoft/feature/markdown-checklist
[Feature] Markdown Checklist-rendering
2016-01-25 13:56:13 -05:00
Unknwon
b33abc6280 Merge pull request #2432 from nd/develop
Fix #2431 - handle requests waiting for reply
2016-01-25 13:16:32 -05:00
Unknwon
38efa72146 Update locales 2016-01-25 02:33:52 -05:00
Pourya Daneshvar
863ff19e1f Fixed forgotten err variable assignment 2016-01-24 10:24:21 +03:30
Dmitry Neverov
fb99d50fa1 Fix #2431 - handle requests waiting for reply
According to the docs [1], the Reply method must be called for all
requests where WantReply is true. This fixes a hanging java ssh
implementation (jsch) which sets WantReply flag and waits for reply from
the server.

[1] https://godoc.org/golang.org/x/crypto/ssh#Request.Reply
2016-01-18 16:54:10 +01:00
Unknwon
7ef9a05588 #2179 use Go sub-repo ssh to verify public key content 2016-01-15 18:39:51 +08:00
Kim "BKC" Carlbäcker
a1a4f1103c Made Sanitizer-setup cleaner 2016-01-14 03:00:05 +01:00
Kim "BKC" Carlbäcker
8e09e03127 Checklist-rendering implemented 2016-01-13 13:25:52 +01:00
Unknwon
f43cc90841 #2287 Truncate repository name if too long 2016-01-11 20:41:43 +08:00
Unknwon
a2ef9a2b64 update locale 2016-01-11 18:30:44 +08:00
Unknwon
db719abff2 stop compile bindata for TRANSLATORS
- update required version of git-module for #2373
2016-01-11 15:01:38 +08:00
Unknwon
cc8c67ff29 fix markdown autolink error 2016-01-09 10:59:04 +08:00
Unknwon
ca35ddd078 fix #2350 2016-01-07 09:24:19 +08:00
zhuharev
0d5dc8a064 typo fix 2016-01-06 22:41:42 +03:00
Unknwon
0cb7396840 update locale 2016-01-06 18:44:57 +08:00
Kim "BKC" Carlbäcker
8fe5d887ae Changed name from inline to unified 2016-01-05 19:21:50 +01:00
Kim "BKC" Carlbäcker
4e6d048ba1 i18n-fix for split-view 2016-01-05 19:21:49 +01:00
Unknwon
7392b6a755 fix #2327 2016-01-05 12:43:19 +08:00
Unknwon
4993ab1a76 #2185 fall back to use custom chardet lib 2015-12-31 22:13:47 -05:00
Unknwon
44637f03cc #2282 fast detection of utf-8 2015-12-27 17:02:36 -05:00
Unknwon
93f03707a7 #2283 set text/plain for non-binary files in raw mode 2015-12-25 05:45:07 -05:00
Unknwon
85af36332b #2282 fix utf-8 recognized as windows-1252 2015-12-25 05:25:47 -05:00
Unknwon
13fe733037 #2264 use monospaced font for commit IDs in news feeds 2015-12-24 20:43:45 -05:00
Unknwon
a49af93faf #1692 APIs: Users Followers
- User profile un/follow
- List user's followers/following
2015-12-21 04:24:11 -08:00
Unknwon
c62a6b7a12 #2014 allow switch branches between two orgs in compose PR 2015-12-20 01:06:54 -05:00
Unknwon
53eb37d529 fix #1436 2015-12-19 21:43:32 -05:00
Unknwon
2d3ecbe5b2 make mailer log more verbose 2015-12-19 02:44:34 -05:00
Unknwon
09c981846b update locales 2015-12-18 07:54:44 -05:00
Unknwon
037a01c4e4 fix #2189 2015-12-18 05:49:28 -05:00
Unknwon
1d95844d55 prepare release 2015-12-18 00:54:27 -05:00
Unknwon
1e7e092992 #2103 Ability to map extensions for syntax highlighting in config 2015-12-17 22:31:34 -05:00
Unknwon
9cd16c5b12 #1692 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon
6673dcb038 #2103 #2181 improvments of highlight class name 2015-12-16 22:13:12 -05:00
Unknwon
b117befc2b #1692 add user email APIs 2015-12-15 22:57:18 -05:00
Unknwon
8ecbf0f16d fix #2204 2015-12-15 19:42:20 -05:00
Unknwon
19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon
ea375c0dcc new template func 2015-12-13 23:16:58 -05:00
Unknwon
acdb4d8bdd Drop Go 1.3 support 2015-12-13 20:20:52 -05:00
Unknwon
95f9c85bcc #2185 use Go sub-repo to detect encoding 2015-12-13 19:56:33 -05:00
Bruno
9a27e5ccdc ignore invalid env 2015-12-13 20:17:47 +08:00
Unknwon
7e88420bc6 #2161 fix wrong regexp 2015-12-12 16:13:18 -05:00
Unknwon
5911fc3512 #2161 No issue linking in commits when issue number in brackets 2015-12-12 16:01:54 -05:00
Unknwon
e444a67d59 update locales 2015-12-12 14:47:11 -05:00
Unknwon
59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon
477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon
d0b0d24f22 #2154 disable change user for non-local users
- #2153 remove require for gravatar
2015-12-11 15:31:02 -05:00
Unknwon
98da7241a0 fix sqlite3 cannot create repo 2015-12-11 10:13:19 -05:00
Unknwon
40f3142264 #2114 External URL for wiki 2015-12-11 04:55:08 -05:00
Unknwon
3d5d61778a #1938 #1374 disable password change for non-local users 2015-12-10 19:02:57 -05:00
Unknwon
df5ed64cca #1301 "read-only" users 2015-12-10 12:46:05 -05:00
Unknwon
2a0bb1fa90 #1575 Limit repo creation 2015-12-10 12:37:53 -05:00
Unknwon
c6083c335e #1612 Ability to send mail when a new pull request is submitted 2015-12-10 11:18:56 -05:00
Unknwon
9a2e43bff2 move out git module and #1573 send push hook 2015-12-09 20:46:05 -05:00
Unknwon
bd5dc626e8 Merge pull request #2139 from angus-g/fixes/pr-messages
Reword messages for PR auto merging (#2117)
2015-12-09 17:31:46 -05:00
Angus Gibson
626dc1f0bd Reword messages for PR auto merging (#2117) 2015-12-10 09:28:49 +11:00
Adam Strzelecki
b886fb4bf0 LOCAL_ROOT_URL for workers accessing web service
Local (DMZ) URL for gogs workers (such as ssh update) accessing web service. In
most cases you do not need to change default http://localhost:HTTP_PORT/. You
may need to alter it only if your ssh server node is not the same as http node,
eg. running behind proxy on different node than web server.

                     --- 80 public port -> 8080 -- web server node
                    /
    public proxy --<
                    \
                     --- 22 public port -> 10022 -- ssh server node

This option is not intended to be accessible via web GUI settings, since it is
unlikely someone needs to change it to somethings else than default
http://localhost:HTTP_PORT/ which should work for most of the cases.

But this should land into the documentation somewhere.

fixup
2015-12-09 23:11:07 +01:00
Unknwon
718d3ae258 #1943 Able to config fsck timeout 2015-12-09 11:38:12 -05:00
Unknwon
b8d48bdb62 #2037 Add "New Mirror" button on Dashboard 2015-12-09 11:24:56 -05:00
Unknwon
a576224d0e unified name: IsViewBranch, IsViewCommit and IsViewTag 2015-12-09 00:32:53 -05:00
Angus Gibson
06d293a84e Only show comparison link for >2 commits #1110
We can look at the PushCommits object to see how many commits were
included in a commit, and add some template logic to only show the
comparison link when there are at least 2 commits in a push. We also
correct the link to display the number of commits.
2015-12-09 14:36:39 +11:00
Unknwon
120cd4e471 #1984 Better mirror repo management 2015-12-08 20:06:12 -05:00
Unknwon
1cbd4c01fb #2115 more precise error message 2015-12-08 01:11:40 -05:00
Adam Strzelecki
3df5dcc1dc Allow pre-receive hook customization
This hook can be used for example to reject too large commits and it is
executed before "update" hook, used exclusively by Gogs to update its state.

https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
2015-12-08 01:28:32 +01:00
Unknwon
4e0c697aaf force new INI version 2015-12-07 11:33:04 -05:00
Unknwon
3ffbb54337 minor fix for #2113 and other locales 2015-12-07 00:10:08 -05:00
Adam Strzelecki
e2ca53029e Render commit msg as header + verbatim description
Most commit in Git are expected to follow standard of single header line,
followed by description paragraphs, separated by empty line from previous block.

Previously Gogs were treating everything as single header. Now we are trying to
render only first line as header, but following lines (description chunks) as a
verbatim.
2015-12-07 01:50:45 +01:00
Unknwon
b5f6206a65 prepare release 2015-12-06 15:34:17 -05:00
Alex Myasoedov
ae54d878c0 Fix misspelled words 2015-12-06 16:42:23 +02:00
Unknwon
ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
Unknwon
978dc00305 APIs: admin users 2015-12-05 17:13:13 -05:00
Unknwon
404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon
f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon
e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon
942fd6be53 fix panic for #2045 2015-12-04 17:20:23 -05:00
Unknwon
56dd430a10 refactor API routes and some work for #976 2015-12-04 17:16:42 -05:00
Unknwon
b83cb36049 minor fix for #2086 2015-12-02 19:45:43 -05:00
Unknwon
e350d74c8a fix #2085 2015-12-02 18:58:13 -05:00