coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,999 Commits 12 Branches 0 Tags 118 MiB
Commit Graph

1465 Commits

Author SHA1 Message Date
btrepp 25b5ffb6af Enables mssql support (#383) 
* Enables mssql support

Port of dlobs work in gogs.
Enables options in index.js
Enables MSSQL as a database option in go.
Sets ID to 0 on initial migration. Required for
MSSQL insert statements.

Signed-off-by: Beau Trepp <beautrepp@gmail.com>

* Vendors in denisenkom/go-mssqldb

Includes golang.org/x/crypto/md4
as this is required by go-msssqldb

Signed-off-by: Beau Trepp <beautrepp@gmail.com>
 2016-12-24 09:37:35 +08:00
Lunny Xiao a12da66dfb resolved #394 (#396) 2016-12-23 01:26:01 +01:00
Lunny Xiao 0e1392501d Check if file is a symlink with web editor (#3687) (#445) 
* Check if file is a symlink with web editor (#3687)

* editor checks for symlinks

* translate file_is_a_symlink message

* credit translation author

* fix error constant
 2016-12-22 13:27:32 +01:00
Lunny Xiao 65b1875d2b New settings option for a custom SSH host (#3763) (#446) 
* New settings option for a custom SSH host (#3763)

* let default ssh listen addr empty
 2016-12-22 13:26:43 +01:00
Lunny Xiao 47a7529d96 update code.gitea.io/git (#450) 2016-12-22 10:30:52 +01:00
Ethan Koenig 4c89a9c33c Bug fixes and tests for modules/base (#442) 
Also address other TODOs
 2016-12-22 16:58:04 +08:00
Kim "BKC" Carlbäcker df7fa4e995 issue comment api fix (#449) 
* ListAllInRepo & Delete Issue-Comments

* Moar data in issue-comments
 2016-12-22 16:29:26 +08:00
Alexander Lunegov d5d21b67d2 Fix string format verbs (#3637) 2016-12-22 08:18:41 +01:00
Denis Denisov 380e32e129 Fix random string generator (#384) 
* Remove unused custom-alphabet feature of random string generator

Fix random string generator

Random string generator should return error if it fails to read random data via crypto/rand

* Fixes variable (un)initialization mixed assign
Update test GetRandomString
 2016-12-20 13:32:02 +01:00
Nico Mandery 6ade13e86e serve video files using the HTML5 video tag (#418) 
* serve video files using the HTML5 video tag

* lint fix: add comment to IsVideoFile
 2016-12-20 16:09:11 +08:00
Lunny Xiao 15c3d14d55 fixed vulnerabilities on deleting release (#399) 2016-12-16 19:42:39 +08:00
Lunny Xiao b4c794058a fixed vulnerabilities (#392) 2016-12-15 16:49:06 +08:00
Ethan Koenig 7b5b5178e1 Bug fix for edit-hook API endpoint 2016-12-09 20:11:56 +01:00
Ethan Koenig 04b9a7e7a2 Bug fixes for repo permissions in API 
Also move duplicated code into repo.APIFormat(..)
 2016-12-07 12:55:24 +01:00
Thomas Boerger 83ed234472 Integrate templates into bindata optionally (#314) 
Integrated optional bindata for the templates
 2016-12-06 18:58:31 +01:00
Kim "BKC" Carlbäcker 0f05470cb8 [API] Pull Requests (#248) 2016-12-02 12:10:39 +01:00
Kim "BKC" Carlbäcker e8e0539b45 Linting 2016-12-02 09:31:44 +01:00
Kim "BKC" Carlbäcker e6cfccdd40 GitHub API Compliance (& linting) 2016-12-02 09:18:15 +01:00
Kim "BKC" Carlbäcker 71bb6df75a Add undocumented endpoint for /repositories/:id 2016-12-02 09:18:15 +01:00
Bwko 5ab85372da Added rel="noopener" to target="_blank" hrefs (#327) 
* Added rel="noopener" to target="_blank" hrefs

* Replaced gogs.io/docs with docs.gitea.io
 2016-12-02 09:12:16 +08:00
Lunny Xiao 590a79ff8a Resolved #296 (#324) 
* resolved #296

* Indentation fixed
 2016-12-01 18:52:57 +08:00
Lunny Xiao 2343feadd4 resolved #310: hide fork to self (#323) 2016-12-01 18:51:50 +08:00
Thomas Boerger 2932042a6d Get rid of bin folder within makefile, enabled TiDB (#319) 
* Get rid of the bin folder within the build process

Signed-off-by: Thomas Boerger <thomas@webhippie.de>

* Dropped latest make task, it is unused

Signed-off-by: Thomas Boerger <thomas@webhippie.de>

* Added tidb tag to drone config

Signed-off-by: Thomas Boerger <thomas@webhippie.de>

* Dropped the cert build tag

Signed-off-by: Thomas Boerger <thomas@webhippie.de>

* Dropped useless minwinsvc build tag

Signed-off-by: Thomas Boerger <thomas@webhippie.de>

* Dropped the useless build tags from drone config

Signed-off-by: Thomas Boerger <thomas@webhippie.de>
 2016-12-01 15:28:43 +08:00
Kim "BKC" Carlbäcker 42ec5ce740 Fix breakage from vendor-update 2016-11-29 11:50:22 +01:00
Lunny Xiao ec87a75c00 golint fixed for modules/auth 2016-11-27 21:39:06 +08:00
Bwko a4ece1f223 Fixes typos 2016-11-27 12:59:12 +01:00
Andrey Nering c664ffd1db Merge pull request #270 from andreynering/gitea/http-headers-download 
Fix HTTP headers for issue attachment download
 2016-11-27 08:48:26 -02:00
Lunny Xiao 94da472717 Golint fixed for modules/setting (#262) 
* golint fixed for modules/setting

* typo fixed and renamed UNIXSOCKET to UnixSocket
 2016-11-27 18:14:25 +08:00
Andrey Nering d647d02c2f Fix Chrome not liking commas 2016-11-26 11:26:03 -02:00
Andrey Nering 638dd24cec Fix HTTP headers for issue attachment download 
- Download filename was wrong for files other than images. Example: It was `download` instead of `file.pdf`
- PDF was downloading instead of showing on browser
 2016-11-26 10:13:25 -02:00
Thomas Boerger 32f8a38f6c Merge pull request #254 from lunny/lunny/golint_modules_context 
Golint fixed for modules/context
 2016-11-25 10:11:52 +01:00
Lunny Xiao faabc76fd6 Golint fixed for modules/context 2016-11-25 14:53:59 +08:00
Lunny Xiao 229ec927b9 Golint fixed for modules/template 2016-11-25 14:23:48 +08:00
Thomas Boerger b6b616b336 Merge pull request #228 from Bwko/feature/short-hash-download 
Added short-hash support to downloads
 2016-11-24 13:38:14 +01:00
Bwko ff0d1bd602 Added short-hash support to downloads 2016-11-24 11:45:16 +01:00
Lunny Xiao 6ed7f269f1 Move init functions from routers/install to routers/init (#230) 
* move init functions from routers/install to routers/init

* copyright typo
 2016-11-24 15:40:16 +08:00
Lunny Xiao 3917ed45de golint fixed for routers (#208) 2016-11-24 15:04:31 +08:00
Lunny Xiao cb1602840c golint fixed for routers/repo/branch.go (#206) 2016-11-22 16:32:00 +08:00
Lunny Xiao b2cce12980 golint fixed for routers/repo/wiki.go (#203) 2016-11-21 18:03:42 +08:00
Lunny Xiao f0df8e8dfa golint fixed for routers/repo/middlewares.go (#204) 2016-11-21 18:03:37 +08:00
Lunny Xiao 18dc4f1023 golint fixed for routers/repo/view.go (#205) 2016-11-21 18:03:29 +08:00
Lunny Xiao 659bc2814c go lint fixed for routers/admin 2016-11-21 11:29:25 +08:00
Bwko 7b75d93f3d Fix for anonymous users to switch views 2016-11-19 16:53:34 +01:00
Bwko fc3ed8a1de Fix panic when no user is signed in 
See #188
 2016-11-19 12:43:10 +01:00
Lunny Xiao cf045b029c golint fixed for parts of routers root, dev, user and org dirs (#167) 
* golint fixed for parts of routers root, dev and org dirs

* add user/auth.go golint fixed

* rename unnecessary exported to unexported and user dir golint fixed
 2016-11-18 11:03:03 +08:00
Ethan Koenig 0834e492c0 API endpoints for stars 2016-11-16 22:51:54 -05:00
Sandro Santilli cd339263d9 Allow updating draft releases while keeping them as draft 
Closes #162
 2016-11-14 18:02:21 +01:00
Andrey Nering 739f07c98e Remember diff view style (#163) 2016-11-13 10:54:04 +08:00
Thibault Meyer ddee4c8b58
Normalize files with gofmt 2016-11-11 13:11:45 +01:00
Sandro Santilli a1c5f02444 Fix import path of go-sdk (#141) 
From code.gitea.io/go-sdk/gitea
  To code.gitea.io/sdk/gitea
 2016-11-11 17:39:44 +08:00
Sandro Santilli 4247304f5a Update import paths from github.com/go-gitea to code.gitea.io (#135) 
- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis

See https://docs.travis-ci.com/user/languages/go#Go-Import-Path
 2016-11-10 17:24:48 +01:00
Matthias Loibl 31da225309 Check unhandled errors (#128) 2016-11-10 08:02:01 -02:00
Lunny Xiao 1b238fe4d5 Merge pull request #121 from joubertredrat/feature-last-login 
Last Login for admin manage your users
 2016-11-10 17:20:55 +08:00
Thibault Meyer 3a10a0c1ca
Ordering organizations and users by name 2016-11-10 09:18:54 +01:00
Joubert RedRat f91cbf0fed Support to last login feature 2016-11-09 08:53:45 -02:00
Matthias Loibl 45c4539c61 Merge pull request #17 from LefsFlarey/issue/3666 
Fixed 404 caused by unexpected question mark
 2016-11-08 18:27:59 +01:00
Flare 01c5233b53
Fixed 404 caused by unexpected question mark 
This fixes 404 caused when creating new files or wiki pages with question marks. Amended to force CI rebuild
 2016-11-08 22:09:48 +08:00
Lunny Xiao 5667d4daae Merge pull request #73 from bkcsoft/gt/2164-release-pagination 
Add Pagination to Releases-page (and de-duplicate pagination templates)
 2016-11-08 10:39:03 +08:00
Sandro Santilli 864d1b1f9f Fix type in unused constant name (#111) 
* Write LDAP, SMTP, PAM, DLDAP back to all uppercase

* Fix type in unused constant name

* Other MixCased fixes

* Complete MixerCasing of template constants

* Re uppercase LTS and LDAPS suffixes

* Uppercase JSON suffix in constant names

* Proper case LoginNoType

* Prefix unexported template path constants with "tpl"
 2016-11-07 18:58:22 -02:00
Sandro Santilli b7bf9dfd28 more 2016-11-07 17:55:31 +01:00
Sandro Santilli aadd7dcdc3 And others 2016-11-07 17:53:22 +01:00
Sandro Santilli 05fd9d3f09 Security protocols 2016-11-07 17:38:43 +01:00
Sandro Santilli 7612b5ec40 More mixage 2016-11-07 17:37:28 +01:00
Sandro Santilli 64196d4036 More overlooks 2016-11-07 17:35:34 +01:00
Sandro Santilli 60c82a8780 More... 2016-11-07 17:30:04 +01:00
Sandro Santilli f6a11e0de1 More MixedCase consts 2016-11-07 17:24:59 +01:00
Sandro Santilli f388661bda ACCESS_MODE_* -> AccessMode* 2016-11-07 17:20:37 +01:00
Sandro Santilli 0b62aeb495 More MixedCase consts 2016-11-07 17:08:21 +01:00
Sandro Santilli 80eea77953 Use MixedCase constant names 
See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps
 2016-11-07 17:05:08 +01:00
Thomas Boerger 5d430c9e68 Merge pull request #108 from go-gitea/go-sdk 
Replaced gogits go-gogs-client with go-sdk
 2016-11-07 16:31:17 +01:00
Thomas Boerger 4c6c16f358
Replaced go-gogs-client with go-sdk imports 2016-11-07 16:10:32 +01:00
Thomas Boerger 77f9c7e571
Fixed links to sdk docs 2016-11-07 16:10:32 +01:00
Sandro Santilli b7263f31a5 Replace GOGS with GITEA in variable names 
Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.

Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...

Closes #87
 2016-11-07 16:05:18 +01:00
Kim "BKC" Carlbäcker 86fb1a0cb1 Add Pagination to Releases-page 2016-11-07 11:41:09 +01:00
Rachid Zarouali be5607e510 Merge pull request #50 from 0xbaadf00d/feature/2583-disablehttpcloning 
Disable HTTP cloning
 2016-11-07 11:23:30 +01:00
Odin Ugedal 5a6f7edde9 Use the rev-parsed sha1 commit id (#98) 
Use the rev-parsed sha1 commit id in urls to repo files,
instead of the abbreviated version.
 2016-11-06 19:15:44 -02:00
Odin Ugedal 530f6c1da4
Fix rendering of non-markdown readme files 2016-11-06 16:02:42 +01:00
Sandro Santilli 6e4252dad4 Replace gogits/git-module dependency with go-gitea/git (#94) 
* Replace gogits/git-module dependency with go-gitea/git

Fixes #92

* Remove git alias for git module import (not needed)
 2016-11-06 11:18:34 -02:00
Sandro Santilli f36544f98d Merge branch 'master' into feature/goimports 2016-11-05 22:54:20 +01:00
Andrey Nering bd898a10f8 Refactor editorconfig middleware 2016-11-05 15:44:14 -02:00
Matthias Loibl 1f44b01e2a Fix imports found by goimports. 2016-11-05 17:56:35 +01:00
Andrey Nering 984fa8d83b Fix 500 when repo has invalid .editorconfig 
Creating a notice instead
 2016-11-05 13:33:41 -02:00
Thomas Boerger e05a5ca36c
Executed go fmt for all files 2016-11-04 23:45:06 +01:00
Rémy Boulanouar 8dc49dc114 Implementation of the feature to redirect to an external issue tracker 2016-11-04 09:06:54 +01:00
Andrey Nering 87b593f93e Show issue/PR number on title 2016-11-03 20:28:05 -02:00
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs (#37) 2016-11-03 10:29:56 -02:00
LefsFlare 2cb5ec5983 Prevented user enumeration of valid users through HTTP status codes of login (#3639) (#3654) 2016-10-16 22:08:40 -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 6da55159a2
#3589 LoadRepoConfig after ORM is initialized 2016-09-02 23:18:37 -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 dadd35b636 #3559 fix template error 2016-08-31 13:59:23 -07:00
Unknwon 152e715999 models/login_source: code improvement 2016-08-31 01:22:41 -07:00
Unknwon 99c2ae7b35 #3515 use alert instead 500 for duplicated login source name 2016-08-31 00:56:10 -07:00
无闻 cd9b926af7 Support Editorconfig on web editor (#3512) 2016-08-30 16:47:22 -07:00
Andrey Nering 9ac46fb983 Support Editorconfig on web editor 2016-08-30 20:30:47 -03: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 643142acab Web editor: support upload files 2016-08-30 05:23:59 -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 429c92c0ce #3516 enforce line ending to be \n from web editor 2016-08-28 05:32:10 -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 6e171c5225 Web editor: improve edit file tooltip 2016-08-27 15:25:01 -07:00
Unknwon f0b5c3b90a #3448 redirect if any after sign in 2016-08-27 15:07:02 -07:00
Unknwon 13a8823bd3 #3495 only start builtin SSH server after user finish installation 2016-08-27 12:25:22 -07:00
Unknwon 6b98d58906 #2966 code cleanup 2016-08-26 13:40:53 -07:00
Iwan Budi Kusnanto 8dca9f95fa issues comment API : list, create, edit (#2966) 
add `since` query string support to list issue comment
 2016-08-26 11:23:21 -07:00
Unknwon f8a48ffaad Web editor: improve code quality 2016-08-24 21:35:03 -07:00
Kurt Madel 67fb0fe6a5 added support to set pull_request event from api (#3513) 2016-08-24 20:44:58 -07:00
Unknwon 0b273ac4d5 #3383 code cleanup 2016-08-24 16:05:56 -07:00
lstahlman 84b56c3c53 Additional API support for milestones (#3383) 2016-08-24 15:18:56 -07:00
Kim Carlbäcker 7c5710d31f Issues can be closed via API (#3170) (#3479) 
* Issues can be closed via API

* Error-checking is nice xD

* EditIssueOption.Status => State

* Use const instead of string-literal
 2016-08-23 09:09:32 -07:00
Unknwon a00c932bbc General code quality improvement 2016-08-16 23:06:38 -07:00
Unknwon 6f9a95f830 #2246 add HTMLURL to webhook type 
- Fill Milestone and Assignee field when available in webhook payload
 2016-08-16 10:19:09 -07:00
Unknwon 6cda35a75f #3464 reproduce diff signs 2016-08-16 07:31:54 -07:00
Unknwon 2625193a48 models/repo_editor: improve code quality 2016-08-15 22:20:55 -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 61e27dedf7 #3466 fix response of pull request form validation error 2016-08-15 14:04:44 -07:00
Unknwon 94392a7af3 Fix empty repository panic on send test webhook 2016-08-15 05:53:47 -07:00
Unknwon 8637e67e6f Fix outdated edit can’t overwrite changes 2016-08-15 02:06:35 -07:00
Unknwon 4a19fd6441 Web editor: temporarily disable upload and quick fix for edit and new 
Try to merge into develop branch ASAP, then continue minor fixes afterwards.
 2016-08-15 01:42:20 -07:00
Unknwon 54e0ada9d5 Web editor: improve delete file 2016-08-14 23:52:24 -07:00
Unknwon cd89f6c502 Web editor: improve edit file and diff preview 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 dccb0c15b9 Replace convert.To with APIFormat calls 2016-08-14 04:17:26 -07:00
Unknwon 3f7f4852ef #2246 fully support of webhooks for pull request 2016-08-14 03:32:24 -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
Unknwon 2cb04db526 Fix #3391 2016-08-11 15:29:39 -07:00
Unknwon a47aef5460 #2852 code cleanup 2016-08-11 14:55:10 -07:00
Unknwon 70fbcd2f27 models: rename EnableTidb to EnableTiDB 2016-08-11 14:38:45 -07:00
Thibault Meyer 53c573ed02 Fix #3314: Cannot edit release with tag name contains slash (#3434) 2016-08-11 13:45:42 -07:00
Robin Lambertz 5a9709fa9d Add MaxRepoCreation to EditUser API (#2781) 2016-08-11 11:49:31 -07:00
Unknwon 7e9b42c87d #2780 code clean up 2016-08-11 11:35:46 -07:00
Robin Lambertz b6c14f8b21 Add AddCollaborator API Endpoint (#2780) 
* Add AddCollaborator API Endpoint

* Add optional Permission to AddCollaborator endpoint

* Use APIContext
 2016-08-11 11:23:25 -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 b85927e488 #3091 show Git configs on admin panel 2016-08-10 11:01:42 -07:00
lstahlman 89f71b44f7 Add committer information to API and Webhooks. Also fixes #3271 (#3414) 2016-08-09 22:01:57 -07:00
Unknwon edd786446c #3158 skip RUN_USER check on Windows 2016-08-09 17:41:18 -07:00
Unknwon f70343660d Little code refactoring 2016-08-09 12:56:00 -07:00
Rory McNamara c8b45ecc27 Render the Code view on the server (minus syntax highlighting) (#2942) 
* render code view server side

* remove debug print

* fix multiline selection bug

* change string concatenation to bytes.Buffer for efficiency

* Fix newlines added by previous for hljs

* fix selection highlighting

* make css changes in .less
 2016-08-09 12:35:20 -07:00
lstahlman 2c82fc3edb Fix for #3410 overall issues for organisations is limited to num_repos from the user (#3412) 2016-08-09 10:00:42 -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
Thibault Meyer 30fda0f1ae Fix #3315: Release dont use tag creation date (#3374) 
* Fix #3315: Release dont use tag creation date

* Simplify code and apply gofmt

* remove useless block (ctx.Repo.GitRepo.GetTag) on EditReleasePost

* apply gofmt on modified files
 2016-08-06 10:02:15 -07:00