Commit Graph

4513 Commits

Author SHA1 Message Date
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
Andrey Nering 1c0a4e166f Merge pull request #134 from metalmatze/fix/admin-templates
Fix bug that tries to load mistyped templates
2016-11-10 13:06:54 -02:00
Matthias Loibl 63ca42d17f Fix bug that tries to load mistyped templates 2016-11-10 11:54:20 +01:00
Rachid Zarouali c040f2fbb1 first batch of Readme updates (#65) 2016-11-10 11:52:39 +01:00
Matthias Loibl 94b2747375 Remove go version from build tags (#133) 2016-11-10 08:43:49 -02:00
Matthias Loibl 31da225309 Check unhandled errors (#128) 2016-11-10 08:02:01 -02:00
Matthias Loibl 24d7bae2b2 Merge pull request #131 from 0xbaadf00d/feature/gitignore
Add IDEA IntelliJ to .gitignore
2016-11-10 10:53:43 +01: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 7ea943d501
Add IDEA IntelliJ to .gitignore 2016-11-10 10:01:44 +01:00
Lunny Xiao b5bfab9855 Merge pull request #130 from 0xbaadf00d/feature/ordering-org-user
Ordering organizations and users by name
2016-11-10 16:56:36 +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
Lunny Xiao 145648a233 Merge pull request #127 from metalmatze/enhancement/cli
Use cli Flags directly and not some helper funcs
2016-11-10 11:31:26 +08:00
Matthias Loibl 90fb64b217 Improve formatting of admin command
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2016-11-09 23:32:24 +01:00
Matthias Loibl 5cd093aa46 Use cli Flags directly and not some helper funcs
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2016-11-09 23:18:22 +01:00
Joubert RedRat f91cbf0fed Support to last login feature 2016-11-09 08:53:45 -02:00
Lunny Xiao 475ddd8d89 Merge pull request #116 from lunny/lunny/lang-miss
fixed lack of translation for zh-CN
2016-11-09 15:16:27 +08: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
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 f6d53ecbc1 Merge pull request #119 from metalmatze/fix/editorconfig
Go uses ident size 8 with tabs. Nothing else.
2016-11-08 19:13:29 +08:00
Matthias Loibl 1ceb56fc7f Go uses ident size 8 with tabs. Nothing else.
We are using gofmt to format our code. This will emit tabs.
The standard is tabs which is 8 spaces.
2016-11-08 11:41:02 +01:00
Kim "BKC" Carlbäcker 85b8b7f4e1 Merge pull request #90 from metalmatze/feature/tool-tests
Start to add tests for modules/base/tool
2016-11-08 10:30:52 +01:00
Lunny Xiao 8b0576b377 lack of translation for zh-CN 2016-11-08 16:20:45 +08:00
Lunny Xiao 8857d701fb Merge pull request #115 from strk/license
Re-add "Gogs authors" copyright (togheter with "Gitea authors")
2016-11-08 15:57:46 +08:00
Lunny Xiao e06e0f9bb9 Merge pull request #113 from avelino/update_locale
replace Gogs to Gitea on locale files
2016-11-08 15:56:00 +08:00
Sandro Santilli 4e4c0c2cd3 Fix typo 2016-11-08 08:42:05 +01:00
Sandro Santilli dad9dbacf7 Re-add "Gogs authors" copyright (togheter with "Gitea authors") 2016-11-08 08:36:19 +01:00
Thiago Avelino 5ea257be87 update copyright gitea license (#112) 2016-11-08 07:57:25 +01:00
Avelino b4671c9aab replace Gogs to Gitea on locale files 2016-11-08 01:21:31 -02: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
Matthias Loibl e74868a850
Add test for IsTextFile() 2016-11-07 23:31:40 +01:00
Matthias Loibl 95d4cd9292
Make long godoc comment 2 lines 2016-11-07 23:31:40 +01:00
Matthias Loibl 2bb188ae79
Add test for IsLetter() 2016-11-07 23:31:40 +01:00
Matthias Loibl 4235fff9ee
Add test for Int64sToMap() 2016-11-07 23:31:40 +01:00
Matthias Loibl d417aedcfa
Add tests for StringsToInt64s() & Int64sToStrings() 2016-11-07 23:31:40 +01:00
Matthias Loibl b00d82d679
Add tests for TruncateString() 2016-11-07 23:31:40 +01:00
Matthias Loibl 86c32f2706
Use TruncateString(sha1,10) in ShortSha and deprecate it. 2016-11-07 23:31:39 +01:00
Matthias Loibl 030ba2894f
Add tests for EllipsisString() and fix bug if param length < 3 2016-11-07 23:31:39 +01:00
Matthias Loibl f81711f40d
Test AvatarLink and refactor with tests passing 2016-11-07 23:31:39 +01:00
Matthias Loibl a5d0b4de5b
Vendor github.com/stretchr/testify for the assert package 2016-11-07 23:31:39 +01:00
Matthias Loibl 70fb1cf9d1
Use testify/assert for all tests in tool_test.go 2016-11-07 23:29:42 +01:00
Matthias Loibl d874a9bf6b
Add unit test for base.FileSize() 2016-11-07 23:29:42 +01:00
Matthias Loibl 11c9160cd3
Start to add tests for modules/base/tool 2016-11-07 23:29:41 +01: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
Matthias Loibl c8c748aea6 Merge pull request #109 from go-gitea/lgtm
Added ignore_maintainers_file option to .lgtm
2016-11-07 20:07:47 +01:00