Commit graph

735 commits

Author SHA1 Message Date
fzerorubigd
6643647687
add afunction to rewrite all public keys on admin request
refs #763
2015-01-01 02:15:52 +03:30
Unknwon
bd555551ce fix #801 2014-12-31 18:37:29 +08:00
无闻
477bea574a Merge pull request #782 from estetsenko/dev
fix for  #747
2014-12-29 20:08:39 +08:00
无闻
afdb0c7f9d Merge pull request #790 from euank/master
Initialize unset git user.email / user.name correctly; fix Dockerfile
2014-12-29 20:06:27 +08:00
Unknwon
63c1f9a23f fix 500: E-mail already used in user settings page 2014-12-29 20:00:07 +08:00
euank
234a7c19a4 Default values for both user.name and user.email
The previous behavior was to set default values only if user.name was
not set, but to always set it for both. This only sets a value if there
wasn't one; this fixes cases where someone has a user.name but no
user.email (see included Dockerfile) or someone has a user.email but no
user.name (before the email would have been over-written).
2014-12-27 19:07:54 -08:00
estetsenko
bae1d65564 bugfix: Unable to assign any issue myself 2014-12-24 20:47:45 +03:00
Peter Smit
3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
Peter Smit
66e2016eeb Fix for wrong email query
Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
2014-12-21 09:16:56 +02:00
无闻
a18decf4cc Merge pull request #755 from phsmit/multiple_emails
Multiple emails
2014-12-20 22:47:05 -05:00
Peter
20b5c23a19 Small fixes to multiple_emails feature 2014-12-20 09:26:51 +02:00
Unknwon
c4820f119d work on #754 2014-12-18 03:26:09 -05:00
Peter
6919c80f0b Add function to the model for email address management (add/delete/activate) 2014-12-17 17:40:10 +02:00
Peter Smit
99599c099f Add alternative email addresses to the model
A new struct is created named EmailAddress that contains alternative
email addresses for users. Also the email related methods; IsEmailUsed
and GetUserByEmail are updated.

DeleteUser deletes the extra email addresses and DeleteInactivateUsers
also deletes inactive accounts. This could be factored out, but should
do it for now.
2014-12-17 10:26:19 +02: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
2f3a7e53cb fix #735 2014-12-12 01:29:36 -05:00
Unknwon
9a1fe801e5 fix #711 2014-12-09 02:18:25 -05: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
e577f2fff3 fix #706 and other mirror improve 2014-12-04 23:07:51 -05:00
Andrew Burns
00cf3e4dab Use the avatar.HashEmail function instead of hashing email directly. Fixes #700 2014-12-03 16:19:35 -07:00
Unknwon
5338808600 fix #676 2014-11-30 18:29:16 -05:00
Unknwon
d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon
1b66600bd0 Fix #652 2014-11-23 02:33:47 -05:00
Unknwon
dc53270da9 Fix 653 2014-11-22 10:22:53 -05:00
Unknwon
8ea7ba3afa fix #644 2014-11-21 13:10:00 -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
2d8c414f8c Fix #635 2014-11-18 19:05:33 -05:00
Unknwon
ce8d4cc80b #634 2014-11-18 15:13:08 -05:00
Unknwon
1e47e2df85 quick fix 2014-11-17 16:29:23 -05:00
Unknwon
5d9ef2bb12 lock gopmfile 2014-11-17 16:25:39 -05:00
无闻
d21d7171b0 Merge pull request #587 from eryx/dev
Fix #266
2014-11-17 16:17:52 -05:00
Unknwon
32dcaefafa fox #620 2014-11-17 14:53:41 -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
Unknwon
9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -05:00
Unknwon
9e22840483 fix #622 2014-11-13 05:27:01 -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
4e7eb5be9d Work on #5 fork and fix #608 2014-11-05 23:30:04 -05:00
Unknwon
0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
luto
bff1e157d5 force the use of InnoDB as db engine for all tables, fixes #59 2014-10-28 16:40:09 +01:00
Eryx
e84e0ab904 Fix #266 2014-10-28 10:36:47 +08:00
Unknwon
83283bca4c Safe work 2014-10-25 07:50:19 -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
无闻
d7d167ac63 Merge pull request #560 from evolvedlight/master
First cut of fork repo
2014-10-18 23:59:36 -04:00
Tony Tsang
e0f945959e Replace white spaces with tab for format consistency 2014-10-14 17:31:35 +08:00
Tony Tsang
91127d9016 Fixes #562 2014-10-14 16:46:25 +08:00
evolvedlight
8d2a6fc484 Merge remote-tracking branch 'upstream/dev'
Conflicts:
	models/repo.go
2014-10-13 20:30:31 +01:00
evolvedlight
29ac3980ff More changes 2014-10-13 20:23:30 +01:00
Unknwon
c04aea8d9d Fix #540 2014-10-12 02:39:00 -04:00
Unknwon
0d7b9065c6 Fix #540 2014-10-12 02:06:46 -04:00
Unknwon
452ccff81c Mirror fix on add ssh key 2014-10-11 21:04:42 -04:00
Unknwon
fb839ca0fb More debug info 2014-10-11 20:34:48 -04:00
Unknwon
b7b7863364 Work on ssh key issue 2014-10-11 20:06:35 -04:00
Unknwon
963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
lunnyxiao
e848b17fab bug fixed for #540 2014-10-11 13:24:36 +08:00
Unknwon
b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
evolvedlight
211dc74816 Got the fork count working 2014-10-10 00:21:36 +01:00
Unknwon
79262173a6 Webhook delivery locking & Hide repo for org members if they don't have access 2014-10-09 19:01:22 -04:00
Unknwon
1aa76bd279 Fix #532, add system notice 2014-10-08 18:29:18 -04:00
Unknwon
263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
evolvedlight
c9e5e38fcf Initial cut of git fork 2014-10-04 18:19:14 +01:00
Unknwon
405ee14711 Fix SMTP auth logic 2014-10-03 13:12:54 -04:00
Unknwon
86eac0842b Fix feeds display issue 2014-09-29 18:58:04 -04:00
Unknwon
3cfa4a581c Bug: 500 when transfer repository to collaborator 2014-09-29 04:04:48 -04:00
fundon
eb1e6f8e3e support dsa key format 2014-09-29 12:37:34 +08:00
无闻
c1d047d16e Merge pull request #508 from chadoe/homelink
Fix user HomeLink when using a suburl
2014-09-28 18:05:58 -04:00
无闻
38f71af363 Merge pull request #509 from chadoe/avatarlink
Fix AvatarLink when using a suburl
2014-09-28 18:05:35 -04:00
evolvedlight
b7b0ee7df9 Fix minor typo 2014-09-28 22:01:05 +01: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
Martin van Beurden
204952439a Fix user HomeLink when using a suburl 2014-09-28 13:55:58 +02:00
Unknwon
b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
Unknwon
10673417dc Mirror fix on transfer repo 2014-09-25 22:42:31 -04:00
Unknwon
ad52b2d791 Mirror fix on transfer repo 2014-09-25 22:36:07 -04:00
Unknwon
71e4689d11 Page: User profile 2014-09-25 19:33:39 -04:00
Unknwon
f69761563b Fix bug on transfer repo 2014-09-25 16:36:19 -04:00
lunnyxiao
089d934547 add action repousername for transfer 2014-09-25 16:43:14 +08:00
Unknwon
bd55b78775 Page: Commits and fix #249 2014-09-23 23:18:14 -04:00
Unknwon
5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Christopher Brickley
25c8d01676 increase max commits in payload to 5 2014-09-22 08:25:39 -04: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
Christopher Brickley
f94d7c3f51 clarify name/username/owner/pusher for webhook 2014-09-17 09:20:14 -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
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
Unknwon
0d9c41be7d Work on #476 2014-09-16 10:10:33 -04:00
Unknwon
c1ceec45da Fix mirror UI style and work on #475 2014-09-16 08:32:13 -04:00
Unknwon
a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon
bba401a5dc Prepare 0.5 release 2014-09-12 19:42:11 -04:00
Unknwon
1b7adf57e9 fix https://github.com/go-xorm/xorm/issues/161 2014-09-12 18:58:24 -04:00
Unknwon
cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Christopher Brickley
52d15ddec8 deliver hooks immediately after commit 2014-09-10 08:57:11 -04:00
Unknwon
33659ed9a5 Fix #452 2014-09-09 10:17:35 -04:00
Christopher Brickley
132590fab8 update specific hook_task, not all 2014-09-09 08:37:34 -04:00
lunnyxiao
d84d6dfdae add showinfo for xorm 2014-09-08 12:11:25 +08:00
无闻
e79e4b1580 Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
Unknwon
ab7206d6b7 Fix #348 2014-09-05 17:28:09 -04:00
Christopher Brickley
85c35a6b8b add organization-level webhooks 2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov
31d8011843 Set milestone content field to TEXT orm type 2014-09-05 08:10:41 +07:00
无闻
d8290c9bac Merge pull request #444 from tstorch/database-cleanup
Code dedoublication in models/models.go
2014-09-04 11:38:35 -04:00
Tristan Storch
bdfdf3cacb Code dedoublication in models/models.go
Just some code dedoublication in models/models.go
2014-09-04 17:19:26 +02:00
Tristan Storch
9fc4ded369 Standard git user.name and user.email if not set
Git user.name and user.email will now be set to the standard values

  - Gogs
  - gogitservice@gmail.com

if user.name is not set or empty.

If user.name is set and user.email not, it will leave it this way.
2014-09-04 12:07:09 +02:00
Unknwon
830efc90da update docs and mirror bug fix 2014-09-02 07:11:39 -04:00
lunnyxiao
c80f0232f1 Merge branch 'master' into dev 2014-09-02 11:59:39 +08:00
lunnyxiao
1240fef0ca bug fixed for migrate and fixed #141 2014-09-02 11:57:06 +08:00
Christopher Brickley
af0741da07 handle initial commit for compareUrl 2014-09-01 19:19:56 -04:00
Christopher Brickley
00a864e693 add commit compare functionality 2014-09-01 14:56:19 -04:00
Christopher Brickley
2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04:00
Unknwon
7e36bf448d Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
	dockerfiles/README.md
2014-08-31 15:11:55 +08:00
Unknwon
d2aff9a46a Continue working on new admin pages 2014-08-29 20:50:43 +08:00
lunnyxiao
a6ec6def8d Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-29 11:25:03 +08:00
lunnyxiao
c40e815763 add migrate api 2014-08-29 11:24:37 +08:00
Unknwon
1aec1a2dda Finish new admin dashboard 2014-08-28 22:29:00 +08:00
Unknwon
9baf2b38d0 Bug fix on organization 2014-08-27 16:39:36 +08:00
Unknwon
50de06056b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-26 18:11:27 +08:00
Unknwon
74b31566cf Finsih add/remove repo in organization 2014-08-26 18:11:15 +08:00
Vyacheslav Bakhmutov
95a594d75a Migrate all branches and tags 2014-08-25 20:28:14 +07:00
Unknwon
21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Unknwon
e325c8499a Fix and set git config 2014-08-23 23:58:56 +08:00
Unknwon
a60edbe88c Add/remove member need add/remove access to repositories as well 2014-08-16 16:58:32 +08:00
Unknwon
bba707de36 Finish team list, create new team, join/leave team page 2014-08-16 16:21:17 +08:00
Unknwon
36b4c57ff1 Finish new organization members and invitation page 2014-08-15 18:29:41 +08:00
Unknwon
5fbf8531e6 Finish new home page of organization 2014-08-10 20:11:18 -07:00
Unknwon
78defd238c Page: Manage social accounts 2014-08-09 17:25:02 -07:00
Unknwon
9a1d5d2489 Finish new web hook pages 2014-08-09 15:40:10 -07:00
Unknwon
9d5c0c80a4 Mirror fix on #352 2014-08-07 06:45:29 -04:00
Sebastian Jackel
0bfbefc38a Moved defer f.Close() up so there is no chance of returning without closing and handled an error on f.Chmod 2014-08-07 11:06:42 +02:00
Sebastian Jackel
51abaf788c Corrected log message 2014-08-07 10:34:37 +02:00
Sebastian Jackel
be7ce72ebe Make sure, .ssh directory and authorized_keys file are kept at correct permissions 2014-08-07 10:00:57 +02:00
Unknwon
a8e05fdf1b Use toolbox 2014-08-06 17:21:24 -04:00
Unknwon
fa0a389dc4 Fix bare repo bug 2014-08-05 19:40:01 -04:00
Unknwon
755eec745f Finish new repo settings page 2014-08-02 13:47:33 -04:00
Unknwon
17d2675dd2 Fix #258 2014-08-01 05:20:33 -04:00
Unknwon
9813161411 Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page 2014-07-26 23:53:16 -04:00
Unknwon
5e81383413 Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module 2014-07-26 18:37:18 -04:00
Unknwon
5c4bc3c848 Huge updates!!!!! Be careful to merge!!!! 2014-07-26 02:28:04 -04:00
Unknwon
8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04:00
无闻
c4eeb803e1 Merge pull request #310 from nuss-justin/issue/303
Fix #303. Specify updated columns explicitly.
2014-07-24 15:26:04 -04:00
Justin Nuß
3e7e9ee289 Fix #303. Specify updated columns explicitly. 2014-07-24 20:07:07 +02:00
Justin Nuß
620c0ef297 Merge branch 'dev' of https://github.com/gogits/Gogs into trello/244 2014-07-24 19:15:35 +02:00
Justin Nuß
cbcd08aa17 Mention organisation users when organisation gets mentioned 2014-07-24 19:15:31 +02:00
无闻
da0240aacd Merge pull request #307 from nuss-justin/feature/attachments
Feature: Ability to attach files to issues (attachments)
2014-07-24 12:47:55 -04:00
Justin Nuß
9a7349ce64 Change Attachment.Path to TEXT (no maximum size) 2014-07-24 17:02:42 +02:00
Justin Nuß
bfe5b86004 Add file upload for attachments 2014-07-24 15:19:59 +02:00
Justin Nuß
70b0023b82 Fix double decrement of issue counter 2014-07-24 13:58:39 +02:00
Justin Nuß
967856f36e Merge branch 'dev' into feature/attachments
Conflicts:
	models/issue.go
	routers/repo/issue.go
2014-07-24 12:29:37 +02:00
Justin Nuß
d43c5895bc Update template and style, only close commit if commit is in same repository 2014-07-24 10:15:05 +02:00
Justin Nuß
3c025b3950 Add delete route for attachments, remove upload buttons from issues/comments 2014-07-24 09:05:15 +02:00
Justin Nuß
34304e6a0c WIP: Allow attachments for issues, not only comments 2014-07-23 21:24:24 +02:00
Justin Nuß
4617bef895 WIP: Allow attachments for comments 2014-07-23 21:15:47 +02:00
Justin Nuß
c850c01007 Update closed issues stats for repository 2014-07-23 13:54:46 +02:00
Justin Nuß
469cbc8813 Update progress of milestones when closing/reopening issues and allow closing of issues in commit messages 2014-07-23 13:48:06 +02:00
无闻
94b100ce43 Merge pull request #299 from nuss-justin/issue/216
Fix #216. Change milestones, labels and assigne without reloading the page
2014-07-22 16:24:16 -04:00
无闻
dc2e140360 Merge pull request #296 from nuss-justin/dev
Fix issue 280 & unwatch button in Firefox
2014-07-22 16:03:58 -04:00
Justin Nuß
0d06c7e5f2 Prevent panic when dividing through zero 2014-07-22 20:57:48 +02:00
Justin Nuß
636a78fed1 Escape tags and quotes in links. 2014-07-22 20:08:04 +02:00
Justin Nuß
e194cf3291 Fix issue #259. Allow links in the repository description 2014-07-22 19:52:37 +02:00
Justin Nuß
ec26b78d3c Fix issue #280. Update milestone counter when creating an issue 2014-07-22 13:50:34 +02:00
Unknown
3969d704a0 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-12 00:55:35 -04:00
Unknown
0f907301b7 Fix #285 2014-07-12 00:55:19 -04:00
Christopher Brickley
63e47405b2 Only update access usernames where the username is changing #282 2014-07-11 20:57:00 -04:00
Unknown
63cc14062a Paging function for users and repositories 2014-07-07 04:15:08 -04:00
Unknown
7ffdabb28f Move debug router location 2014-07-06 18:25:07 -04:00
Unknown
097c8e05e6 Able to set timeout for process monitor 2014-07-06 17:32:36 -04:00
Unknown
fd5412ec47 Work on #274 2014-07-04 22:43:39 -04:00
Lunny Xiao
baa255e899 remove debug info 2014-07-05 10:37:29 +08:00
Lunny Xiao
3c6da63216 bug fixed 2014-07-05 10:25:45 +08:00
Unknown
be8ac7fb75 fix #273 2014-07-04 16:48:36 -04:00
Unknown
7f3015b32b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-04 14:44:31 -04:00
Unknown
13b032f829 update name 2014-07-04 14:44:27 -04:00
Justin Nuß
a481672c5c Add 'pprof' tag for enabling debugging 2014-07-04 11:41:43 +02:00
Unknown
465dc962b5 Finish create organization team 2014-07-02 16:42:16 -04:00
Unknown
e4ea5cf598 Finish Teams page 2014-06-29 16:30:41 -04:00
Unknown
99713e1180 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-28 15:43:28 -04:00
Unknown
5dbfe3c26c Finish organization homepage 2014-06-28 15:43:25 -04:00
Lunny Xiao
1c46d68aba bug fixed for message tag 2014-06-28 23:56:41 +08:00
Lunny Xiao
4ce2fa520a Merge branch 'master' into dev 2014-06-28 15:00:38 +08:00
Lunny Xiao
a357cda957 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-06-28 15:00:32 +08:00
Lunny Xiao
54e17c7cca bug fixed #261 2014-06-28 15:00:03 +08:00
Lunny Xiao
86e2627175 Merge branch 'master' of github.com:gogits/gogs
Conflicts:
	models/update.go
	routers/repo/http.go
2014-06-28 14:58:59 +08:00
Lunny Xiao
e5ae41e21f bug fixed #261 2014-06-28 14:55:33 +08:00
Unknown
6e448b0714 Finish delete organization 2014-06-28 00:40:07 -04:00
Unknown
19e9104289 Organization settings page 2014-06-27 03:37:01 -04:00
Lunny Xiao
165e3e8f18 path bug fixed 2014-06-26 21:39:27 +08:00
Unknown
32b09681b2 Migrate repository by organization 2014-06-25 05:35:23 -04:00
Unknown
8644c571db Mirror bug fix on create repo action 2014-06-25 05:27:17 -04:00
Unknown
43b33440b5 Work on create organization repo and #257 2014-06-25 05:14:36 -04:00
Unknown
e0f9c628c5 Add create organization 2014-06-25 00:44:48 -04:00
Unknown
ceb415df8a Merge branch 'master' of github.com:gogits/gogs into dev 2014-06-24 09:59:21 -04:00
Eryx
d5d04a66f3 Fix #252 2014-06-24 16:53:42 +08:00
Unknown
47d29a1ee0 Mirror fix on #248 2014-06-23 16:22:34 -04:00
Unknown
ad5ec45dd6 Fix #165 2014-06-21 00:51:41 -04:00