Commit Graph

1104 Commits

Author SHA1 Message Date
Unknwon ff35a37769 #1458: Authorities were messed up when using mysql database 2015-08-28 13:51:15 +08:00
Unknwon 23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon b900863d60 rename a user method 2015-08-27 13:26:38 +08:00
Unknwon 4217c2333c new create webhook UI 2015-08-27 00:30:06 +08:00
Unknwon 2881456421 new webhooks list UI 2015-08-26 21:45:51 +08:00
Unknwon b3a45693c3 minor update 2015-08-26 12:26:01 +08:00
Unknwon a329bbc215 new org dashboard issues 2015-08-25 23:22:05 +08:00
Unknwon f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon 260301bf2e #1535 Removing deploy key does not remove key 2015-08-25 03:30:39 +08:00
Unknwon 87152f89ba fix release created timezone issue 2015-08-24 21:01:23 +08:00
Yixin Hao 5f25553b0d Modify minimumKeySize of RSA to 1024 for old keys. 2015-08-21 15:29:43 +08:00
Unknwon aa65761d81 new commits table 2015-08-20 20:18:49 +08:00
Unknwon 062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
Unknwon 9b42f53aa8 more on #966 2015-08-20 16:08:26 +08:00
Unknwon 371572cf5f allow edit issue and comment 2015-08-20 04:31:28 +08:00
Unknwon f114f78743 fix timezone! 2015-08-20 00:56:12 +08:00
Unknwon 6c2536b89c fix timezone 2015-08-20 00:32:18 +08:00
Unknwon a5b09b30d0 print time to debug 2015-08-20 00:25:32 +08:00
Unknwon b846f195c1 work #1500 2015-08-20 00:12:43 +08:00
Unknwon 1453e91f41 minor fix on API response 2015-08-19 20:08:57 +08:00
Girish Ramakrishnan 24d7a86a8d Set IsAdmin using LDAP
The IsAdmin flag is set based on whether the admin filter
returned any result. The admin filter is applied with the user dn
as the search root.

In the future, we should update IsAdmin as well on each login.
Alternately, we can have a periodic sync operation.
2015-08-18 23:49:12 -07:00
Unknwon 03b85b73af token recent activity 2015-08-19 06:22:33 +08:00
Unknwon 47ac579f09 only assign auto-admin when sign up by web 2015-08-19 04:58:45 +08:00
Unknwon 4c7b6414eb new access token UI 2015-08-19 03:36:16 +08:00
Unknwon 6235bd1fe9 work on #986 and fix a LDAP crash 2015-08-18 04:03:11 +08:00
Unknwon b1696665bd make cron task configurable 2015-08-18 02:19:29 +08:00
Unknwon 407385db7e work on #1493 2015-08-17 17:05:37 +08:00
Unknwon 55ccb00a47 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop
# Conflicts:
#	modules/bindata/bindata.go
2015-08-16 14:31:54 +08:00
无闻 ce8864c69a Merge pull request #1475 from donbowman/master
Fix race condition on ssh key delete, and revert re-revert of hard line break
2015-08-15 17:27:20 +08:00
Don Bowman 1d52793faf remove empty line as per https://github.com/gogits/gogs/pull/1475 2015-08-15 09:21:34 +00:00
Unknwon a52324a5f9 able sort issues 2015-08-15 12:07:08 +08:00
Unknwon a24141ec9c more on #1319 2015-08-15 02:54:39 +08:00
Unknwon 30b428bf0e #1419: 500 when visit a issue with issue/comments of deleted user 2015-08-15 02:48:05 +08:00
Unknwon e4d6b5d488 Creates hooks directory when init update hook 2015-08-15 01:13:23 +08:00
Unknwon cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
Unknwon 2cc9bc8969 delete attachments when delete repo 2015-08-14 03:07:20 +08:00
Unknwon 817b48ed1e Show owner/poster tags of comments and fix #1312 2015-08-14 02:43:40 +08:00
Unknwon 1fb53067f4 finish close/reopen issue 2015-08-13 23:21:43 +08:00
Unknwon 133b19d0c5 finish view comments on issue page 2015-08-13 16:07:11 +08:00
Sergio Benitez 7d84d4a8f0 Significantly enhanced LDAP support in Gogs. 2015-08-12 17:01:22 -07:00
Don Bowman ab0247b4dc race condition on keydelete 2015-08-12 22:00:43 +00:00
Unknwon ab2d0b3b44 add comment form UI 2015-08-12 18:44:09 +08:00
Unknwon b4c0b7b98b finish view issue without comments and ops 2015-08-12 17:04:23 +08:00
Unknwon cafde1287e delete avatar when del user 2015-08-12 03:46:08 +08:00
Unknwon 34f6cbfc2a finish attachments when create issue 2015-08-11 23:24:40 +08:00
Unknwon 1ce4543a94 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2 2015-08-10 23:56:17 +08:00
Unknwon 64985c7faa fix template error 2015-08-10 23:56:04 +08:00
无闻 9c0c16bb5a Merge pull request #1464 from jamesa/hide-gravatar-tooltip
Hide avatar tooltips unless you're looking at your own profile
2015-08-10 23:55:43 +08:00
James Anderson e5146155a0 Resize avatars to the same size they are displayed 2015-08-10 10:43:14 -05:00
Unknwon cbc7b7132f finish new issue action and mentions 2015-08-10 23:31:59 +08:00
Unknwon 887bc1b594 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
2015-08-10 23:01:41 +08:00
Unknwon 2aea247208 minor fix on #1460 2015-08-10 22:59:12 +08:00
Unknwon 884bc4ffd8 rename functions 2015-08-10 22:45:49 +08:00
Unknwon 75aff60c90 finish create issue with milestone and assignee 2015-08-10 21:47:23 +08:00
Unknwon 09a1b2a1f5 finish create issue with milestone 2015-08-10 18:57:57 +08:00
Unknwon 922f3f3062 finish create issue with labels 2015-08-10 16:52:08 +08:00
Unknwon 17de3ab0a3 add migrate from issue.label_ids to issue_label 2015-08-10 14:42:50 +08:00
Unknwon a79586cc54 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
#	templates/repo/header.tmpl
2015-08-10 00:37:42 +08:00
Unknwon 7372042441 list view: issue, label, milestone 2015-08-09 22:45:38 +08:00
Unknwon 590c464c56 UI: create issue with title and content 2015-08-09 15:23:02 +08:00
Unknwon 68b9d78386 remove sync.Pool and support go1.2 again 2015-08-09 12:06:08 +08:00
Unknwon 4b43ffc96c Generate random avatar based on e-mail when disable Gravatar 2015-08-09 11:46:10 +08:00
Unknwon dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon e3bdfd51ff better fork permission check 2015-08-08 17:24:10 +08:00
Unknwon 9db4acc62e improve fork process 2015-08-08 17:10:34 +08:00
Unknwon 45adb9b7a3 fix #1331 2015-08-08 00:41:09 +08:00
Unknwon b1f08d3218 more on #1443 2015-08-07 00:09:28 +08:00
Unknwon d922b7e504 #1443 set first user to be admin
...not just ID=1
2015-08-07 00:00:11 +08:00
Unknwon 02877f1a69 remove useless code 2015-08-06 23:27:54 +08:00
Unknwon 9d414d4dd9 remove Index field of milestone 2015-08-06 23:25:35 +08:00
Unknwon 0acf209e2a fix UNIQUE 2015-08-06 22:55:03 +08:00
Unknwon 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon 34795770c3 fix issue stats with milestone filter 2015-08-05 20:52:17 +08:00
Unknwon 81d01aa308 fix mysql parsetime arg 2015-08-05 20:47:35 +08:00
Unknwon 2c507667bf Merge branch 'develop' of github.com:gogits/gogs into feature/milestone
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
2015-08-05 20:26:00 +08:00
Unknwon 0705f55ce0 finish new milestone page 2015-08-05 20:23:08 +08:00
Unknwon 74bd6b939c milestone: edit 2015-08-05 18:26:18 +08:00
Unknwon b9527cd1bf #1299 force downcase e-mail 2015-08-05 17:36:22 +08:00
Unknwon 3e4cdccf6b milestone: create page 2015-08-05 15:24:26 +08:00
Unknwon ce4dcf1e83 fix naming 2015-08-05 11:18:24 +08:00
Unknwon e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Unknwon 9311a9858a milestone: pagination 2015-08-04 22:24:04 +08:00
Unknwon 04458d49a0 milestone: list view 2015-08-03 17:42:09 +08:00
Unknwon cbb78b6a63 better wording 2015-08-02 12:37:29 +08:00
Unknwon c44e1c7ca9 fix #1208 2015-07-31 14:05:36 +08:00
Unknwon 42a2c5ca54 #1400 use new connstr format for postgres 2015-07-31 11:05:06 +08:00
Vladimir Vissoultchev 4917d29c12 Partial impl of git diff encoding 2015-07-29 17:55:01 +03:00
Vladimir Vissoultchev fac4e27882 Allow spaces in file/dir names on parsing git diff 2015-07-28 19:48:36 +03:00
Unknwon f83519b452 report error when migration auth failed 2015-07-28 21:24:24 +08:00
Unknwon 686dd59916 fix #864 with migration and update locale 2015-07-26 22:06:28 +08:00
Unknwon 6f8e388b55 fix #1169
- prevent create reop on existed path
2015-07-26 19:22:17 +08:00
Unknwon fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +08:00
Unknwon 2b1442f3df fix sql 2015-07-25 13:18:19 +08:00
Unknwon 2e7b38db9f fix paging links and issue count 2015-07-25 13:07:00 +08:00
Unknwon c0883a51a0 mirror fix on #1111 2015-07-25 07:47:43 +08:00
无闻 b838e94980 Merge pull request #1111 from vitalvas/develop
Add function in cron to autofix counters in repository
2015-07-25 07:22:50 +08:00
Unknwon 1ba837a055 new issue and label page 2015-07-25 02:52:25 +08:00
Unknwon 54b58e988d Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues 2015-07-25 00:49:40 +08:00
Unknwon dc4aab9925 UI: CURD labels
- fix update lable break connection with repository
2015-07-24 23:13:42 +08:00
Unknwon ac95f6d50f UI: basic label list
- create new label
2015-07-24 21:02:49 +08:00
Unknwon 04e596f984 #1369: nil pointer when add repo to team 2015-07-24 16:52:01 +08:00
Unknwon 86dbda0b42 UI: basci issue list without filters
- fix isRead check
- fix paging
2015-07-24 16:42:47 +08:00
Unknwon d6cdd49c16 fixes on #1171 2015-07-19 17:44:03 +08:00
Unknwon 663c28beb6 #1279: Removing user from collaboration removes repositiory 2015-07-14 22:56:02 +08:00
Unknwon c6531c4882 check master as default branch when migrate 2015-07-05 18:34:16 +08:00
Lunny Xiao f92bdf875b Merge pull request #1226 from nice-software/wip/pam
Add PAM authentication
2015-04-24 16:43:58 +08:00
Paolo Borelli 182003aa41 Add PAM authentication 2015-04-24 10:13:01 +02:00
Lunny Xiao 673a76d638 Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword
Hotfix/type fix validate password
2015-04-24 15:03:21 +08:00
William Roush 8363c9dd0f Fixes issue with LDAP inserting users with blank names. 2015-04-20 01:51:43 -04:00
Tony Narlock 6a0fec77ea Allow an SSHDomain configuration option. Defaults to Domain, preserves legacy behavior 2015-04-18 05:21:07 -05:00
Dustin Willis Webber e57594dc31 typo fix for comment 2015-04-16 14:40:39 -04:00
Dustin Willis Webber f78046fc3b typo fix 2015-04-16 14:36:32 -04:00
Unknwon 9fb2d49b93 #1073 #1162 issue ID constraint failed 2015-03-27 06:47:02 -04:00
Unknwon 698b9e2acc #1070 Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
Unknwon 99b774e741 auto fix locale file name change 2015-03-25 19:51:22 -04:00
Unknwon ab730a91f0 #1120 #1132 mirror info not updated when transfer mirro repo 2015-03-25 17:50:18 -04:00
Unknwon aae74c793a #1133 add config option [service] DISABLE_MINIMUM_KEY_SIZE_CHECK 2015-03-25 08:59:48 -04:00
Unknwon 9c67a19332 #1089 change to fake local email account 2015-03-24 18:41:41 -04:00
Unknwon 6f81c05dde #1143 Team member access lost when adding repository collaborator
- fix bug when add a repo to team, all other team members gets access as well
2015-03-24 18:14:04 -04:00
Unknwon 484175f702 #1124 lower_name of LDAP user not assigned 2015-03-23 10:51:43 -04:00
Unknwon 2bb982dada #1080: Remove footer ads/branding from default template 2015-03-23 10:19:19 -04:00
Vitaliy Vasilenko 20a8d651f3 add func to autofix couters in repository 2015-03-21 14:55:00 +02:00
Unknwon 7cf0564587 update gopmfile 2015-03-19 16:44:22 -04:00
Unknwon e6cf83b8c0 Put default config into binary 2015-03-18 06:37:44 -04:00
Unknwon 82f7a01ded #1064: X-Gogs-Event header is empty 2015-03-18 04:51:02 -04:00
Unknwon 466facc009 #1067: Deleting users should remove them from collaborator lists
- fix delete user but repository watches are not decreased
2015-03-17 21:51:39 -04:00
Unknwon fc6db829b2 fix read access team visibility of private repo 2015-03-16 04:52:11 -04:00
Unknwon 588f3215c6 #1040: dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
Unknwon 80b23854bc #1050: Bad permissions on authorized_keys after rewrite 2015-03-14 22:37:23 -04:00
Tomcat 2bfe2ddb6d Add mysql unix socket support.
If the host setting looks like a unix socket (leading by char '/'), will use unix(host) as connection string
2015-03-14 02:21:47 +08:00
Unknwon b72e75e522 #1024: OFFLINE_MODE Still Uses Gravatar 2015-03-12 20:32:38 -04:00
Unknwon b668fc7aad #876: Update hooks is missing for forked repository 2015-03-12 20:18:42 -04:00
Unknwon 0720d3988f #988: GetRepoLink already contains AppSubUrl 2015-03-12 16:01:23 -04:00
Unknwon 6b70a0c0d9 #1032: legacy code can have duplicated IDs for same repository 2015-03-12 15:09:40 -04: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 18c0697329 routers/repo/setting.go: fix LDAP cannot validate password #1006 2015-03-05 19:20:27 -05:00
Unknwon 63a73b43b4 models/migrations: fix update error 2015-02-28 23:58:04 -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
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
无闻 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
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 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
Unknwon 3fcc39c26b Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-21 22:13:50 -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
Raphael Randschau 4f567edc6e Fix #933
Not sure why, but xorm ignores the num_issues and num_closed_issues
columns when updating, even though the values changed.

Listing them explicitly fixes the issue with the wrong issue counts
2015-02-21 09:37:48 +01: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 aa68e86206 Rewrite/simplify gogs serve 2015-02-16 16:38:01 +02:00
Peter Smit b6519f78c7 Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +02:00
Unknwon 685ed1f807 models: fix XORM API break
cmd/web.go: check version after load config
2015-02-14 17:01:33 -05:00
Peter Smit 0009a1d2b1 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Peter Smit ddf7014b9b Rewrite of access migration
The old migration had a few issues:
 - It left old column names around
 - It did not give the right access levels for owners and admins

Also, this includes a migration that fixes the authorization of owner teams, which was previously ORG_ADMIN (instead of ORG_OWNER)
2015-02-13 13:58:19 +02:00
Unknwon 25f5a8d798 some fixes, but not done yet! 2015-02-13 02:56:42 -05: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
Unknwon b99c4baab2 models/migrations: finish accessRefactor 2015-02-12 22:43:32 -05:00
无闻 7fda0cdb93 Merge pull request #941 from phsmit/access_refactor
Access refactor
2015-02-12 21:34:27 -05:00
Unknwon 0b3722c359 models/migrations: fix little logic error 2015-02-12 12:46:21 -05:00
Unknwon 67a9416ae5 templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled #884 2015-02-12 12:38:44 -05: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
Peter Smit 2804784df9 Some comments and improvements for migrations 2015-02-12 13:59:42 +02:00
Unknwon 876a856759 models/migartions: make Migration as interface and use session 2015-02-11 23:10:30 -05:00
Unknwon 7e7160eefd first pass work on migration #925 2015-02-11 21:58:37 -05:00
Unknwon c5c467a9cd Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
Unknwon c7a042ef36 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-11 12:43:43 -05:00
无闻 e805fdb29c Merge pull request #925 from phsmit/newcollaboration
Collaboration
2015-02-11 12:43:13 -05:00
Unknwon d02e45f985 better naming on #891 2015-02-11 12:04:01 -05:00
Unknwon 485ea6f14f models: make code change for session issue with SQLite3 #739 2015-02-10 23:44:16 -05:00
Unknwon 6a23252edc able to allow insecure certification of webhook for #891 2015-02-10 21:06:59 -05:00
Unknwon bad533a219 models/repo.go: add update hook when migrate for #789 2015-02-09 12:42:53 -05:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit aa35be975f Fix #922 2015-02-09 12:27:15 +02:00
无闻 6ed96b7a20 Merge pull request #911 from TonyTsangHK/dev
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
Unknwon f15fa9167a cmd: code fix for #905
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
2015-02-08 21:26:14 -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
Lauris BH 00653e52ee Get username, name, surname and e-mail from LDAP server 2015-02-08 01:49:51 +02:00
Unknwon ba77a3b0b4 routers/repo/http.go: allow HTTP push/pull by token for #845 2015-02-07 15:47:23 -05:00
无闻 19525abfc4 Merge pull request #845 from compressed/token_http
allow http push by token - #842
2015-02-07 15:27:59 -05:00
Unknwon 2a2596fe61 able to disable SSH for #883 2015-02-07 10:46:57 -05:00
Unknwon 5a99e9a37b models/action.go: add action reopen for #462
- models/issue.go: format comment type names
2015-02-06 20:47:21 -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
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
Tony Tsang fc6d80d619 Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files. 2015-02-06 17:02:32 +08:00
Peter Smit 1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Peter Smit 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
Unknwon f706102890 models: sanitize user full name when update settings 2015-02-04 20:04:01 -05:00
Peter Smit fd1df86c44 Fix dashboard issue after collaboration migration 2015-02-04 16:08:55 +02:00
Peter Smit bef38d9d3f Fix collaboration migration code 2015-02-04 16:03:39 +02:00
Unknwon 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
Etienne Bruines 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
Unknwon 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
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 ee6786216a modules/base: clean code with #838 2015-01-30 18:12:30 -05:00
Peter Smit 76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
Peter Smit 4ef3245413 Migration code: errors are not to be forgotten 2015-01-22 15:01:45 +02:00
Peter Smit 2a70d6b723 Clean up migrations code 2015-01-22 14:56:50 +02:00
Peter Smit 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
Unknwon 452cca35e0 Merge branch 'encoding' of github.com:gogits/gogs into dev
Conflicts:
	.gopmfile
2015-01-17 15:29:45 +08:00
Christopher Brickley d0827e5d5e allow http push by token - #842 2015-01-08 09:30:22 -05:00
Unknwon bb26285a12 fix #827 2015-01-06 17:14:49 +08:00
Peter Smit 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
Unknwon c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Peter Smit 44fa9147b7 Fix #819 by fetching the repository from db before updating 2015-01-02 11:15:42 +02:00
Unknwon 0b56272c13 fix #805 2015-01-02 13:30:45 +08:00
Unknwon 3ea1443885 work on #784 2015-01-02 12:47:33 +08:00
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