Commit graph

3947 commits

Author SHA1 Message Date
Unknwon
995487e822 Minor fix for #2506 2016-02-02 17:07:40 -05:00
Unknwon
5e97693e0e Merge pull request #2506 from sapk/add-branche-api-support
Implement API for branches listing
2016-02-02 16:51:14 -05:00
Unknwon
452bc385fe Merge pull request #2548 from fnkr/fix-unescaped-regex
Escape unescaped periods in route regular expression
2016-02-02 13:30:08 -05:00
Florian Kaiser
71bb7f6053 Escape unescaped periods in route regular expression 2016-02-02 17:39:56 +00:00
Unknwon
0255e6a703 Merge pull request #2546 from fnkr/pretty-404-pages
Use pretty 404 pages in repo.HTTPBackend
2016-02-02 10:35:46 -05:00
Unknwon
5a27aea8e0 Fix random avatar does not work on Windows
path.Dir can't handle Windows case, must use filepath.Dir
2016-02-02 10:22:27 -05:00
Florian Kaiser
0e4ae27caa Use pretty 404 pages in repo.HTTPBackend 2016-02-02 14:09:47 +00:00
Unknwon
1c74612b3c Minor fix for #2444 2016-02-01 20:55:12 -05:00
Unknwon
d3ba246693 Merge pull request #2444 from bkcsoft/feature/participants
Implemented participant-listing for issue-pages (Fixes #2377)
2016-02-01 20:31:54 -05:00
Unknwon
a93af59b36 Merge pull request #2542 from fnkr/fix-markdown-code-blocks-issue-comment-save
Fix syntax highlighting for markdown code blocks on issue description/comment save
2016-02-01 18:12:17 -05:00
Florian Kaiser
0d41827f23 Fix syntax highlighting for markdown code blocks on issue description/comment save 2016-02-01 22:50:22 +00:00
Unknwon
32efc3ec0a Merge pull request #2540 from JohnMaguire/bugfix/2447-delete-public-key-authorized_keys
Fixes #2447 (delete public key from authorized_keys)
2016-02-01 16:32:30 -05:00
Unknwon
d33ed36fb4 Merge pull request #2539 from redoz/develop
Change en-us localization "mirror from"  to "mirror of"
2016-02-01 16:25:44 -05:00
Patrik
9d67528c82 Change en-us localization "mirror from" to "mirror of" 2016-02-01 21:59:48 +01:00
Unknwon
66d2ba1b4e Merge pull request #2537 from fnkr/remember-clone-protocol
Remember last selected clone protocol
2016-02-01 15:58:01 -05:00
Florian Kaiser
84749736a8 Select HTTPS if remembered clone protocol is SSH but SSH is disabled now 2016-02-01 20:42:10 +00:00
Unknwon
857b340498 Merge pull request #2538 from fnkr/issue-markdown-code-block-highlighted
Make highlighted markdown code blocks work on issue pages
2016-02-01 15:31:05 -05:00
Florian Kaiser
3e0a27157c Make highlighted markdown code blocks work on issue pages 2016-02-01 19:53:58 +00:00
Unknwon
3abad75a1b Fix one user may block entire listen loop for builtin SSH 2016-02-01 12:10:49 -05:00
Florian Kaiser
d568019306 Remember last selected clone protocol, and establish uniform order (https, ssh) 2016-02-01 17:04:58 +00:00
John Maguire
b3e0efc0c3 Trim whitespace when adding SSH keys (fixes #2447) 2016-01-31 22:02:36 -05:00
John Maguire
caa4ca46c0 Add debug log when SSH key for deletion isn't found 2016-01-31 22:02:23 -05:00
Unknwon
5d192c2ebf Merge pull request #2533 from fnkr/icon-fork-private-collision
Use icon repo-forked instead of repo-lock for private, forked repos
2016-01-31 19:41:21 -05:00
Florian Kaiser
29c3e9f428 Undo change in templates/explore/repo_list.tmpl 2016-01-31 21:59:18 +00:00
Florian Kaiser
532f9fdd99 Use icon repo-forked instead of repo-lock for private, forked repos 2016-01-31 20:41:57 +00:00
Unknwon
4848620594 #2229 adjust URL verbose depth for reverse proxy sub-path 2016-01-31 15:38:20 -05:00
Florian Kaiser
bead46363b Evaulate org/team permissions when using the issue/PR view 2016-01-31 20:12:03 +00:00
Unknwon
57c10aae33 Merge pull request #2531 from andreynering/home-template-pt-BR
Add portuguese-BR to home template.
2016-01-31 15:10:21 -05:00
Andrey Nering
0e0cd9100b Add portuguese-BR to home template. 2016-01-31 17:58:51 -02:00
Florian Kaiser
90780a0d90 Use invalid value (-1) instead of 0 to prevent bug if auto increment starts with 0 2016-01-31 19:17:58 +00:00
Florian Kaiser
fdad234445 Remove unnecessary comments 2016-01-31 19:08:20 +00:00
Florian Kaiser
bba1847a8e Everyone can see public repos 2016-01-31 18:37:50 +00:00
Unknwon
a9d68a6884 fix #2529 2016-01-31 13:33:36 -05:00
Florian Kaiser
9cf95e4e37 Organization owners see all repositories & teams 2016-01-31 16:14:24 +00:00
Florian Kaiser
8c4588c4c9 Refactor .IsAdminTeam to .IsTeamAdmin and requireAdminTeam to requireTeamAdmin 2016-01-31 15:30:07 +00:00
Florian Kaiser
e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser
5eafe2b17e Only show repositories the user has access to, on the organization home 2016-01-31 15:29:45 +00:00
Unknwon
1c1246fcb9 Merge pull request #2527 from fnkr/hide-private-orgs-from-profile
Show all orgs on user profile, except the private one's
2016-01-31 08:56:21 -05:00
Unknwon
8436d69eaf Update and reorganize front-end resources 2016-01-30 22:10:20 -05:00
Martin Hartkorn
20403f75fb Enable a way to checkout Pull Requests from remote refs 2016-01-30 23:56:38 +01:00
Florian Kaiser
295de51b99 Show all orgs on user profile, except the private one's 2016-01-30 21:53:58 +00:00
Unknwon
6e03f61617 Update .gopmfile 2016-01-30 10:12:23 -05:00
Unknwon
055c1ea02d Merge pull request #2517 from fnkr/issue-2516
Allow modification of a release if Content is empty (fix #2516)
2016-01-30 09:47:37 -05:00
Florian Kaiser
abc5abce30 Allow modification of a release if Content is empty (fix #2516) 2016-01-30 13:39:02 +00:00
Unknwon
112a7cab31 #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Unknwon
ee814bf8d6 #2491 minor fix for sr on dashboard 2016-01-29 15:28:24 -05:00
Unknwon
a4a23c0268 Merge pull request #2508 from MilesPong/develop
Fixed gravatar url
2016-01-29 05:44:00 -05:00
Unknwon
cd89d387b6 Merge pull request #2509 from 0rax/develop
Update Docker container with Alpine 3.3 & Fix RPi2 build
2016-01-29 05:15:08 -05:00
miles@Oscar
beefc53e59 Using https for gravatar 2016-01-29 13:06:17 +08:00
miles@Oscar
1becf01cfa Fixed gravatar url 2016-01-29 11:05:41 +08:00