Commit graph

3854 commits

Author SHA1 Message Date
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
05d8664f15 Merge pull request #2762 from rom1504/patch-1
Fix grammar in README
2016-03-05 14:18:17 -05:00
Romain Beaumont
52fdecf97b Fix grammar in README 2016-03-05 19:46:32 +01:00
Unknwon
9c0f84cee8 Update README notes 2016-03-05 13:09:31 -05:00
Unknwon
414eb22ef9 #1597 fix activitity feeds for pull requests 2016-03-05 12:58:51 -05:00
Steven Oud
1d3ec27cb7 Put if statement of grey merge commits on one line 2016-03-05 17:59:07 +01:00
Steven Oud
a0cd59bd0e Grey out merge commits 2016-03-05 17:00:38 +01: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
dfd6f8f7ab Merge pull request #2757 from joshfng/fix-fork-relative-url
Use relative url when showing forked from
2016-03-04 18:37:42 -05:00
Josh Frye
275464e7fb Use relative url when showing forked from 2016-03-04 18:32:30 -05:00
Unknwon
e2d370f0da #1597 fix pull request remote head can't update with force push 2016-03-04 16:53:03 -05:00
Unknwon
4cb8bf1b75 #1597 fix premission logic check of pull request 2016-03-04 16:14:02 -05:00
Unknwon
5335e671be #2743 more fixes on SQL errors 2016-03-04 16:00:00 -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
Unknwon
4d5911dbcf Merge pull request #2746 from joshfng/feature-delete-wiki-pages
Add ability to delete single wiki pages.
2016-03-04 13:14:37 -05:00
Unknwon
d57a2b908a #2743 and #2751 fix bad SQL generated by XORM
Use hand-written SQL to do complex query
2016-03-04 13:08:47 -05:00
Josh Frye
2f228ddf31 Update delete wiki page route 2016-03-04 09:26:52 -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
dfbda48afc Merge pull request #2738 from andreynering/emogify
Render emojis in more places.
2016-03-03 23:38:20 -05:00
Unknwon
260723e2cc Minor fixes for #2745 2016-03-03 23:24:22 -05:00
Unknwon
1cbc5b49e3 Merge pull request #2745 from joshfng/delete-wiki-option
Repo setting to delete and disable wiki
2016-03-03 23:04:35 -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
434614506e Merge pull request #2744 from joshfng/mirror-default-branch
Set DefaultBranch to master when importing a new repo.
2016-03-03 14:22:45 -05:00
Josh Frye
7f2733fa1b Return errors instead of just logging them. 2016-03-03 12:43:23 -05:00
Josh Frye
edb7967dc7 Set DefaultBranch to master when importing a new repo if possible 2016-03-03 12:23:45 -05:00
Unknwon
c9901bbba5 #2743 workaround to fix XORM problem 2016-03-03 10:57:27 -05:00
Unknwon
4d930f3598 Merge pull request #2719 from mblacktree/patch-1
update README.md
2016-03-03 10:35:59 -05:00
Andrey Nering
13e71acadf Render emojis in more places. 2016-03-02 21:54:05 -03:00
Unknwon
37ac743da7 Update TRANSLATORS and remove tip for CI 2016-03-02 16:43:32 -05:00
Unknwon
c47a6c1510 Merge pull request #2736 from neolit123/patch
ISSUE_TEMPLATE: suggestion to test at try.gogs.io
2016-03-02 13:53:49 -05:00
Lubomir I. Ivanov
94f9ff1ac9 ISSUE_TEMPLATE: suggestion to test at try.gogs.io
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.
2016-03-02 20:12:14 +02:00
Unknwon
97429a25ab #2727 make IN clause compatible with Postgres 2016-03-01 14:39:28 -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
42a556a082 Merge pull request #2722 from chriswatt/hidewikidlbutton
Hide the download archive button when viewing wiki pages
2016-02-29 13:36:22 -05:00
chriswatt
a71a5bfeb4 Remove download archive button on wiki pages 2016-02-29 15:45:55 +00:00
Unknwon
6cee434b04 Merge pull request #2717 from chriswatt/prtabs
Change colour of numbers on pull request tabs if greater than zero
2016-02-29 00:51:58 -05:00
Mike
9d44cd79ee update README.md
minor grammar fix
2016-02-28 21:17:19 -05:00
chriswatt
548440b48f Change colour of numbers on pull request tabs if greater than zero 2016-02-28 23:27:41 +00: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
d320915ad2 Minor fix for #2710 2016-02-27 11:31:24 -05:00
Unknwon
8e160edbd5 Merge pull request #2710 from lukasdietrich/develop
Add ForegroundColor for labels to resolve #2033
2016-02-27 11:10:57 -05:00
Lukas Dietrich
c0eaae200e Add ForegroundColor for labels 2016-02-27 13:59:11 +01:00
Unknwon
79ae163296 Merge pull request #2706 from ChubbyNinja/develop
Image attachments keep aspect ratio
2016-02-26 14:24:38 -05:00
Unknwon
7a91d7e776 Merge pull request #2694 from mhartkorn/pullrefs
Improved Pull Request refs
2016-02-26 14:21:31 -05:00