lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,793 Commits
1 Branch
0 Tags
229 MiB
Commit Graph

1486 Commits (1610b9f547982af08e771e979718ae9e84b573b6)

Author SHA1 Message Date
Lunny Xiao 21846d16e5 golint for models/org_team.go 2016-11-28 09:30:08 +08: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
Thomas Boerger 5efdccd1d8 Merge pull request #264 from Bwko/lint/org.go 
Lint models/org.go
 2016-11-27 12:18:20 +01:00
Thomas Boerger 9a984c0d49 Merge pull request #266 from Bwko/lint/repo_mirror 
Lint models/repo_mirror.go
 2016-11-27 12:15:01 +01:00
Thomas Boerger fe3908d099 Merge pull request #268 from Bwko/lint/repo_branch 
Lint models/repo_branch.go
 2016-11-27 12:14:25 +01:00
Thomas Boerger e23a9d22e5 Merge pull request #267 from Bwko/lint/ssh_key 
Lint models/ssh_key.go
 2016-11-27 12:13:43 +01:00
Thomas Boerger 93d527a0a4 Merge pull request #265 from Bwko/lint/access.go 
Lint models/access.go
 2016-11-27 12:12:56 +01:00
Thomas Boerger 8347a55cc2 Merge pull request #263 from Bwko/lint/user_email 
Lint models/user_email.go
 2016-11-27 12:12:02 +01: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
Bwko 0b9cf10340 Lint models/org.go & models.go 2016-11-26 11:37:50 +01:00
Bwko 7bf7042013 Lint models/repo_mirror.go 2016-11-26 11:23:55 +01:00
Bwko ce8c9ef580 Lint models/repo_branch.go 2016-11-26 11:20:37 +01:00
Bwko 6cde041080 Lint models/ssh_key.go 2016-11-26 01:36:03 +01:00
Bwko 2bb1601d7c Lint models/access.go 2016-11-26 01:07:57 +01:00
Bwko 066f515a47 Lint models/user_email.go 2016-11-26 01:03:06 +01:00
Thomas Boerger 574e49c854 Merge pull request #241 from Bwko/lint/admin.go 
Lint models/admin.go
 2016-11-25 12:55:24 +01:00
Thomas Boerger 21b7d30174 Merge pull request #245 from Bwko/lint/update&slack 
Lint models/update.go, release.go & webhook_slack.go
 2016-11-25 12:55:14 +01:00
Thomas Boerger e9c6053b86 Merge pull request #246 from Bwko/fix/typo 
Fix typos
 2016-11-25 12:54:57 +01:00
Thomas Boerger 3e6f363471 Merge pull request #256 from lunny/lunny/golint_modules_avatar 
Golint fixed for modules/avatar
 2016-11-25 10:11:44 +01:00
Thomas Boerger 7c5de1e393 Merge pull request #250 from lunny/lunny/golint_modules_markdown 
Golint fixed for modules/markdown
 2016-11-25 10:08:23 +01:00
Lunny Xiao 3c87c57d96 golint fixed for modules/avatar 2016-11-25 16:37:04 +08:00
Bwko c0ca6644ad Lint/issue &mail (#243) 
* Lint models/release.go

* Lint models/ issue_label, issue_mail & mail.go
 2016-11-25 16:11:12 +08:00
Bwko 081c2a9395 Lint models/token.go (#244) 2016-11-25 16:03:52 +08:00
Lunny Xiao 76604d8f90 fixed test build error 2016-11-25 16:02:10 +08:00
Bwko 33a2ac3830 Lint models/update.go & webhook_slack.go 2016-11-25 07:55:08 +01:00
Lunny Xiao 304bbd3f25 golint fixed for modules/markdown 2016-11-25 09:58:05 +08:00
Bwko d8e11a8eaa Lint models/admin.go 2016-11-24 23:42:07 +01:00
Bwko ece19f4a5e Lint models/release.go 2016-11-24 22:02:54 +01:00
Lunny Xiao 450969c158 test database is connect OK after db config initialized (#239) 2016-11-24 22:30:36 +08:00
Sandro Santilli 1c3044b873 Lint models/login_source.go 2016-11-24 12:34:38 +01:00
Thomas Boerger 0a66c2a2d9 Merge pull request #234 from strk/issue-lint 
Lint issue.go
 2016-11-24 11:30:39 +01:00
Thomas Boerger e512411863 Merge pull request #233 from strk/git_diff-lint 
Lint git_diff.go
 2016-11-24 11:29:51 +01:00
Thomas Boerger 03b6880089 Merge pull request #232 from strk/error-lint 
Lint error.go
 2016-11-24 11:29:15 +01:00
Sandro Santilli 8aa960f129 Actually document the missing bits 2016-11-24 09:41:11 +01:00
Sandro Santilli 3fba29c571 Expand documentations 2016-11-24 09:30:08 +01:00
Sandro Santilli 0a61d54a9c Expand documentation a bit more 2016-11-24 09:20:28 +01:00
Sandro Santilli dd9d0f3732 Lint action.go 2016-11-24 09:03:29 +01:00
Sandro Santilli 170f2e98cc Lint error.go 
This was done semi-programmatically, not really documenting anything
 2016-11-24 09:03:17 +01:00
Sandro Santilli 6e644726d0 Lint git_diff.go 
Semi-automatic linting (don't really document things)
 2016-11-24 09:02:58 +01:00
Sandro Santilli 4dd1eb57bd Lint issue.go 2016-11-24 09:02:44 +01:00
stroucki 3a3782bb7f Handle ssh key import better (#224) 
* Handle user ssh key input better

ssh_key: when user submitted keys had a newline at the end, strings.Split
would have created a slice with an empty last element, and the key type
check would be incorrect. Perhaps a better way is to look for 'ssh-rsa' or
'ssh-dsa' at the beginning of the string, but this is simple.

* ssh_key: correct indentation
 2016-11-24 08:52:55 +08:00
Sandro Santilli c25063d834 Lint webhook.go, unexports simpleMarshalJSON (#198) 2016-11-22 14:42:52 +08:00
Bwko 2a449bd4b1 Fix typos 2016-11-21 20:08:21 +01:00
Ethan Koenig 0834e492c0 API endpoints for stars 2016-11-16 22:51:54 -05:00
Bo-Yi Wu d9ffe99972 fix variable assigned and not used. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-11-15 14:16:27 +08:00
Sandro Santilli 592a4ec4d3 Fix lint errors in models/wiki (just add methods docs) 
See #70
 2016-11-14 18:01:46 +01:00
Andrey Nering 739f07c98e Remember diff view style (#163) 2016-11-13 10:54:04 +08:00
LefsFlare 3ef022b071 Fixes possible vulnerabilities with keyword hijacking (#20) 
- Added public entries to reserved keywords list
- Rename variables
- Derped comment
 2016-11-12 13:26:45 +01:00
Lunny Xiao 3dedc027ac Bug fixed for issues (#156) 2016-11-12 13:06:33 +01:00
Lunny Xiao 0baaa7728a bug fixed caused by #153 (#154) 2016-11-12 09:30:46 +01:00
Lunny Xiao 30a37311f8 use in instead string join (#155) 2016-11-12 09:29:18 +01:00
Lunny Xiao 555d8b16cb fixed bug #151 caused Find should be Get (#153) 2016-11-12 00:01:09 +01:00
Lunny Xiao ade6d4a20f optimization on database IN 2016-11-12 01:31:37 +08:00
Lunny Xiao 9bf28a2799 bug fixed for 500 caused by get org users (#149) 2016-11-12 00:55:06 +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
Thibault Meyer b12f2a5916
Remove unused import 2016-11-10 21:10:25 +01:00
Thibault Meyer b0ddced2b5
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries 
# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go
 2016-11-10 21:05:52 +01:00
Thibault Meyer a4454f5d0f
Rewrite XORM queries 2016-11-10 20:59:51 +01: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 94b2747375 Remove go version from build tags (#133) 2016-11-10 08:43:49 -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
Lunny Xiao c6c840faf7 Merge pull request #129 from lunny/lunny/SQL_instead_Sql 
use x.SQL instead of x.Sql
 2016-11-10 17:12:14 +08:00
Thibault Meyer 3a10a0c1ca
Ordering organizations and users by name 2016-11-10 09:18:54 +01:00
Lunny Xiao 7dcc3bc3d7 use x.SQL instead of x.Sql 2016-11-10 15:20:48 +08:00
Joubert RedRat f91cbf0fed Support to last login feature 2016-11-09 08:53:45 -02:00
Lunny Xiao c511f1c6c3 Merge pull request #18 from LefsFlarey/issue/3675 
Fix 500 error caused by deleted users on issues (#3675)
 2016-11-09 15:14:18 +08:00
Flare a6c487f6ca
Fix err not being nil 2016-11-09 13:07:01 +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 aadd7dcdc3 And others 2016-11-07 17:53:22 +01:00
Sandro Santilli b3828e38a5 more 2016-11-07 17:41:28 +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 f14232d2e9 This one I overlooked before 2016-11-07 17:33:03 +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
Sandro Santilli ee963f67c1 Merge pull request #103 from strk/GOGS_drop 
Replace GOGS with GITEA in variable names
 2016-11-07 16:30:48 +01:00
Joubert RedRat 28bee28102 Replace Gogs to Gitea in installation options 2016-11-07 13:26:19 -02:00
Thomas Boerger 4c6c16f358
Replaced go-gogs-client with go-sdk imports 2016-11-07 16:10:32 +01:00
Sandro Santilli 30be1f4826 Fix typo in unused constant name 2016-11-07 16:06:21 +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
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
LefsFlare 55a4d46f5d Adds checking of reserved keywords against team names (#22) 2016-11-06 10:07:03 +01:00
Thibault Meyer fe8bfa54de Ordering team by name ascending except for 'Owners' (#48) 2016-11-06 09:59:21 +01:00
Matthias Loibl 953c099428 Add missing version & gogs package 2016-11-05 18:04:47 +01:00
Matthias Loibl 1f44b01e2a Fix imports found by goimports. 2016-11-05 17:56:35 +01:00
Thomas Boerger 648c6fdd60
Vet complains about "should have signature MarshalJSON() ([]byte, error)", replaced with custom name 2016-11-04 23:45:06 +01:00
Flare fd6be0d17e
Still print error if user does not exist 2016-11-05 02:47:54 +08:00
Matthias Loibl a4fa889ced Run goimports on the whole project (#34) 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2016-11-04 09:57:27 -02:00
Rémy Boulanouar 8dc49dc114 Implementation of the feature to redirect to an external issue tracker 2016-11-04 09:06:54 +01:00
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs (#37) 2016-11-03 10:29:56 -02:00
Sandro Santilli af03d00780 Fix sender of issue notifications 
It is the FROM field in mailer configuration that needs be used,
not the USER field, which is for authentication.

Closes https://github.com/gogits/gogs/issues/3615
 2016-11-02 21:00:54 +01:00
LefsFlare 2bec8a4f1e Changed interface (#3685) 2016-09-22 19:38:12 -04:00
Flare 1b59e6f910
Fix 500 error caused by deleted users on issues (#3675) 2016-09-20 18:13:57 +08:00
Unknwon 6da55159a2
#3589 LoadRepoConfig after ORM is initialized 2016-09-02 23:18:37 -04:00
Unknwon c50d59874d
#3577 incorrect URL produced by AvatarLink 2016-09-01 12:36:26 -04:00
Unknwon 7c1fbed057 Fix panic when attempt login with non-exist user 2016-09-01 05:12:34 -04:00
Unknwon c2afdf2192 Minor code fix [CI SKIP] 2016-08-31 04:31:53 -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
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 643142acab Web editor: support upload files 2016-08-30 05:23:59 -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
LFlare 3738b6399e Fixed typo (#3533) 
Git convention has it capitalised.
 2016-08-29 11:31:12 -07:00
Unknwon 62b0dc4853 Web editor: fix cannot create new file in subdirectory 2016-08-29 00:10:21 -07:00
Unknwon 579e5e4fee Web editor: disallow edit mirror repository 2016-08-28 04:56:41 -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 c30b856d14 #3505 use user’s info for committer and author 2016-08-27 13:37:55 -07:00
Unknwon 13c106af77 label: adjust forecolor boundary 2016-08-27 12:44:39 -07:00
Unknwon ce1e4348da #3521 fix wiki HTTP/S clone URL does not have .wiki suffix 2016-08-27 12:29:52 -07:00
Unknwon 37305a59ca migrations: sync table first 2016-08-26 17:32:41 -07:00
Unknwon bb359a74f1 migrations: set comment updated as created 2016-08-26 14:07:21 -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
Thibault Meyer f50e568fd1 Fix #3189: Sort labels by name (#3446) 
* Fix #3189 #3445: Order labels by name

* Order labels by name on Issues view
 2016-08-25 17:43:53 -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
Kim "BKC" Carlbäcker 06602a84ff Fix PR-webhook issue where Label-data is stale (#3486) (#3510) 
* Fix PR-webhook issue where Label-data is stale

* Conventions \o/

* logs are nice if they're consistent...
 2016-08-24 12:01:30 -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 8bf57be9ba Fix git diff tests 2016-08-16 07:45:06 -07:00
Unknwon b1504ed99a #3464 add diff signs which does not have inline diff 2016-08-16 07:37:28 -07:00
Unknwon 9349def72e #3464 reproduce diff signs 
Commited wrong file.
 2016-08-16 07:33:53 -07:00
Unknwon 2625193a48 models/repo_editor: improve code quality 2016-08-15 22:20:55 -07:00
Unknwon f3c3258921 Fix repository owner can assign self 2016-08-15 18:48:20 -07:00
Unknwon 4042d1f0c3 models/issue: improve quality and performance of NewIssue function 2016-08-15 18:40:32 -07:00
Unknwon 6c8fcb3af2 #3467 fix clone fail when wiki is empty 2016-08-15 15:09:34 -07:00
Unknwon 94392a7af3 Fix empty repository panic on send test webhook 2016-08-15 05:53:47 -07:00
Unknwon cc647ba9d5 #3461 fix security issue of REAMDE path in create repository 2016-08-15 02:35:54 -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 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 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
Unknwon f59d2dd034 Code clean up 2016-08-12 03:04:50 -07:00