finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4790 commits 2 branches 0 tags 283 MiB
Commit graph

1410 commits

Author SHA1 Message Date
Andrey Nering
ee5d6fb025 Compute inline diff for pull request view, too. Fix #2462 2016-01-25 20:56:27 -02:00
Kim "BKC" Carlbäcker
a3eab8185d Admins are allowed to create repos for arbitrary Orgs 2016-01-20 14:46:45 +01:00
Unknwon
f75b5f4287 Merge pull request #2383 from exmex/develop 
Added organization display on profile
 2016-01-14 21:07:17 +08:00
Unknwon
a72f57374d Merge pull request #2403 from ddelpero/master 
Update repo.go
 2016-01-14 14:55:45 +08:00
ExMex
f610bfa8a2 Added organization display on profile 
Fixed "Follower" Icon too big
 2016-01-12 03:09:59 +01:00
Unknwon
bcf6aed452 Merge pull request #2335 from andreynering/highlight-diff 
Highlight diff
 2016-01-09 13:39:18 +08:00
Unknwon
4331d1d2a0 require token for list my orgs 2016-01-09 13:32:19 +08:00
Unknwon
62edc5c59a fix cannot show user public ssh keys 2016-01-09 13:28:05 +08:00
Unknwon
03427fb005 fix #2360 2016-01-08 08:49:03 +08:00
ddelpero
7655337a1f Update repo.go 
Release download file name doesn't include tag number #2339
Download: Changed to use refName instead of commit.ID for downloaded file name
 2016-01-07 14:28:38 -06:00
Unknwon
e0f0f72a36 #2345 disallow access of some pages for empty repo 2016-01-07 11:07:17 +08:00
Andrey Nering
73474c043b Highlighting differences of lines in the diff view. 2016-01-06 17:46:56 -02:00
zhuharev
0d5dc8a064 typo fix 2016-01-06 22:41:42 +03:00
Kim "BKC" Carlbäcker
8fe5d887ae Changed name from inline to unified 2016-01-05 19:21:50 +01:00
Kim "BKC" Carlbäcker
0df39b33eb Implement Split Diff-View 
- Unified/Inline Diff-View Selectable
 2016-01-05 19:21:41 +01:00
Unknwon
a62290de52 #2311 improve HTTP auth error message 2015-12-30 21:29:30 -05:00
Unknwon
8d58e06ad8 more fix on #2268 2015-12-30 18:47:32 -05:00
Unknwon
93f03707a7 #2283 set text/plain for non-binary files in raw mode 2015-12-25 05:45:07 -05:00
Unknwon
85af36332b #2282 fix utf-8 recognized as windows-1252 2015-12-25 05:25:47 -05:00
novaeye
227dcc3cb9 fix #2268 2015-12-23 17:50:14 +08:00
Unknwon
a49af93faf #1692 APIs: Users Followers 
- User profile un/follow
- List user's followers/following
 2015-12-21 04:24:11 -08:00
Unknwon
c62a6b7a12 #2014 allow switch branches between two orgs in compose PR 2015-12-20 01:06:54 -05:00
Unknwon
5ff6eedf5e #2251 fix button name 2015-12-19 22:07:06 -05:00
Unknwon
037a01c4e4 fix #2189 2015-12-18 05:49:28 -05:00
Unknwon
1c9dd11ba7 #1692 API: admin create repo 2015-12-17 22:57:41 -05:00
Unknwon
1e7e092992 #2103 Ability to map extensions for syntax highlighting in config 2015-12-17 22:31:34 -05:00
Unknwon
33a99d587a fix #2223 2015-12-17 21:57:34 -05:00
Unknwon
9cd16c5b12 #1692 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon
6673dcb038 #2103 #2181 improvments of highlight class name 2015-12-16 22:13:12 -05:00
Unknwon
b117befc2b #1692 add user email APIs 2015-12-15 22:57:18 -05:00
Unknwon
19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon
3362b3a44f fix possible disclosure 2015-12-14 17:06:54 -05:00
Unknwon
7509fa2c33 improve get commits performance 2015-12-13 22:58:12 -05:00
Unknwon
79dcd7ee6e #2167 able to identify git version on Windows 2015-12-13 18:20:39 -05:00
Unknwon
0cce4439ce #2154 minor fix 2015-12-11 21:23:19 -05:00
Unknwon
59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon
477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon
d0b0d24f22 #2154 disable change user for non-local users 
- #2153 remove require for gravatar
 2015-12-11 15:31:02 -05:00
Unknwon
40f3142264 #2114 External URL for wiki 2015-12-11 04:55:08 -05:00
Unknwon
3d5d61778a #1938 #1374 disable password change for non-local users 2015-12-10 19:02:57 -05:00
Unknwon
2a0bb1fa90 #1575 Limit repo creation 2015-12-10 12:37:53 -05:00
Unknwon
c6083c335e #1612 Ability to send mail when a new pull request is submitted 2015-12-10 11:18:56 -05:00
Unknwon
9a2e43bff2 move out git module and #1573 send push hook 2015-12-09 20:46:05 -05:00
Unknwon
b8d48bdb62 #2037 Add "New Mirror" button on Dashboard 2015-12-09 11:24:56 -05:00
Unknwon
a576224d0e unified name: IsViewBranch, IsViewCommit and IsViewTag 2015-12-09 00:32:53 -05:00
Unknwon
120cd4e471 #1984 Better mirror repo management 2015-12-08 20:06:12 -05:00
Unknwon
2528c482e9 #1627 auto login after install if admin is configured 2015-12-08 00:59:14 -05:00
Unknwon
dce2a9e7e1 fix wrong slack webhook payload URL 2015-12-06 23:07:02 -05:00
Unknwon
89244b74c6 remember page number when delete repo 2015-12-05 17:49:46 -05:00
Unknwon
ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
Unknwon
978dc00305 APIs: admin users 2015-12-05 17:13:13 -05:00
Unknwon
404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon
f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon
e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon
942fd6be53 fix panic for #2045 2015-12-04 17:20:23 -05:00
Unknwon
56dd430a10 refactor API routes and some work for #976 2015-12-04 17:16:42 -05:00
Unknwon
4d9499c2d3 fix broken link 2015-12-03 18:10:45 -05:00
Unknwon
cc8f5add6e fix #976 2015-12-03 00:24:37 -05:00
Unknwon
ec2423ad7c more UI minor fixes 2015-12-02 20:56:26 -05:00
Unknwon
0be8b1b1a1 #2052 Ability to batch delete system notices 2015-12-01 23:33:08 -05:00
Adam Strzelecki
573305f3d3 LDAP: Optional user name attribute specification 
Consider following LDAP search query example:

    (&(objectClass=Person)(|(uid=%s)(mail=%s)))

Right now on first login attempt Gogs will use the text supplied on login form
as the newly created user name. In example query above the text matches against
both e-mail or user name. So if user puts the e-mail then the new Gogs user
name will be e-mail which may be undesired.

Using optional user name attribute setting we can explicitly say we want Gogs
user name to be certain LDAP attribute eg. `uid`, so even user will use e-mail
to login 1st time, the new account will receive correct user name.
 2015-12-02 00:20:14 +01:00
Unknwon
117afe7620 Merge pull request #2069 from nanoant/patch/admin-see-all-organizations 
Admin should be able to see all organizations
 2015-11-30 21:18:33 -05:00
Unknwon
830d000667 finish wiki 2015-11-30 20:45:55 -05:00
Adam Strzelecki
e57b2dffa4 Admin should be able to see all organizations 
This is follow-up for 56c66ee486 allowing admin
to see private repositories, even when not being member of them.
 2015-11-30 21:46:01 +01:00
Unknwon
5d1f5f32d0 wiki: finish pages 2015-11-27 02:16:12 -05:00
Unknwon
e42fcb033d wiki: finish edit 2015-11-27 01:50:38 -05:00
Unknwon
392f3ee210 wiki: finish new 2015-11-27 00:24:24 -05:00
Unknwon
c50a3503e6 introduce git-shell 2015-11-26 17:33:45 -05:00
Unknwon
2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon
144663a3cf allow admin to migrate for any user/org 2015-11-25 00:55:37 -05:00
Unknwon
968edb3e44 more link fix 2015-11-24 19:28:24 -05:00
Unknwon
3ca544912f #1944 Drop /org/ URL path prefix in organization home page 2015-11-24 19:14:00 -05:00
Unknwon
7f9598141b fix #2020 2015-11-24 18:49:34 -05:00
Unknwon
0128036514 #1681 some fixes for builtin SSH server on Windows 2015-11-23 22:32:07 -05:00
Unknwon
b2fb7e3fd2 more HTTP clone word fix 2015-11-22 13:01:42 -05:00
Unknwon
52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon
b80e848d02 upgrade libs 2015-11-21 21:09:18 -05:00
Unknwon
987dcc5372 fix #1383 2015-11-20 02:38:41 -05:00
Unknwon
3d14e73fd8 fix #1119 and data race in timming tasks 2015-11-20 00:47:35 -05:00
Unknwon
6a66e5fc98 better error message 2015-11-19 13:45:07 -05:00
Unknwon
c0b0ce7b1a #1971 more general rule to detect error 2015-11-19 13:04:07 -05:00
Unknwon
dc0c0dc06b fix typo for #1996 2015-11-19 11:52:39 -05:00
Unknwon
9330c943cd work on #1891 2015-11-18 23:52:09 -05:00
Unknwon
f455125d4d fix #878 2015-11-18 21:21:47 -05:00
Unknwon
2c653141a8 #1742 Update default branch in git repository while change in web view 2015-11-18 19:32:23 -05:00
Unknwon
efea642d6c add admin op: delete missing repos 2015-11-18 15:37:48 -05:00
Unknwon
81d7359fdd fix #1981 2015-11-18 15:11:37 -05:00
Unknwon
9a0902523b fix #1987 2015-11-18 15:01:11 -05:00
Unknwon
ff5f14431e fix #1448 2015-11-17 02:18:05 -05:00
Unknwon
ab9411be2a clean up code 2015-11-16 23:33:40 -05:00
Unknwon
9ab96172fc new watchers, stars and forks UI 2015-11-16 23:28:46 -05:00
Unknwon
917d334ebd only show user's activities in profile 2015-11-16 11:43:23 -05:00
Unknwon
d370effca5 minor fix for #1961 2015-11-16 11:20:11 -05:00
Unknwon
29ed7872f8 repo sidebar active class 2015-11-16 11:16:52 -05:00
Unknwon
134d8e7681 work on #1961 2015-11-16 10:14:12 -05:00
Unknwon
18de67380c fix #1958 2015-11-15 23:52:46 -05:00
Unknwon
84a43b38cf remove unused code 2015-11-14 13:22:24 -05:00
Unknwon
7c80eba77f minor UI fix and fix ssh race 2015-11-14 13:21:31 -05:00
Unknwon
7b1c10ea7e new repo ui 
- copy link button: #1396, #1168, #1668,
- synxtax highlight: #1712, #1549, #1315, #670
- z-index: #1942
 2015-11-14 04:34:01 -05:00
Unknwon
f8ae161c74 fix #1302 2015-11-13 17:37:02 -05:00
Unknwon
1d57f0d64f Show custom avatars in commits 2015-11-13 17:10:25 -05:00
Unknwon
1559bd58e7 save custom avatar as PNG 2015-11-13 16:43:43 -05:00
Unknwon
10427b2178 fix #1930 2015-11-12 12:32:40 -05:00
Unknwon
3b62a0fe0e fix #1572 fix file histrory paging issue 2015-11-10 16:46:17 -05:00
Unknwon
0d4498429c work on #1904 2015-11-09 02:13:25 -05:00
Unknwon
18c841050b fix 1540 and experimental SSH server support 2015-11-08 16:59:56 -05:00
Unknwon
b55499d039 go vet and fix #1890 2015-11-08 14:31:49 -05:00
Unknwon
e7aabf70dc #1905 Triming the issue title 2015-11-06 11:17:46 -05:00
Unknwon
603c7389b8 #1459 Dashboard issues lacks sorting 2015-11-04 12:50:02 -05:00
Unknwon
00eb2b221f fix #1876 2015-11-04 10:16:50 -05:00
Unknwon
3a81fdf092 rename fields 2015-11-03 22:49:06 -05:00
Unknwon
6f0a41b8b2 #1511 Allow local import only for admin users 2015-11-03 18:40:52 -05:00
Unknwon
fad31ca302 work on #1748 2015-10-31 18:59:07 -04:00
Unknwon
102b675f96 remove test code 😵 2015-10-29 21:19:51 -04:00
Unknwon
7d72c8333e work on #470 and fix miror JS issue when choose targets on compare and pull 2015-10-29 21:09:48 -04:00
Unknwon
706b0f72e2 fix issue comment mention and autofix count when start 2015-10-29 20:40:57 -04:00
Unknwon
022820103d #1657 allow forcing all private repos 2015-10-25 04:26:26 -04:00
Unknwon
c3ba5590c9 Reopen PR need retest patch 2015-10-25 03:10:22 -04:00
Unknwon
0fbb8c8826 New push to head repo of head branch: regenerate patch and retest apply 2015-10-24 03:36:47 -04:00
Unknwon
e0aab4a7f6 #1830 new comment with status change overwrites issue content 2015-10-23 12:54:19 -04:00
Unknwon
c6ce6bd4c2 work on #1830 2015-10-23 10:31:13 -04:00
Unknwon
35a65736fa add get repo API 2015-10-22 17:46:07 -04:00
Unknwon
fc7959d3bc New/reopen PR checks if there is any unmerged and open PR 2015-10-18 19:30:39 -04:00
Unknwon
4dc6285715 add new status: checking 2015-10-18 17:18:54 -04:00
Unknwon
932dbccb67 fix import path, fix #1782 2015-10-15 21:28:12 -04:00
Unknwon
aff49b1c9e unified API error response 2015-10-08 20:36:07 -04:00
无闻
b1941f1da1 Merge pull request #1736 from soudy/develop 
Added repository remove option to API
 2015-10-08 20:01:56 -04:00
Unknwon
215920772a save PR info as patch and minor fix on PR 2015-10-04 20:54:06 -04:00
Steven Oud
6fe868a4d5 added repository remove option to api 2015-10-04 23:29:23 +02:00
kendaru
5c39d3fa7d changed integrated page number to GET 2015-10-02 10:04:11 +02:00
Steven
c8aa9c6cb1 implemented #1721: see users who forked/starred/watched a repository 2015-10-01 15:51:46 +02:00
Unknwon
21e13cb51e #1525 Triggere mailer for admin created accounts 2015-09-25 19:45:44 -04:00
Unknwon
986447335d #1693 minor fix 2015-09-25 19:07:21 -04:00
无闻
84c727ae66 Merge pull request #1693 from sapk/fix-admin-repo-new-ui 
Fix admin repos new ui
 2015-09-25 19:05:27 -04:00
无闻
ee1256cf74 Merge pull request #1691 from sapk/fix-admin-organization-new-ui 
Fix admin organization new ui
 2015-09-25 19:03:53 -04:00
Antoine GIRARD
dfc16d0879 Fix admin repos new ui 2015-09-26 00:38:43 +02:00
Antoine GIRARD
a8fd615adc Fix indent in notice router 2015-09-25 19:56:23 +02:00
Antoine GIRARD
c98dad1cf3 New admin organization UI 2015-09-25 19:54:52 +02:00
Unknwon
0d5e57e4ae #1689 minor fixes and update locale 2015-09-25 12:58:39 -04:00
Antoine GIRARD
3544dafb64 Fix indent 2015-09-25 18:39:31 +02:00
Antoine GIRARD
14a1101139 New admin notice UI based on user list example 2015-09-25 18:13:38 +02:00
Unknwon
d9c5b3bcee #1659 fix change label title resets color 2015-09-18 06:18:31 -04:00
Unknwon
acf428863c fix #981 2015-09-17 17:21:27 -04:00
Unknwon
3fb1b6a608 drop oauth2 feature support 2015-09-17 16:11:44 -04:00
Unknwon
562e47f31c finish all new template for current ones 2015-09-17 15:45:36 -04:00
Unknwon
9d36fc6986 finish new auth e-mails 2015-09-17 14:57:24 -04:00
Unknwon
373731f5e8 user gomail and new activate account email tpl 
- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header
 2015-09-17 01:54:12 -04:00
Unknwon
e75fd2f783 simplify names 2015-09-16 23:08:46 -04:00
Unknwon
2729eb998c #1646 and other minor fixes 2015-09-16 15:34:46 -04:00
Unknwon
f5c7f22cc8 #1637 able to skip verify for LDAP 2015-09-14 15:48:51 -04:00
Unknwon
2d1bb0cf49 #1633 admin delete user 2015-09-13 13:26:20 -04:00
Unknwon
5f1183cecf #697 add install option 2015-09-13 12:14:32 -04:00
Unknwon
b0bf4cc1cb fix #1632 and #1606 2015-09-13 11:26:25 -04:00
Unknwon
83e747bfda #697 and #1606 and new admin edit user UI 2015-09-13 11:07:21 -04:00
Unknwon
e5ed5904c6 #1606 GUI bug while adding ldap user 2015-09-13 10:05:18 -04:00
Unknwon
8e0a69f86a #697 disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon
cd37fccdfb #1625 remove auto_register and makes it default 2015-09-12 20:58:51 -04:00
Unknwon
aff773f1b9 add tidb support 2015-09-12 15:31:36 -04:00
Unknwon
10de16beb0 typo and README 2015-09-12 09:21:09 -04:00
Unknwon
ed5a61153f fix #1629 2015-09-12 07:17:37 -04:00
Unknwon
47df562ced #1626 default db_type 2015-09-11 21:00:12 -04:00
Unknwon
be89802bd8 new admin user list UI 2015-09-11 20:42:26 -04:00
Unknwon
362d64df04 #1620 add allowed domains for SMTP auth 2015-09-11 13:32:33 -04:00
Unknwon
121a81a2c5 finish new edit auth UI 2015-09-11 12:03:08 -04:00
Unknwon
0617448282 finish new add auth UI 2015-09-10 17:11:41 -04:00
Unknwon
fa728d8dff more minor fix on 1581 2015-09-10 15:45:03 -04:00
Unknwon
cbd6276200 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop 
# Conflicts:
#	modules/bindata/bindata.go
 2015-09-10 14:55:29 -04:00
Unknwon
52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Sergio Benitez
964d0262ff Merged conflicts. 2015-09-09 13:44:51 -07:00
Unknwon
6f6f38e7c3 #1603 suburl for comment attachments 2015-09-08 09:09:40 -04:00
Unknwon
49e120a67c #1602 change status after comment issue 2015-09-08 06:34:02 -04:00
Unknwon
cc83043edc minor fix on template 2015-09-07 14:02:09 -04:00
Unknwon
3d9b98fae4 #1585 order owners list by last changed time 2015-09-07 13:58:23 -04:00
Unknwon
c38754d432 #1191 allow upload avatar for org 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 17:12:02 -04:00
Unknwon
85f34ba538 new user profile settings UI 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 16:31:22 -04:00
Unknwon
00767a0522 finish new org settings page 2015-09-06 11:25:08 -04:00
Unknwon
edc99bc8a4 new org options UI 2015-09-06 10:56:31 -04:00
Unknwon
80701d45bb #1193 Make organization emails non-mandatory 2015-09-06 10:08:14 -04:00
Unknwon
aa67de910a fix #1558 2015-09-06 08:54:08 -04:00
Unknwon
119dec51f2 Mirror repository should not allow fork 2015-09-05 14:31:52 -04:00
Sergio Benitez
aa9c36514f Merged conflicts. 2015-09-04 20:49:07 -07:00
Sergio Benitez
2d1db4bf05 Added LDAP simple auth support. 2015-09-04 20:48:34 -07:00
Unknwon
d023e81a8f #1577 explore paginator problem 2015-09-04 05:54:22 -04:00
Unknwon
7ec991326d fix migrate api 2015-09-03 06:48:52 -04:00
Unknwon
e5b105e513 fix migrate API 2015-09-03 06:17:33 -04:00
Unknwon
2a2a8cd619 ui and pulls index fix 2015-09-03 03:49:50 -04:00
Unknwon
83dc2468f5 finish initial version of pull request 2015-09-02 16:18:09 -04:00
Unknwon
5da306c0e5 tmp: fix issue open count 2015-09-02 11:13:37 -04:00
Unknwon
d951824ff9 able to download archive by API 2015-09-02 09:54:35 -04:00
Unknwon
953bb06857 basic PR feature 2015-09-02 09:26:56 -04:00
Unknwon
1abfe4e05f PR: nothing to commit and has pull request check 2015-09-02 05:09:12 -04:00
Unknwon
37e0cee877 finish PR UI 2015-09-02 04:08:05 -04:00
Unknwon
2ac8e11f46 #842 able to use access token replace basic auth 2015-09-02 02:40:15 -04:00
Unknwon
ebf1bd4f51 add view pull desc 2015-09-01 19:26:39 -04:00
Unknwon
8c046073a8 work on PR conversation 2015-09-01 19:07:02 -04:00
Unknwon
670ade9a61 #1206 does not allow fork bare repo 2015-09-01 11:57:02 -04:00
Unknwon
398569f6f8 #1021 Forked repo unavailable after deleting original repo 2015-09-01 11:43:53 -04:00
Unknwon
8af094967f #1377 add rename repo action 2015-09-01 09:29:52 -04:00
Unknwon
7714e792a4 minor fixes on #1551 2015-09-01 07:04:35 -04:00
Unknwon
1ca257ad9f rename fields 2015-08-31 16:24:28 +09:00
Unknwon
cb381078ff finish new repo options page 2015-08-31 13:36:31 +08:00
Unknwon
d01f688257 fix repository count of user is messed up 2015-08-30 01:13:24 +08:00
Unknwon
302938e646 #1333 Disable Gravatar option when install 2015-08-30 00:22:26 +08:00
Unknwon
8d73832bdf fix sql 2015-08-29 23:49:17 +08:00
Unknwon
ea454c21f7 #1542 A way to skip TLS verify for SMTP authentication 2015-08-29 15:45:58 +08:00
Unknwon
65843b803b add webhook default events 2015-08-29 11:53:46 +08:00
Unknwon
55ddf225bb webhook APIs 2015-08-29 11:49:59 +08:00
Unknwon
f509c59ac1 new create webhook event 2015-08-28 23:36:13 +08:00
Unknwon
a00194e665 work on #1548 2015-08-28 19:15:25 +08:00
Unknwon
f2de4d5c04 new create repo options 2015-08-28 19:06:18 +08:00
Unknwon
c75cd33f2f #965 Remember visibility preference 2015-08-28 18:45:25 +08:00
Unknwon
bb3b90fcd6 #1487 Readme Template 2015-08-28 18:33:09 +08:00
Unknwon
46bee50e45 complate list of gitignores and licenses 2015-08-28 16:44:04 +08:00
Unknwon
ff35a37769 #1458: Authorities were messed up when using mysql database 2015-08-28 13:51:15 +08:00
Unknwon
70e0153b93 add highlight js 2015-08-27 23:58:50 +08:00
Unknwon
23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon
c08600c59b new edit webhook UI 2015-08-27 01:04:23 +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
1cb03135b7 new repo git hooks UI 2015-08-26 18:03:30 +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
4275b3720a finsih diff and compare 2015-08-21 00:18:30 +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
371572cf5f allow edit issue and comment 2015-08-20 04:31:28 +08:00
Unknwon
87f5ca8e1f able edit issue title 2015-08-19 23:14:57 +08:00
Unknwon
bd1d7d1509 Able to set SSH port when install, update Docker docs 2015-08-19 20:36:19 +08:00
Unknwon
1453e91f41 minor fix on API response 2015-08-19 20:08:57 +08:00
无闻
2b393f5b03 Merge pull request #1507 from cloudron-io/develop 
Set IsAdmin using LDAP
 2015-08-19 18:46:28 +08:00
无闻
a5e1ada474 Merge pull request #1414 from nice-software/wip/currentUser 
Factor out function to get the current user
 2015-08-19 18:29:04 +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
54b52de6ee minor fix on API response 2015-08-19 05:47:45 +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
2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon
b1696665bd make cron task configurable 2015-08-18 02:19:29 +08:00
Unknwon
d17f102339 try to fix HTTP ops not GC 2015-08-17 22:32:43 +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
Unknwon
c8bb475abb fix autocomplete on migration 2015-08-15 18:16:39 +08:00
Paolo Borelli
0d38794c7f Factor out function to get the current user 
The same logic was duplicated in three places. Factor it
out so that we can add further fallbacks in a single place.
 2015-08-15 10:05:12 +02:00
Unknwon
e633425f27 #1180 and #1250: migration 2015-08-15 16:03:20 +08:00
Unknwon
a52324a5f9 able sort issues 2015-08-15 12:07:08 +08:00
Unknwon
4ce003dc15 Filter issues by assignee 2015-08-15 11:24:41 +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
13a74c3a0c Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2 2015-08-15 00:42:57 +08:00
Unknwon
cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
无闻
8be0bb177b Merge pull request #1485 from donbowman/mime-type 
43bfee0d48 reverted my change
 2015-08-14 13:38:14 +08:00
Don Bowman
4137426c88 43bfee0d48 reverted my change 
423b1c69be, which in turn
causes all content to be served as text/plain. Let go decide
what the mime type is (e.g. text/html instead of text/plain).
 2015-08-13 23:21:49 +00: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
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
e67659bf8e fix serve attachment content type 2015-08-12 04:49:51 +08:00
Unknwon
34f6cbfc2a finish attachments when create issue 2015-08-11 23:24:40 +08:00
Unknwon
89c2bd4a0d finish create issue attachment UI 2015-08-11 17:54:00 +08:00
Unknwon
17f3e840ec fix cannot parse JSON for attachments 2015-08-11 12:44:14 +08:00
Unknwon
cbc7b7132f finish new issue action and mentions 2015-08-10 23:31:59 +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
590c464c56 UI: create issue with title and content 2015-08-09 15:23:02 +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
3d0583df0f fix private repo cannot trigger hook by SSH 2015-08-08 01:04:12 +08:00
Unknwon
9d414d4dd9 remove Index field of milestone 2015-08-06 23:25:35 +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
77dcef0cab fix milestone format parse 2015-08-05 20:37:14 +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
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
009d692c7d fix install default db option 2015-07-31 16:23:17 +08:00
Unknwon
eea9302d8f fix #1204 2015-07-31 13:53:14 +08:00
无闻
eedac73229 Merge pull request #1404 from wqweto/develop 
Allow space and/or percent in file and directory names
 2015-07-30 20:22:42 +08:00
Unknwon
869113704b fix #1407 2015-07-30 20:00:57 +08:00
Vladimir Vissoultchev
2cc050e21e Fix UTF-8 in upper-case, use ansi charset for all non UTF-8 encodings 2015-07-29 17:58:03 +03:00
Vladimir Vissoultchev
43bfee0d48 Raw text file view returns correct charset in content-type header if not utf-8 2015-07-28 19:50:35 +03:00
Unknwon
589618c8a5 better paging 2015-07-28 03:14:37 +08:00
Unknwon
fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +08:00
Unknwon
68cacf9c63 fix issue paging 2015-07-25 07:59:54 +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
70d44e9565 Merge branch 'master' of github.com:gogits/gogs into develop 2015-07-25 00:48:42 +08:00
无闻
333ab1b2b4 Merge pull request #1317 from smcquay/keys 
fix .keys route
 2015-07-25 00:46:39 +08:00
无闻
3dcc0a4b5f Merge pull request #1249 from donbowman/master 
in routers/repo/download.go, don't set mime type, let go figure it out.
 2015-07-25 00:41:22 +08:00
无闻
91ab2538c3 Merge pull request #1244 from jamesa/develop 
Add full name field to admin's user edit page (fixes #1130)
 2015-07-25 00:39:16 +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
86dbda0b42 UI: basci issue list without filters 
- fix isRead check
- fix paging
 2015-07-24 16:42:47 +08:00
Unknwon
4447a20f87 UI: issues - finish basic frame 2015-07-24 04:50:05 +08:00
Unknwon
42a72b62fc fix about #1289 2015-07-19 17:11:16 +08:00
Unknwon
bebbd08920 Disable log color in prod mode 2015-07-16 02:47:51 +08:00
Unknwon
4cbbaefd82 #1127: hide user e-mail when API caller isn't signed in 2015-07-15 12:59:43 +08:00
Unknwon
ced212f8fa fix hidden bug on tpl rendering 2015-07-10 17:26:50 +08:00
Unknwon
35be8741c4 fix #1112 2015-07-10 16:51:25 +08:00
Unknwon
a2a9e151f8 install - add mail from setting 2015-07-09 16:10:31 +08:00
Unknwon
b9dc2147b4 UI: install - done 2015-07-09 13:17:48 +08:00
Unknwon
5cf3732339 UI: install - new version 2015-07-08 19:47:56 +08:00
stephen mcquay
73698d292a fix .keys route 
This change fixes the output from /{{ username }}.keys so that it can work in
a ~/.ssh/authorized_keys file
 2015-06-08 00:40:38 -07:00
James
f3aab5dbe3 Add full name field to admin's user edit page (fixes #1130) 2015-04-28 11:59:05 -04: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
Dustin Willis Webber
5a4f314cf7 fix calls that go rename missed 2015-04-16 14:42:24 -04:00
Don Bowman
423b1c69be don't set mime type to text/plain. This will break serving e.g. raw images, 
html, etc

According to http://golang.org/pkg/net/http/#DetectContentType
"If the Header does not contain a Content-Type line, Write adds
a Content-Type set to the result of passing the initial 512 bytes
of written data to DetectContentType."
 2015-04-08 00:44:38 +00:00
Linquize
f26f8d5afa Set Content-Type to text/plain for http status 401 
This is because git command line shows the failure reason only if Content-Type is text/plain.
 2015-03-28 22:30:05 +08:00
Unknwon
698b9e2acc #1070 Clearer error message for illegal characters 2015-03-26 17:11:47 -04:00
Unknwon
5169a0e025 mirror fix of #1105 2015-03-25 08:43:07 -04:00
无闻
f7219b0cf0 Merge pull request #1105 from linquize/migrate-git 
Allow to migrate through git:// protocol
 2015-03-24 19:28:55 -04:00
Unknwon
5f594d8774 #1140 MySQL root password exposure 2015-03-24 19:15:36 -04:00
Unknwon
211596f407 #1124 LDAP add and edit form are misleading 2015-03-24 19:04:16 -04:00
Linquize
3a977fc0ae Allow to migrate through git:// protocol 2015-03-20 22:26:58 +08:00
无闻
e312634286 Merge pull request #1091 from sapk/fix-ng-issue-pages 
Apply ng to issue dashboard
 2015-03-19 17:03:03 -04:00
Unknwon
1cb57b1a44 #1094: fix locale 2015-03-19 15:26:04 -04:00
Antoine GIRARD
96a71aaed8 Apply ng to issue dashboard 2015-03-19 00:35:17 +01: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
33894591a6 #851: Edit Account does not take into consideration password rules 2015-03-17 03:21:58 -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
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
Filippo Valsorda
5d5d774e03 Handle submodules without a .gitmodules entry - fix #1023 2015-03-10 03:08:17 +00:00
Unknwon
18c0697329 routers/repo/setting.go: fix LDAP cannot validate password #1006 2015-03-05 19:20:27 -05:00
Unknwon
b0b11fd7b1 Merge branch 'access' of github.com:gogits/gogs into dev 2015-02-28 21:50:29 -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
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
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
Unknwon
ee68a826a5 v4 migration, merge 'dev', clean code and mirror fix 2015-02-23 02:15:53 -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
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
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
无闻
fc4dff1b17 Merge pull request #959 from phsmit/access_update 
Updating context and fixing permission issues
 2015-02-21 02:55:30 -05:00
Peter Smit
0fa209d07b Update/simplify fix that owners also see actions on their repositories 2015-02-18 08:59:22 +02: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
455fad0fbd Fix that owners also see actions on their repositories 
This is a balance between speed and nice code, where speed has won. To prevent a repository query for each action the ownername is match with the current user.

It would be "cleaner" or "better" if we fetch the repository each time. Another option is to add the RepoOwnerID to action
 2015-02-16 13:16:24 +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
Peter Smit
f9454cc32c Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon
a38e4a0b02 routers/install.go: able to keep previous custom settings for 2nd time install 
- .gopmfile: update all commits
 2015-02-13 16:48:23 -05:00
Unknwon
6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -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
Unknwon
c5c467a9cd Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
无闻
e805fdb29c Merge pull request #925 from phsmit/newcollaboration 
Collaboration
 2015-02-11 12:43:13 -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
Peter Smit
0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +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
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
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
Raphael Randschau
3c65265871 Hide the registration button depending on the setting 2015-02-05 18:15:00 +01: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
无闻
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
89ea3e1acc routers: save partial config when install 2015-02-01 14:39:58 -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
32152d2363 routers/repo: set raw page content type to 'text/plain' #828 2015-01-31 15:27:57 -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
Peter Smit
76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +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
无闻
edbfbfa66e Merge pull request #822 from phsmit/fix_807 
Fix #807 parse the userinfo with the golang tools
 2015-01-22 19:31:51 +08:00
Christopher Brickley
d0827e5d5e allow http push by token - #842 2015-01-08 09:30:22 -05: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
d016eaaa09 Fix #807 parse the userinfo with the golang tools 
Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: 07d86b1f2d
 2015-01-02 12:14:11 +02:00
Unknwon
677b1ec627 fix #808 2015-01-02 12:56:08 +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
Thomas Laroche
e948c7c262 Fix #795 2014-12-29 11:55:46 +01:00
Unknwon
81a44e4cd0 fix API changes 2014-12-28 20:40:35 +08:00
Unknwon
79537467da mirror fix and update 2014-12-20 22:51:16 -05:00
无闻
a18decf4cc Merge pull request #755 from phsmit/multiple_emails 
Multiple emails
 2014-12-20 22:47:05 -05:00