03af37554e
Merge branch 'dev' into newcollaboration
2015-02-05 11:08:10 +02:00
02c5bade0f
Merge pull request #892 from EtienneBruines/commit_reference
...
Referencing issues from commit messages is now possible.
2015-02-04 23:21:20 -05:00
f706102890
models: sanitize user full name when update settings
2015-02-04 20:04:01 -05:00
fd1df86c44
Fix dashboard issue after collaboration migration
2015-02-04 16:08:55 +02:00
bef38d9d3f
Fix collaboration migration code
2015-02-04 16:03:39 +02:00
4de0b19cec
models: mirro code fix for #821
2015-02-02 23:42:53 -05:00
902f19f70b
Merge pull request #821 from phsmit/fix_819
...
Fix #819 by fetching the repository from db before updating
2015-02-02 23:38:04 -05:00
5c4b85c029
Referencing issues from commit messages is now possible.
...
Code-wise: the fixing-part of the code now doesn't reference the issue any more, because this is done by the referencing-part of the code, which is called just before.
Fixes #462 , #668 , #732 .
2015-02-02 16:34:07 +01:00
0a2068d7fb
models: code fix on #818
2015-02-01 17:21:56 -05:00
cd6376f093
Merge pull request #818 from fzerorubigd/master
...
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
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
ee6786216a
modules/base: clean code with #838
2015-01-30 18:12:30 -05:00
76f8904718
Introducing Collaboration Struct
2015-01-23 09:54:16 +02:00
4ef3245413
Migration code: errors are not to be forgotten
2015-01-22 15:01:45 +02:00
2a70d6b723
Clean up migrations code
2015-01-22 14:56:50 +02:00
bb103e8723
Create db migrations framework
2015-01-22 14:52:58 +02:00
161774d4fb
Merge pull request #825 from phsmit/ssh2_keys
...
Implement #798 Flexible ssh-key input
2015-01-22 19:39:35 +08:00
452cca35e0
Merge branch 'encoding' of github.com:gogits/gogs into dev
...
Conflicts:
.gopmfile
2015-01-17 15:29:45 +08:00
d0827e5d5e
allow http push by token - #842
2015-01-08 09:30:22 -05:00
bb26285a12
fix #827
2015-01-06 17:14:49 +08:00
6251626de4
Implement #798 Flexible ssh-key input
...
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
2015-01-02 15:38:11 +02:00
c73e9057ae
Optmize git-fsck options and fix #820
2015-01-02 20:14:43 +08:00
44fa9147b7
Fix #819 by fetching the repository from db before updating
2015-01-02 11:15:42 +02:00
0b56272c13
fix #805
2015-01-02 13:30:45 +08:00
3ea1443885
work on #784
2015-01-02 12:47:33 +08:00
6643647687
add afunction to rewrite all public keys on admin request
...
refs #763
2015-01-01 02:15:52 +03:30
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
63c1f9a23f
fix 500: E-mail already used in user settings page
2014-12-29 20:00:07 +08:00
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
bae1d65564
bugfix: Unable to assign any issue myself
2014-12-24 20:47:45 +03:00
3af757ed77
Replace mahonia with the standard functions in the Golang Sub-repositories
2014-12-22 11:01:52 +02:00
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
20b5c23a19
Small fixes to multiple_emails feature
2014-12-20 09:26:51 +02:00
c4820f119d
work on #754
2014-12-18 03:26:09 -05:00
6919c80f0b
Add function to the model for email address management (add/delete/activate)
2014-12-17 17:40:10 +02:00
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
b553ea45ee
modes/repo: incorrect SSH clone URL for #742
2014-12-13 16:46:00 -05:00
ac4a10456e
api: able to create repo and fix #726
...
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
2f3a7e53cb
fix #735
2014-12-12 01:29:36 -05:00
9a1fe801e5
fix #711
2014-12-09 02:18:25 -05:00
39c068400e
Fix spelling errors in comments.
2014-12-06 20:22:48 -05:00
0b785ad967
work on #672
2014-12-05 18:08:09 -05:00
e577f2fff3
fix #706 and other mirror improve
2014-12-04 23:07:51 -05:00
00cf3e4dab
Use the avatar.HashEmail function instead of hashing email directly. Fixes #700
2014-12-03 16:19:35 -07:00
5338808600
fix #676
2014-11-30 18:29:16 -05:00
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
1b66600bd0
Fix #652
2014-11-23 02:33:47 -05:00
dc53270da9
Fix 653
2014-11-22 10:22:53 -05:00
8ea7ba3afa
fix #644
2014-11-21 13:10:00 -05:00
ef275ebf62
more on change avatar
2014-11-21 12:51:36 -05:00
55dfe2c978
custom avatar upload
2014-11-21 10:58:08 -05:00
2d8c414f8c
Fix #635
2014-11-18 19:05:33 -05:00
ce8d4cc80b
#634
2014-11-18 15:13:08 -05:00
1e47e2df85
quick fix
2014-11-17 16:29:23 -05:00
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
32dcaefafa
fox #620
2014-11-17 14:53:41 -05:00
340a4595dd
support duoshuo mirror of gravatar
2014-11-16 20:27:04 -05:00
52d66ba6c8
#12 , use go-gogs-client
2014-11-14 17:11:30 -05:00
9dc3c93a6a
#12 , add/edit hook
2014-11-13 12:57:00 -05:00
9e22840483
fix #622
2014-11-13 05:27:01 -05:00
8eb5120fbd
#12 , API: list user repos, list repo hooks
2014-11-13 02:32:18 -05:00
8c9338a537
add personal access token panel #12
2014-11-12 06:48:50 -05:00
4e7eb5be9d
Work on #5 fork and fix #608
2014-11-05 23:30:04 -05:00
0c5ba4573a
fix session API broken and SQL pretection
2014-11-04 11:37:15 -05:00
bff1e157d5
force the use of InnoDB as db engine for all tables, fixes #59
2014-10-28 16:40:09 +01:00
e84e0ab904
Fix #266
2014-10-28 10:36:47 +08:00
83283bca4c
Safe work
2014-10-25 07:50:19 -04:00
f1d8746264
Fix fork repo and macaron API broken
2014-10-24 18:43:17 -04:00
3794111460
update slack hook to use new format
2014-10-24 08:56:12 -04:00
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
e0f945959e
Replace white spaces with tab for format consistency
2014-10-14 17:31:35 +08:00
91127d9016
Fixes #562
2014-10-14 16:46:25 +08:00
8d2a6fc484
Merge remote-tracking branch 'upstream/dev'
...
Conflicts:
models/repo.go
2014-10-13 20:30:31 +01:00
29ac3980ff
More changes
2014-10-13 20:23:30 +01:00
c04aea8d9d
Fix #540
2014-10-12 02:39:00 -04:00
0d7b9065c6
Fix #540
2014-10-12 02:06:46 -04:00
452ccff81c
Mirror fix on add ssh key
2014-10-11 21:04:42 -04:00
fb839ca0fb
More debug info
2014-10-11 20:34:48 -04:00
b7b7863364
Work on ssh key issue
2014-10-11 20:06:35 -04:00
963354c5d7
Add raw, history file button, and other mirror fixes
2014-10-11 18:02:48 -04:00
e848b17fab
bug fixed for #540
2014-10-11 13:24:36 +08:00
b2632dec09
Page: Compare 2 commits
2014-10-10 21:40:51 -04:00
211dc74816
Got the fork count working
2014-10-10 00:21:36 +01:00
79262173a6
Webhook delivery locking & Hide repo for org members if they don't have access
2014-10-09 19:01:22 -04:00
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
263d409326
Basic xss prevention
2014-10-04 17:15:22 -04:00
c9e5e38fcf
Initial cut of git fork
2014-10-04 18:19:14 +01:00
405ee14711
Fix SMTP auth logic
2014-10-03 13:12:54 -04:00
86eac0842b
Fix feeds display issue
2014-09-29 18:58:04 -04:00
3cfa4a581c
Bug: 500 when transfer repository to collaborator
2014-09-29 04:04:48 -04:00
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
b7b0ee7df9
Fix minor typo
2014-09-28 22:01:05 +01:00
bb05ef907b
Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached
2014-09-28 14:27:13 +02:00
204952439a
Fix user HomeLink when using a suburl
2014-09-28 13:55:58 +02:00
b8368f98ff
Add directory level commit message
2014-09-26 08:55:13 -04:00
10673417dc
Mirror fix on transfer repo
2014-09-25 22:42:31 -04:00
ad52b2d791
Mirror fix on transfer repo
2014-09-25 22:36:07 -04:00
71e4689d11
Page: User profile
2014-09-25 19:33:39 -04:00
f69761563b
Fix bug on transfer repo
2014-09-25 16:36:19 -04:00
089d934547
add action repousername for transfer
2014-09-25 16:43:14 +08:00
bd55b78775
Page: Commits and fix #249
2014-09-23 23:18:14 -04:00
5bbeeb0f1b
Page: Commits and fix #249
2014-09-23 15:30:04 -04:00
25c8d01676
increase max commits in payload to 5
2014-09-22 08:25:39 -04:00
7ba9257a7f
Add suburl support
2014-09-19 20:11:34 -04:00
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
8a09256941
Mirror fix and fix #481
2014-09-17 14:22:51 -04:00
f94d7c3f51
clarify name/username/owner/pusher for webhook
2014-09-17 09:20:14 -04:00
061a879cea
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
conf/app.ini
2014-09-17 12:04:18 +08:00
ed84adb679
toutf8 improved & add max git diff lines
2014-09-17 12:03:03 +08:00
ebb4f1b78c
Work #475 and #458
2014-09-16 13:34:09 -04:00
62f21ff3ed
Work on #476
2014-09-16 11:29:53 -04:00
0d9c41be7d
Work on #476
2014-09-16 10:10:33 -04:00
c1ceec45da
Fix mirror UI style and work on #475
2014-09-16 08:32:13 -04:00
a2cac952a4
Prepare 0.5 release
2014-09-12 21:36:26 -04:00
bba401a5dc
Prepare 0.5 release
2014-09-12 19:42:11 -04:00
1b7adf57e9
fix https://github.com/go-xorm/xorm/issues/161
2014-09-12 18:58:24 -04:00
cfed11f092
Bug: Transfer repository doesn't update the count
2014-09-12 18:29:58 -04:00
52d15ddec8
deliver hooks immediately after commit
2014-09-10 08:57:11 -04:00
33659ed9a5
Fix #452
2014-09-09 10:17:35 -04:00
132590fab8
update specific hook_task, not all
2014-09-09 08:37:34 -04:00
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
ab7206d6b7
Fix #348
2014-09-05 17:28:09 -04:00
85c35a6b8b
add organization-level webhooks
2014-09-05 07:19:34 -04:00
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
bdfdf3cacb
Code dedoublication in models/models.go
...
Just some code dedoublication in models/models.go
2014-09-04 17:19:26 +02:00
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
830efc90da
update docs and mirror bug fix
2014-09-02 07:11:39 -04:00
c80f0232f1
Merge branch 'master' into dev
2014-09-02 11:59:39 +08:00
1240fef0ca
bug fixed for migrate and fixed #141
2014-09-02 11:57:06 +08:00
af0741da07
handle initial commit for compareUrl
2014-09-01 19:19:56 -04:00
00a864e693
add commit compare functionality
2014-09-01 14:56:19 -04:00
2bce24068d
add Slack API webhook support
2014-08-31 12:01:59 -04:00
7e36bf448d
Merge branch 'master' of github.com:gogits/gogs into dev
...
Conflicts:
dockerfiles/README.md
2014-08-31 15:11:55 +08:00
d2aff9a46a
Continue working on new admin pages
2014-08-29 20:50:43 +08:00
a6ec6def8d
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-29 11:25:03 +08:00
c40e815763
add migrate api
2014-08-29 11:24:37 +08:00
1aec1a2dda
Finish new admin dashboard
2014-08-28 22:29:00 +08:00
9baf2b38d0
Bug fix on organization
2014-08-27 16:39:36 +08:00
50de06056b
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-26 18:11:27 +08:00
74b31566cf
Finsih add/remove repo in organization
2014-08-26 18:11:15 +08:00
95a594d75a
Migrate all branches and tags
2014-08-25 20:28:14 +07:00
Peter Smit
无闻
Unknwon
Etienne Bruines
Christopher Brickley
fzerorubigd
euank
estetsenko
Joseph Crail
Andrew Burns
luto
Eryx
Tony Tsang
evolvedlight
lunnyxiao
fundon
Martin van Beurden
Vyacheslav Bakhmutov
Tristan Storch