Commit graph

7211 commits

Author SHA1 Message Date
Unknwon
d27ca649c7 api/admin: add/remove organization team repository 2016-04-04 19:41:34 -04:00
Unknwon
d9900e4dbc Merge pull request #2914 from psychomario/linenumoptimize
Reduce line number creation to one DOM manipulation
2016-04-04 19:33:52 -04:00
l2dy
e75a1444af Update ISC license 2016-04-03 01:56:48 +00:00
PsychoMario
b35157f4ff reduce line number creation to one DOM manipulation 2016-03-30 20:28:40 +01:00
Unknwon
762ab056a2 Fix XORM IN condition table name parse 2016-03-27 18:21:37 -04:00
Unknwon
78481f0e42 Merge pull request #2894 from tboerger/feature/join-condition
Followup fix for previous query fix
2016-03-27 18:07:52 -04:00
Thomas Boerger
746c7fd4e7 Followup fix for previous query fix 2016-03-28 00:05:49 +02:00
Unknwon
7f26ae0b45 Merge pull request #2893 from tboerger/feature/sql-security
Try to make the SQL queries cleaner and more secure
2016-03-27 17:40:28 -04:00
Thomas Boerger
b5948f2e71 Made the issues query more secure and simpler 2016-03-27 23:26:45 +02:00
Thomas Boerger
79a1bfd963 Try to make the SQL queries cleaner and more secure 2016-03-27 22:59:57 +02:00
Unknwon
ac53bb593d #2878 print error of JSON unmarshal and always returns a valid object 2016-03-26 16:42:20 -04:00
Unknwon
dd36c431ec #2842 add quotes to attachment file name 2016-03-25 22:11:58 -04:00
Unknwon
b1d41cfa60 #1692 add admin APIs to add/remove a user from teams 2016-03-25 18:04:02 -04:00
Unknwon
9dda9ef07c Merge pull request #2883 from nikkomiu/develop
Fixes #2842 Parses URL through EscapePound template function
2016-03-25 17:09:21 -04:00
Nikko Miu
9a43fcb61c Changed EscapePound function with string replace function 2016-03-24 20:48:52 -05:00
Unknwon
5ec8ef0230 Update locales 2016-03-23 15:56:56 -04:00
Unknwon
d3db1b2591 Merge pull request #2879 from dakira/develop
use monospace font for wiki and issue textareas (fix #2869)
2016-03-23 10:32:24 -04:00
Matthias Niess
3decc0b3d6 use monospace font for wiki and issue textareas (fix #2869) 2016-03-23 13:55:07 +01:00
Unknwon
98b58fa050 Handle windows deletion when start
Fix #2872
2016-03-23 03:16:53 -04:00
Unknwon
5e11341232 Fix status code 2016-03-21 12:57:04 -04:00
Unknwon
90e93b1f3a Change list teams API to non-admin specific 2016-03-21 12:53:04 -04:00
Unknwon
e6f927f61a #1692 api: admin list and create team under organization 2016-03-21 12:47:54 -04:00
Unknwon
60ae8ac3d2 Add route for #2846 2016-03-21 10:49:46 -04:00
Unknwon
004fb30ebe Remove code for checking ssh-keygen 2016-03-19 20:31:23 -04:00
Unknwon
3fb4f7f498 Prepare release 2016-03-19 14:51:41 -04:00
Unknwon
9e09e48502 #2850 fix potential SSH commands dislocation
When use builtin SSH server with concurrent operations, there are probabilities
One connection could use the command from another connections.

Fix this by set SSH_ORIGINAL_COMMAND for each command, not set in global scope.
2016-03-18 06:13:16 -04:00
Unknwon
c79774e8d4 Update locales 2016-03-18 04:03:13 -04:00
Unknwon
d6b09c35f7 Update .gopmfile and fix #2848 2016-03-17 14:29:45 -04:00
Unknwon
0048980da5 Merge pull request #2845 from moltam/feature/org-member-full-name-avatar
Display org member's full name in link title.
2016-03-16 17:17:45 -04:00
Tamás Molnár
d169d00be6 Display org member's full name in link title. 2016-03-16 22:04:19 +01:00
Unknwon
ff731ea07d #2814 LOWER() column value within search 2016-03-16 16:55:19 -04:00
Unknwon
9a5a27ea8d Improve repository lable style
- add border-radius to filter list items
- use color as background of label for issue/pull view page
2016-03-15 19:52:40 -04:00
Unknwon
94d7b62922 Merge pull request #2831 from odinuge/user-search-name
Make user search look in username, name and email
2016-03-15 19:39:12 -04:00
Unknwon
2df42e369e Merge pull request #2829 from odinuge/htmlmeta
Set description meta tag correctly
2016-03-15 17:54:44 -04:00
Unknwon
1f5bb08c25 Merge pull request #2836 from odinuge/markdown-links-rebase
Fix relative links in markdown files
2016-03-15 17:43:33 -04:00
Odin Ugedal
01ff65a93e Fix indent 2016-03-15 22:35:59 +01:00
Odin Ugedal
8540043c45 Make separate string variables for space 2016-03-15 21:28:55 +01:00
Odin Ugedal
f57adf3637 Fix relative links in markdown files
Replace spaces with "%20" in "urlPrefix", before markdon processing.
The spaces were causing blackfriday (markdown processor) to behave
strange. This fixes #2545.
2016-03-15 20:43:46 +01:00
Odin Ugedal
a75fa58e1c Make description meta tag golang 1.4 compatible 2016-03-15 19:57:19 +01:00
Odin Ugedal
6ccb2d36cf Remove email from user search 2016-03-15 19:44:58 +01:00
Unknwon
414e5f09c7 Merge pull request #2832 from dankm/build-flags
Make go's build flags a variable
2016-03-15 14:42:15 -04:00
Unknwon
a04596659b Merge pull request #2830 from odinuge/branchname-compare
Fix problems with '#' in branchname
2016-03-15 14:36:58 -04:00
Unknwon
149d62a648 #13 fix admin can't search private repos
- update glide info
2016-03-15 14:23:12 -04:00
Dan McGregor
db3905c0a3 Make go's build flags a variable
This allows the user to specify build flags from the make command
line. For example to force a complete rebuild one could use:

make BUILD_FLAGS='-v -a' TAGS="sqlite"
2016-03-15 07:55:06 -06:00
Odin Ugedal
3253e3c5aa Make user search look in username, name and email
Make user search function look in username (lower_name), full name
(full_name) and primary email (email). This will benefit searching after
user in "explore", admin panel and when adding new collaborators.
2016-03-15 14:16:58 +01:00
Odin Ugedal
c9321550e0 Add prorper escaping of url in issue form 2016-03-15 11:56:49 +01:00
Odin Ugedal
ac390d28b8 Fix problems with '#' in branchname
Add proper escaping of '#' in branchname in compare when doing pull
requests. This addresses issue #2822.
2016-03-15 11:36:23 +01:00
Odin Ugedal
561e5f9ccb Set description meta tag correctly
Set the description meta tag correctly when there is no repo
description. Also use the  ability to trim trailing whitespaces,
to make the template cleaner.
2016-03-15 10:17:23 +01:00
Unknwon
9df5c39bca Merge pull request #2824 from odinuge/repo-metadata
Set HTML meta values corresponding to repository
2016-03-14 16:47:23 -04:00
Unknwon
9976fc6782 Generate bindata for #2823 2016-03-14 16:46:36 -04:00