summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* #1146 finish new access rights for collaboratorsUnknwon2016-03-0522-182/+202
|
* #1146 finsih UI work for access mode of collaboratorsUnknwon2016-03-0516-164/+292
| | | | | Collaborators have write access as default, and can be changed via repository collaboration settings page to change between read, write and admin.
* Merge pull request #2762 from rom1504/patch-1Unknwon2016-03-051-1/+1
|\ | | | | Fix grammar in README
| * Fix grammar in READMERomain Beaumont2016-03-051-1/+1
|/
* Update README notesUnknwon2016-03-051-5/+6
|
* #1597 fix activitity feeds for pull requestsUnknwon2016-03-0510-278/+338
|
* #1157 some avatar setting changesUnknwon2016-03-0510-46/+79
| | | | - Allow to delete current avatar
* Update localesUnknwon2016-03-0415-343/+628
|
* Merge pull request #2757 from joshfng/fix-fork-relative-urlUnknwon2016-03-042-2/+7
|\ | | | | Use relative url when showing forked from
| * Use relative url when showing forked fromJosh Frye2016-03-042-2/+7
| |
* | #1597 fix pull request remote head can't update with force pushUnknwon2016-03-042-2/+7
| |
* | #1597 fix premission logic check of pull requestUnknwon2016-03-041-7/+14
| |
* | #2743 more fixes on SQL errorsUnknwon2016-03-041-6/+6
| |
* | #1597 support pull requests in same repositoryUnknwon2016-03-0413-134/+95
| |
* | Minor fixes for #2746Unknwon2016-03-048-723/+937
| |
* | Merge pull request #2746 from joshfng/feature-delete-wiki-pagesUnknwon2016-03-046-906/+761
|\ \ | | | | | | Add ability to delete single wiki pages.
| * | Update delete wiki page routeJosh Frye2016-03-042-2/+2
| | |
| * | Add ability to delete single wiki pages.Josh Frye2016-03-046-906/+761
| |/
* / #2743 and #2751 fix bad SQL generated by XORMUnknwon2016-03-045-19/+17
|/ | | | Use hand-written SQL to do complex query
* #2748 fix redirect loop with auto-signinUnknwon2016-03-044-4/+5
|
* Merge pull request #2738 from andreynering/emogifyUnknwon2016-03-0311-19/+24
|\ | | | | Render emojis in more places.
| * Render emojis in more places.Andrey Nering2016-03-0211-19/+24
| |
* | Minor fixes for #2745Unknwon2016-03-038-708/+921
| |
* | Merge pull request #2745 from joshfng/delete-wiki-optionUnknwon2016-03-035-909/+777
|\ \ | | | | | | Repo setting to delete and disable wiki
| * | Repo setting to delete and disable wikiJosh Frye2016-03-035-909/+777
|/ /
* | #1891 attempt to fix expected invalid CSRF tokenUnknwon2016-03-0310-23/+11
| | | | | | | | - Remove unused config settings `[picture] service`
* | Merge pull request #2744 from joshfng/mirror-default-branchUnknwon2016-03-031-25/+25
|\ \ | | | | | | Set DefaultBranch to master when importing a new repo.
| * | Return errors instead of just logging them.Josh Frye2016-03-031-4/+2
| | |
| * | Set DefaultBranch to master when importing a new repo if possibleJosh Frye2016-03-031-25/+27
|/ /
* | #2743 workaround to fix XORM problemUnknwon2016-03-035-7/+9
| |
* | Merge pull request #2719 from mblacktree/patch-1Unknwon2016-03-031-3/+3
|\ \ | |/ |/| update README.md
| * update README.mdMike2016-02-281-3/+3
| | | | | | minor grammar fix
* | Update TRANSLATORS and remove tip for CIUnknwon2016-03-022-1/+3
| |
* | Merge pull request #2736 from neolit123/patchUnknwon2016-03-021-0/+4
|\ \ | | | | | | ISSUE_TEMPLATE: suggestion to test at try.gogs.io
| * | ISSUE_TEMPLATE: suggestion to test at try.gogs.ioLubomir I. Ivanov2016-03-021-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that a lot of issues cannot be reproduced on http://try.gogs.io, which either hints about specific database type problems or hints about bugs which are already solved in the newer version (as http://try.gogs.io is usually a newer build). This patch adds the suggestion to test the issue at http://try.gogs.io in the Github "issue template". The user can answer: "Yes", "No", "Not relevant". "Not relevant" is an option where testing on http://try.gogs.io makes no sense as the bug is unrelated to the Web UI or is very specific in nature.
* | #2727 make IN clause compatible with PostgresUnknwon2016-03-014-6/+6
| |
* | Allow setting git operations timeoutsUnknwon2016-02-298-10/+29
| | | | | | | | | | | | - Migrate: #2704 #2653 - Clone: #2701 - Mirror, Pull
* | #2700 fix sqlite3 can't create issue with more than one labelUnknwon2016-02-298-19/+16
| |
* | Merge pull request #2722 from chriswatt/hidewikidlbuttonUnknwon2016-02-291-7/+0
|\ \ | | | | | | Hide the download archive button when viewing wiki pages
| * | Remove download archive button on wiki pageschriswatt2016-02-291-7/+0
| |/
* | Merge pull request #2717 from chriswatt/prtabsUnknwon2016-02-291-3/+3
|\ \ | |/ |/| Change colour of numbers on pull request tabs if greater than zero
| * Change colour of numbers on pull request tabs if greater than zerochriswatt2016-02-281-3/+3
|/
* Post work for #2637Unknwon2016-02-2715-194/+234
| | | | Improve test cases, config settings, also show SSH config settings on admin config panel.
* Merge pull request #2637 from Gibheer/ssh-publickeysUnknwon2016-02-274-12/+230
|\ | | | | allow native and ssh-keygen public key check
| * use StartSSHServer instead of DisableSSHGibheer2016-02-231-1/+1
| | | | | | | | | | DisableSSH doesn't check the kind of ssh server to use, so that was wrong. Use StartSSHServer instead.
| * seperate ssh constants from schema constantsGibheer2016-02-231-5/+8
| | | | | | | | | | The contants were placed in the same section as the scheme ones, which may lead to confusion.
| * variable should not use ALL_CAPSGibheer2016-02-232-7/+7
| |
| * remove ed25519 test for nowGibheer2016-02-171-7/+6
| | | | | | | | TravisCI is too old for ed25519, so it can't be tested correctly.
| * fix ssh public key testsGibheer2016-02-171-8/+12
| | | | | | | | | | | | | | The old API was using []byte, but was changed to string without running the tests again. It also sets the variables from the configuration to make them work. Maybe there is a better way to do this.
| * allow native and ssh-keygen public key checkGibheer2016-02-164-15/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 7ef9a055886574655d9f2be70c957bc16bf30500. 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.