Commit Graph

2391 Commits (436ef5b50a32c7ff2053bce7f5b3eaf6abe0c984)

Author SHA1 Message Date
Unknwon 48bb639371 Merge branch 'develop' of github.com:gogits/gogs into develop 2015-03-12 16:01:41 -04:00
Unknwon 0720d3988f #988: GetRepoLink already contains AppSubUrl 2015-03-12 16:01:23 -04:00
无闻 7ba9d1171c Merge pull request #1038 from ndarilek/fix-typo
Fix typo
2015-03-12 15:31:01 -04:00
Unknwon 6b70a0c0d9 #1032: legacy code can have duplicated IDs for same repository 2015-03-12 15:09:40 -04:00
Nolan Darilek 98674b2a21 registeration -> registration 2015-03-12 12:25:28 -05:00
Unknwon 4aafeace23 fix HTTP/HTTPS push update func call panic #1037 and `http: multiple response.WriteHeader calls` 2015-03-12 01:15:01 -04:00
Unknwon 34102f7889 remove unused scripts and simplify migrate form definition 2015-03-11 09:21:05 -04:00
无闻 da6fd93f0d Merge pull request #1031 from voxxit/master
Project-level Dockerfile & docker-compose script
2015-03-10 13:00:37 -04:00
Joshua Delsman 406efbf3f5 Adding a project-level Dockerfile & docker-compose script 2015-03-10 07:06:10 -07:00
无闻 6abbea4f3d Merge pull request #1027 from FiloSottile/master
Handle submodules without a .gitmodules entry - fix #1023
2015-03-10 00:05:45 -04:00
Filippo Valsorda 5d5d774e03 Handle submodules without a .gitmodules entry - fix #1023 2015-03-10 03:08:17 +00:00
James Cracknell 41cc43208e Mousewheel paste 2015-03-08 22:30:15 -06:00
James Cracknell 127eb439d7 Exclude HTML tags from Markdown post-processing
HTML tags are no longer processed for special links, etc
Contents of <a>, <code> and <pre> are not processed for special links
Processing for special links is done after Markdown conversion
2015-03-08 22:14:50 -06:00
Unknwon 4b9fb43a70 home: new UI 2015-03-07 15:12:13 -05:00
Unknwon 5e763baa12 modules/git/signature.go: parse date foramt #663 2015-03-06 18:27:20 -05:00
Unknwon 18c0697329 routers/repo/setting.go: fix LDAP cannot validate password #1006 2015-03-05 19:20:27 -05:00
Unknwon e3d73d9b24 conf/locale: update locales 2015-03-04 18:19:32 -05:00
Unknwon 6c84223f43 scripts: remove meaningless script and modify systemd service 2015-03-04 00:59:55 -05:00
Unknwon b447d18dca cmd/serve.go: remove useless code 2015-03-01 18:43:28 -05:00
Unknwon 63a73b43b4 models/migrations: fix update error 2015-02-28 23:58:04 -05:00
无闻 3db80f2c55 Merge pull request #943 from diseaz/mailer-client-cert
Use client certificate for SMTP over TLS
2015-02-28 22:25:48 -05:00
Unknwon a6a2f59d1d Merge branch 'access' of github.com:gogits/gogs into dev 2015-02-28 22:25:10 -05:00
Unknwon d446be9f5f models: mirror fix on #964 2015-02-28 22:24:53 -05:00
无闻 8d17ff8ce7 Merge pull request #964 from phsmit/access_rewriteserv
Rewrite/simplify gogs serve
2015-02-28 21:57:58 -05:00
Unknwon b0b11fd7b1 Merge branch 'access' of github.com:gogits/gogs into dev 2015-02-28 21:50:29 -05:00
Unknwon f44204e944 REAMDE: update 2015-02-28 21:50:04 -05:00
Unknwon 473e265727 models: done testing on new access system 2015-02-28 21:44:09 -05:00
无闻 3a6ba39a61 Merge pull request #992 from theangryangel/fix/ldap-auth
Attempt 3 to fix LDAP login issues when git pushing after password change
2015-02-28 06:57:43 -05:00
Unknwon 0d90a16d9f conf/locale: update Russian and Spanish 2015-02-28 06:45:08 -05:00
Gogs fab038b175 Attempt #3 of ldap fixes 2015-02-27 13:18:29 +00:00
Unknwon e3dece1371 modules/setting: simple behave change in startup 2015-02-26 19:45:38 -05:00
无闻 d5de48df89 Merge pull request #982 from nicolai86/bugfix/label-num_issues-2nd
Properly calculate the number of open issues per label
2015-02-24 12:33:18 -05:00
Unknwon 8896c82d34 models: fix issue with transfer repository
README: fix typo
2015-02-24 00:27:22 -05:00
Raphael Randschau 1f61340fa3 Properly calculate the number of open issues per label 2015-02-23 21:26:24 +01:00
无闻 f92bfabf86 Merge pull request #960 from phsmit/access_action
Fix that owners also see actions on their repositories
2015-02-23 13:51:02 -05:00
无闻 cd8b43d984 Merge pull request #915 from Lafriks/dev
Get username, name, surname and e-mail from LDAP server
2015-02-23 13:41:29 -05:00
Peter Smit 556881964f Merge branch 'access' into access_rewriteserv 2015-02-23 12:34:41 +02:00
Unknwon ee68a826a5 v4 migration, merge 'dev', clean code and mirror fix 2015-02-23 02:15:53 -05:00
Unknwon e90f014e4a Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 23:34:05 -05:00
无闻 125fe92a19 Merge pull request #961 from phsmit/access_removecoll
Remove collaborators when removing and transferring repository
2015-02-22 23:33:13 -05:00
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 2369881808 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 18:24:52 -05:00
Unknwon 04164eada3 models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
无闻 e97a6ff911 Merge pull request #978 from albang/dev
[docker] openssh-client provide ssh-keygen.
2015-02-22 17:59:12 -05:00
Alban Garrigue 7d109573cb openssh-client provide ssh-keygen. GOGS needs that binary to add a ssh key to a user 2015-02-22 16:42:59 +01:00
Unknwon 74a8bb93d8 Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-22 09:49:28 -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
无闻 aa670ce660 Merge pull request #977 from albang/dev
$DIRECTORY variable is never set
2015-02-22 07:13:06 -05:00
Alban Garrigue 81fcc0db0c $DIRECTORY variable is never set 2015-02-22 13:06:46 +01:00