Commit graph

19233 commits

Author SHA1 Message Date
Unknwon
f15a2f9b25 Merge pull request #2528 from andreynering/diff-sintax-highlight-733
Enable syntax highlighting on diff view
2016-02-07 11:49:11 -05:00
Unknwon
3b102a71a2 Merge pull request #2576 from chriswatt/commentarrows
Add avatar arrows to both pull request and issue forms
2016-02-07 11:45:37 -05:00
chriswatt
133397ee0d Rename #avatararrow to #avatar-arrow 2016-02-07 16:41:11 +00:00
Unknwon
e2b4a24cb6 Merge pull request #2570 from andreynering/fix-1738
Workaround delete folder on Windows.
2016-02-07 10:46:23 -05:00
Andrey Nering
d37cf09ccd Workaroud delete folder on Windows. Fix #1738 2016-02-07 13:39:32 -02:00
ExMex
2cfe6f8c60 Admins and user itself sees private org relations on profile 2016-02-07 10:20:58 +01:00
chriswatt
16270ee9a4 Add avatar arrow to pull request form 2016-02-07 06:10:57 +00:00
chriswatt
1dfead1eef Add avatar arrows to new both new issue comment forms 2016-02-07 04:20:11 +00:00
Unknwon
894946c319 Merge pull request #2573 from prologic/add-note-wrt-ssh-on-docker#2409
Add an important note about mapping the ssh port on the container to the host
2016-02-06 20:22:43 -05:00
Florian Kaiser
45db167f7a Only show activities for repositories on dashboard, that the user has access to 2016-02-06 07:52:21 +00:00
Unknwon
10fbb1aa2f Merge pull request #2565 from tkausl/issue2563
fixes #2563
2016-02-05 19:15:54 -05:00
Tobias Kunicke
bc0eee48d5 parse milestone.deadline as local time 2016-02-06 00:10:32 +01:00
Tobias Kunicke
fa5a1cb54f regulate timezone for milestone.deadline 2016-02-06 00:08:02 +01:00
Unknwon
e797a225b6 Fix #2564 file ignored by git 2016-02-05 17:19:32 -05:00
Unknwon
6d5c986d4f Merge pull request #2562 from Eriner/master
optipng
2016-02-05 16:18:52 -05:00
Matt Hamilton
45659d0fd2 optipng 2016-02-05 16:04:11 -05:00
Unknwon
acfc942ad7 Generate CSS for #2561 2016-02-05 14:53:45 -05:00
Unknwon
db150f2e42 Merge pull request #2561 from chriswatt/develop
Add small arrows on issue comments pointing to users avatar
2016-02-05 14:50:49 -05:00
chriswatt
9fe9cd8b5c Add small user arrows on issue comments pointing to users avatar 2016-02-05 19:24:23 +00:00
Unknwon
f8182ac521 #2558 delete local wiki copy when rename repo and user 2016-02-05 14:11:53 -05:00
Unknwon
4e96a4a62b Merge pull request #2406 from bkcsoft/feature/markdown-custom-url-scheme
Feature/markdown custom url scheme
2016-02-05 13:11:45 -05:00
Florian Kaiser
90e9e3c89d Only show repositories on organization dashboard, that the user has access to 2016-02-05 15:49:01 +00:00
Unknwon
d4583ebd4b Add YunoHost link to README 2016-02-05 10:19:37 -05:00
Unknwon
b024de7bf5 Merge pull request #2559 from Techwolf12/develop
Fixes small typo
2016-02-05 09:32:52 -05:00
techwolf12
4a0d2edc3d
Fixes small typo 2016-02-05 15:11:25 +01:00
Unknwon
8e40f86d2c #2556 handle space in image URL 2016-02-04 22:51:40 -05:00
Andrey Nering
2bfb8bb5fd Enable sintax highlighting on diff view. Close #733 2016-02-04 18:21:47 -02:00
Andrey Nering
137a49e834 go fmt models/git_diff_test.go 2016-02-04 17:55:17 -02:00
Martin Hartkorn
a3bdede2ce Removed unused method GetUnmergedPullRequestByRepoPathAndHeadBranch 2016-02-04 19:15:21 +01:00
Unknwon
ddf9fa06c7 Minor fix for #2530 2016-02-04 13:03:34 -05:00
Martin Hartkorn
d91004ee71 Removed dependency on post-receive hook and use TriggerTask instead 2016-02-04 19:00:42 +01:00
Unknwon
739d5aa1d3 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page
Hide other teams & repos from organization page
2016-02-04 12:52:11 -05:00
Unknwon
04be8c0de5 #2554 reinitialize all repos from the db
- Update locales
2016-02-04 12:51:00 -05:00
Florian Kaiser
c3ff476ed6 Remove unnecessary else-block 2016-02-04 17:13:56 +00:00
Florian Kaiser
fb1708e1af Remove unnecessary private functions 2016-02-04 17:08:25 +00:00
Unknwon
a47baa1b7a Add missing patch conflit pattern 2016-02-03 12:28:03 -05:00
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