Commit Graph

632 Commits

Author SHA1 Message Date
Unknwon 10e4b5b6c6 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -05:00
Unknwon 7ccab9cd09 Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
2015-02-22 22:51:25 -05:00
Unknwon 059338139c routers: able to migrate repo from local path
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
Unknwon 9dfa17faf2 modules/git: able to parse RFC1123Z date format #663 2015-02-21 23:37:32 -05:00
Unknwon 1654e9ecab templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -05:00
无闻 065f8d1f56 Merge pull request #973 from uchti/dev
Fix: 504 5.5.2 <localhost>: Helo command rejected
2015-02-20 18:25:18 -05:00
Gogs 2f1369c614 add error for hello func 2015-02-20 10:12:27 +03:00
Gogs 5293ae1221 Fix: 504 5.5.2 <localhost>: Helo command rejected 2015-02-19 10:47:05 +03:00
Alexey Makhov 563e8b4ea9 gitlab-like hash naming 2015-02-19 00:52:22 +03:00
无闻 a307574fbc Merge pull request #962 from phsmit/dont_mention_php
Remove the "PHP" style formatting function
2015-02-17 23:19:25 -05:00
Peter Smit e6fc58a744 Remove GoGet option from repository and handle it with ?go-get=1 instead
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
2015-02-17 10:36:17 +02:00
Peter Smit 7759b9ee6e Remove the "PHP" style formatting function
The "PHP" formatting function doesn't add anything, except an undocumented date format.

All usages in the templates have been replaced with DateFmtShort and DateFmtLong for convenience.
2015-02-16 14:44:27 +02:00
Peter Smit ed89b39984 Updating context and fixing permission issues
The boolean flags in the repo context have been replaced with mode and two methods

Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.
2015-02-16 12:51:56 +02:00
Unknwon f625665d8d modules/setting: add abs path check before add workdir prefix 2015-02-14 17:49:33 -05:00
Dmitry Azhichakov 3aaf292ba8 Fix "forcing" client certificate for SMTP 2015-02-13 10:33:55 +03:00
Unknwon 6b7d35eade fix mirror issues uncaught #941 2015-02-13 02:14:57 -05:00
Unknwon 6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Dmitry Azhichakov 8a6c86644e New feature: SMTP connection may use client certificate.
New config keys in [mailer] section:
 - CERT_FILE: path to a certificate file.
 - KEY_FILE: path to a key file.
2015-02-12 18:54:51 +03:00
Peter Smit 6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
2015-02-12 14:25:07 +02:00
Peter Smit 0a4cda0dd4 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-12 14:14:45 +02:00
Unknwon 7e7160eefd first pass work on migration #925 2015-02-11 21:58:37 -05:00
Unknwon d02e45f985 better naming on #891 2015-02-11 12:04:01 -05:00
Unknwon 28580aee63 modules/middleware/auth.go: remove uncheck login for watch a repo #929 2015-02-10 22:53:46 -05:00
Unknwon 6a23252edc able to allow insecure certification of webhook for #891 2015-02-10 21:06:59 -05:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit 5cd887dba5 Fixes #921
Fixes #921 and makes the Mention regexp be in line with the others
2015-02-09 12:56:46 +02:00
Unknwon 3cc04682c5 modules/setting: mirror path issue 2015-02-08 22:23:01 -05:00
无闻 cd0ee35b3f Merge pull request #905 from phsmit/conf_on_cli
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
Unknwon 3a44143b81 modules/ans1-ber: fix LDAP UTF8 string decoding for #916 2015-02-08 14:39:54 -05:00
Lauris BH 00653e52ee Get username, name, surname and e-mail from LDAP server 2015-02-08 01:49:51 +02:00
Unknwon 2a2596fe61 able to disable SSH for #883 2015-02-07 10:46:57 -05:00
Unknwon 216683004e code fix for #908, and work for #884 2015-02-06 21:16:23 -05:00
无闻 87b90372a7 Merge pull request #908 from nicolai86/feature/hide-signup-button-884
Make Signup button display configurable - #884
2015-02-06 21:03:31 -05:00
Unknwon afccd0a3ee models/action.go: mirror fix on #892
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
2015-02-06 20:34:49 -05:00
Unknwon 0669897226 modules/base: fix markdown mention regex for #826
- conf/locale: add mew translator profile
2015-02-06 19:15:58 -05:00
无闻 ddddad9792 Merge pull request #826 from deringer/dev
Fix user mention bug when parsing markdown documents
2015-02-06 19:03:35 -05:00
Peter Smit 4e79adf6b5 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-06 13:18:11 +02:00
Raphael Randschau 79f3281548 Add ShowRegistrationButton configuration option 2015-02-05 18:14:54 +01:00
Peter Smit 1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Unknwon bfce0def25 modules/base: fix README filename checker, fix #877 2015-02-02 23:04:36 -05:00
Unknwon b293b6eaa6 cmd: CMD option for port number of `gogs web` to prevent first time run conflict
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
Unknwon fb9dcfa921 modules/midlleware: little auth code fix, #777 2015-01-30 20:30:42 -05:00
Unknwon d8394bb2e0 modules/midlleware: little auth code fix 2015-01-30 20:30:07 -05:00
Unknwon ee6786216a modules/base: clean code with #838 2015-01-30 18:12:30 -05:00
Unknwon 37fcc8daf2 modules/base: add RenderCommitMessage with XSS-safe and special links
- update russian locale
2015-01-30 18:05:20 -05:00
无闻 830bc75107 Merge pull request #866 from vitalvas/dev
Fix in url if cache avatar is enabled
2015-01-20 13:38:17 +08:00
Unknwon 8e384ce46c fix #828, may cause unintentional break in other features, but security is no.1 2015-01-20 13:08:49 +08:00
Vitaliy Vasilenko cf59057ef3 fix if service.ENABLE_CACHE_AVATAR is true 2015-01-20 05:20:33 +02:00
Unknwon 452cca35e0 Merge branch 'encoding' of github.com:gogits/gogs into dev
Conflicts:
	.gopmfile
2015-01-17 15:29:45 +08:00
Peter Smit e6f97c78ff Change chardet to gogits 2015-01-15 12:40:16 +02:00
Michael Dyrynda c7cbdd34fb Adjust MentionPattern to not match users mid-sentence (or email addresses)
Fix link to user profile, update based on adjusted MentionPattern
2015-01-03 22:03:41 +10:30
Unknwon c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Unknwon bd555551ce fix #801 2014-12-31 18:37:29 +08:00
Unknwon 81a44e4cd0 fix API changes 2014-12-28 20:40:35 +08:00
Peter Smit fff8109567 Removing redundant mahonia 2014-12-22 11:29:02 +02:00
Peter Smit 3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
无闻 030b3d751e Merge pull request #766 from phsmit/correct_from
Correct usage of FROM in email creation
2014-12-21 01:55:28 -05:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails
Multiple emails
2014-12-20 22:47:05 -05:00
Peter c884ecfea1 Parse the from string to extract the email address 2014-12-19 23:06:03 +02:00
Peter edbe1de026 Remove unused "User" member of Message Struct and fix bounce address
The User member of a message is not needed anymore.

The from that is send to the server, should always be the "system" from. This is also called the Bounce address http://en.wikipedia.org/wiki/Bounce_address
2014-12-19 22:48:21 +02:00
Peter 2321b4b272 Change from header in email, fixes #765 2014-12-19 22:33:17 +02:00
Peter 007cf33e88 Remove standard mailer port lines
This lines got committed by accident. They do actually nothing, as SplitHostPort will give an error if port is not given.
2014-12-19 22:00:11 +02:00
Unknwon b231b8c927 update locale and mirror code format 2014-12-19 00:24:17 -05:00
Peter eca42bcb44 Prefer CRAM-MD5 over PLAIN authentication 2014-12-18 14:15:13 +02:00
Peter 5ffeca35e7 Add option to use CRAM-MD5 as authentication method in the mailer 2014-12-18 13:58:48 +02:00
Peter 87be137b88 Rewrite of SendMail function
The SendMail function is rewritten and has the following new functionality:
 - It is optional to skip verification of keys. The config option SKIP_VERIFY is added
 - If the port is 465, or ending on 465, the TLS(/SSL) connection is started first.
2014-12-18 13:34:30 +02:00
Peter b033f2f535 Finish method for having multiple emails/user.
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
2014-12-17 17:42:54 +02:00
Peter ec71d538fc Method for activating email addresses through verification email 2014-12-17 17:41:49 +02:00
Unknwon 9803c421f5 fix binding api broken 2014-12-15 01:49:59 -05:00
Unknwon b553ea45ee modes/repo: incorrect SSH clone URL for #742 2014-12-13 16:46:00 -05:00
Unknwon ac4a10456e api: able to create repo and fix #726
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 9ee80e3e54 fix compile error 2014-12-10 05:10:26 -05:00
无闻 b2c6a6920f Merge pull request #727 from Mageti/master
Correction for #723
2014-12-10 05:03:50 -05:00
Mageti e321469884 remove unused code in BasicAuthDecode 2014-12-10 11:01:17 +01:00
Mageti b7ebbb4064 Correction for #723
Correction for #723
Bug was : decode failed if the password contains ```:```
2014-12-10 10:51:51 +01:00
Unknwon 9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
Alukardd 21081836ba Allow send mail without authentication if SMTP server allow this 2014-12-07 16:07:48 +03:00
Joseph Crail 39c068400e Fix spelling errors in comments. 2014-12-06 20:22:48 -05:00
Unknwon 0b785ad967 work on #672 2014-12-05 18:08:09 -05:00
Unknwon 069486d169 fix #165 2014-12-05 17:54:57 -05:00
Andrew Burns 35b02997f8 Fix Gravatar images in web view (like commit listing)
Related to #700

In the original bug report it was referencing only the sytem avatar images for setup users (like in the header); however the problem also persists with things like commit history.

This commit fixes the `tool.AvatarLink` function so that it also uses the already existing `avatar.HashEmail` function.

I also refactored the `tool.AvatarLink` method some to make the control flow more apparent and adhere better to DRY (there were multiple calls to the `EncodeMd5` function that the `HashEmail` function call replaced, now there is only one.)
2014-12-05 11:02:59 -07:00
Andrew Burns adc1ac689e HashEmail function should also remove spaces
According to the [Gravatar API](https://en.gravatar.com/site/implement/hash/) whitespace should also be removed from the email, it was not doing this previously.
2014-12-05 10:58:49 -07:00
dennis-smurf d0a80e432d Addded sha1 pattern in markdown for current repository 2014-12-01 09:30:35 +01:00
Unknwon 9558999698 mirror fix 2014-11-30 18:35:05 -05:00
Unknwon d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon db4951bc61 mirror fix on oauth2 2014-11-28 21:38:35 -05:00
Unknwon d6132aaa88 fix oauth2 2014-11-28 21:20:13 -05:00
Unknwon 54d25c13d7 Fix #543 2014-11-24 18:47:59 -05:00
Unknwon ef275ebf62 more on change avatar 2014-11-21 12:51:36 -05:00
Unknwon 55dfe2c978 custom avatar upload 2014-11-21 10:58:08 -05:00
Unknwon 3c3f7c2a56 Fix #643 2014-11-20 18:03:42 -05:00
Unknwon ce8d4cc80b #634 2014-11-18 15:13:08 -05:00
Unknwon 37d8d3afe9 more APIs on #12 2014-11-18 11:07:16 -05:00
Unknwon 32dcaefafa fox #620 2014-11-17 14:53:41 -05:00
Unknwon a0f9197b45 GetFile api 2014-11-16 21:32:26 -05:00
Unknwon 340a4595dd support duoshuo mirror of gravatar 2014-11-16 20:27:04 -05:00
Unknwon 52d66ba6c8 #12, use go-gogs-client 2014-11-14 17:11:30 -05:00
Sean Keery 6bdb8ec4b9 Add function argument missing
Not enough arguments in call to c.AddFunc when I copied and pasted
2014-11-14 10:58:37 -07:00
Unknwon 9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -05:00
Unknwon 8eb5120fbd #12, API: list user repos, list repo hooks 2014-11-13 02:32:18 -05:00
Unknwon 8c9338a537 add personal access token panel #12 2014-11-12 06:48:50 -05:00
Unknwon e0de6cb5ad work on #616 and update locales 2014-11-10 05:30:07 -05:00
Unknwon 35977cd34c continue work on #255 2014-11-07 16:44:25 -05:00
Unknwon abc57b6e43 work on #609 2014-11-07 14:46:13 -05:00
Unknwon 23eec25274 Fix #605, fix #255, fix #101 2014-11-06 22:06:41 -05:00
Unknwon 0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
Andy Leap 5094e9501c Add basic FCGI support 2014-11-03 20:49:56 -05:00
mcheng89 b9881d1e7b check for smtp AUTH extension 2014-10-31 21:52:03 -04:00
Unknwon f1d8746264 Fix fork repo and macaron API broken 2014-10-24 18:43:17 -04:00
Christopher Brickley 3794111460 update slack hook to use new format 2014-10-24 08:56:12 -04:00
Unknwon a342d58d7e Able to fork repo to individuals 2014-10-19 01:35:24 -04:00
Unknwon 3abc41ccca Fix API broken 2014-10-18 23:26:55 -04:00
Unknwon fa241efa6d Use binding middleware 2014-10-15 11:19:20 -04:00
Unknwon 9ae92459a5 Fix repo css and rel path img in md 2014-10-14 23:44:34 -04:00
Unknwon 3005c4f6db Fix diff css style, hooks \r char 2014-10-11 18:20:07 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
Unknwon b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
Unknwon 39931f8e00 Allow mail with self-signed certificates 2014-10-09 18:08:07 -04:00
Michel Roux 6705559ce0 Fix malformed address 2014-10-08 18:29:02 +02:00
Unknwon 1e1f9e7166 Update with macaron 2014-10-06 19:12:52 -04:00
Unknwon 64c68220d2 Fix #264 2014-10-06 17:50:00 -04:00
Unknwon 91e5c24a31 Fix #522 2014-10-06 10:36:32 -04:00
无闻 b694cc88e4 Merge pull request #525 from linquize/tag-sort-reverse
sort tags in descending order by version number
2014-10-05 00:08:24 -04:00
Linquize 67c44b7d27 If git >= 2.0, sort tags in descending order by version number 2014-10-05 11:59:54 +08:00
Unknwon 263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
Unknwon 2a031c1365 Fix #515 2014-09-30 04:39:53 -04:00
Martin van Beurden bb05ef907b Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached 2014-09-28 14:27:13 +02:00
Unknwon 49193bebd2 UI: Confirmation box 2014-09-28 01:38:25 -04:00
Unknwon f69761563b Fix bug on transfer repo 2014-09-25 16:36:19 -04:00
Unknwon 25268577a5 Fix download archive issue 2014-09-24 17:43:33 -04:00
Unknwon a1109e6fbc Page: Repository home page 2014-09-23 13:47:54 -04:00
Unknwon ebb05475ed Fix #495 and cannot view repository by tag 2014-09-23 13:06:25 -04:00
Unknwon 135d3733b3 Feature: Integrate crypto/tls/generate_cert.go command 2014-09-22 17:30:58 -04:00
Unknwon 3f707b3f32 Add basic submodule support 2014-09-22 17:01:19 -04:00
lunnyxiao 7df60af60e submodule support and closed #478 2014-09-22 14:23:36 +08:00
lunnyxiao 79ec08141a Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-22 10:45:20 +08:00
lunnyxiao 150eef93b2 add submodule basic support & buf fixed #478 2014-09-22 10:43:16 +08:00
Unknwon 1273b3d3a9 Support custom robots.txt 2014-09-21 19:39:10 -04:00
Unknwon b72d7c201a Mirror bug fix 2014-09-21 12:22:50 -04:00
Unknwon 4a01bb8fa4 Mirror bug fix 2014-09-21 12:19:50 -04:00
Martin van Beurden 976f1486e0 Set cookiepath to AppSubUrl 2014-09-21 14:25:22 +02:00
Unknwon 7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden 0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
2014-09-18 20:50:48 +02:00
Unknwon 8a09256941 Mirror fix and fix #481 2014-09-17 14:22:51 -04:00
lunnyxiao 061a879cea Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
	conf/app.ini
2014-09-17 12:04:18 +08:00
lunnyxiao ed84adb679 toutf8 improved & add max git diff lines 2014-09-17 12:03:03 +08:00
Unknwon ae3639868e Quick fix on #476 2014-09-16 20:58:06 -04:00
Unknown ebb4f1b78c Work #475 and #458 2014-09-16 13:34:09 -04:00
Unknwon 62f21ff3ed Work on #476 2014-09-16 11:29:53 -04:00