pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
14603 commits 2 branches 0 tags 267 MiB
Commit graph

3773 commits

Author SHA1 Message Date
Unknwon 9c12ed3b6e clean up 2015-11-14 04:54:27 -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 679af4ddea clean up 2015-11-13 22:45:33 -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 523dc8b613 prepare release 2015-11-12 12:42:39 -05:00
Unknwon 3b62a0fe0e fix #1572 fix file histrory paging issue 2015-11-10 16:46:17 -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 676d774d88 fix #1902 2015-11-07 00:39:45 -05:00
Unknwon 54ca0b2f09 #1433 images with links in Markdown 
- #1904 minor fix on image link
 2015-11-06 11:10:27 -05:00
Unknwon f255b1e86d #1896 fatal when no needed update task 2015-11-04 21:57:10 -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 25ec20d525 #1838 update merge base before generate new patch 2015-11-03 17:25:39 -05:00
Unknwon 8e262f3ec4 update locales 2015-11-03 14:34:21 -05:00
Unknwon a374751eb8 add Makefile 2015-11-03 12:16:43 -05:00
Unknwon 0af035c37e #1078 not show bin when rename a file 2015-11-03 09:52:17 -05:00
Unknwon 75aab86a8d fix problem with #1879 2015-11-02 14:01:19 -05:00
无闻 50058b3c6d Merge pull request #1871 from Gibheer/config_minimum_key_sizes 
move minimum key sizes to config
 2015-11-01 12:39:12 -05:00
Unknwon b0226a1d05 fix #1831 2015-11-01 12:30:27 -05:00
Unknwon 5cad124704 fix #1697 2015-10-31 19:10:44 -04:00
Unknwon 940898a3ff minor fix for #1865 2015-10-31 12:35:26 -04:00
Unknwon 16feb5b655 minor fix on #1863 2015-10-31 12:04:04 -04:00
无闻 659bd29bc5 Merge pull request #1863 from nathan7/go-source-meta 
Add go-source directive to repo pages
 2015-10-31 11:45:40 -04:00
无闻 91c9069c4d Merge pull request #1862 from nathan7/fix-private 
Fix the JSON field names for MigrateRepoForm
 2015-10-31 11:14:38 -04:00
Nathan Zadoks 4323a89c03 Add go-source directive to repo pages 
This makes Gogs repos work with godoc.org: https://github.com/golang/gddo/wiki/Source-Code-Links
 2015-10-30 14:00:09 +01:00
Gibheer b90b0c1191 move minimum key sizes to config 
This moves the minimum key sizes into the config file, so that anyone
can modify the restrictions.
 2015-10-30 13:53:06 +01:00
Nathan Zadoks f1aa4c0524 Fix the JSON field names for MigrateRepoForm 
For some reason, the field names for Private and Mirror got swapped.
 2015-10-30 02:44:45 +01:00
Unknwon 073da3c49d #470 fix max length of email 2015-10-29 21:12:41 -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 4f0e31e96d update README 2015-10-29 03:21:59 -04:00
Unknwon f5689ee3a5 update locale 2015-10-28 02:30:24 -04:00
Sergio Benitez 630ebbe6c2 Sanitizing input to LDAP authentication module. 2015-10-26 18:08:59 -07:00
Unknwon b9f5def5dc fix insecure tls when trigger task 2015-10-26 09:16:24 -04:00
Unknwon 022820103d #1657 allow forcing all private repos 2015-10-25 04:26:26 -04:00
无闻 379629d28a Merge pull request #1836 from likeit92/develop 
workaround for reverse proxy, ssh, submodule
 2015-10-24 16:51:59 -04:00
Matthias Pioch 8b92f9cca6 fix workaround for reverse proxy, ssh, submodule 2015-10-24 22:46:13 +02:00
Matthias Pioch 78a4e71245 workaround for reverse proxy, ssh, submodule 2015-10-24 22:03:08 +02:00
Unknwon 63e6e31271 add config and update locale 2015-10-24 15:35:26 -04:00
Unknwon 71d8ff247d update some locales 2015-10-24 03:40:47 -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 c6ce6bd4c2 work on #1830 2015-10-23 10:31:13 -04:00
Unknwon eac91a74d8 Merge branch 'develop' of github.com:gogits/gogs into develop 2015-10-21 06:40:56 -04:00
Unknwon f17b746a01 update locale 2015-10-21 06:40:44 -04:00
Soputtra San 1f1abb17e2 Fix import path 2015-10-19 23:43:11 +11:00
Unknwon fc7959d3bc New/reopen PR checks if there is any unmerged and open PR 2015-10-18 19:30:39 -04:00
Unknwon 932dbccb67 fix import path, fix #1782 2015-10-15 21:28:12 -04:00
Unknwon 6a6e43f964 print out git version 2015-10-13 16:01:57 -04:00
Unknwon b5e6af9587 update locale 2015-10-08 22:49:08 -04:00
Unknwon aff49b1c9e unified API error response 2015-10-08 20:36:07 -04:00
Unknwon 215920772a save PR info as patch and minor fix on PR 2015-10-04 20:54:06 -04:00
Unknwon 4465c58f4b new quick start page 2015-10-02 19:58:36 -04:00
Unknwon c60d8bc069 update locales 2015-10-02 02:55:52 -04:00
Unknwon a205acf829 drop go 1.2 support 2015-09-26 17:54:02 -04:00
Unknwon d5ad4e1141 prepare release 2015-09-26 14:09:09 -04:00
Unknwon 6dfee30bf0 #1602 Wrong commit order on issue page when pushing multiple commits 2015-09-25 20:35:56 -04:00
Unknwon 21e13cb51e #1525 Triggere mailer for admin created accounts 2015-09-25 19:45:44 -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 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 14a1101139 New admin notice UI based on user list example 2015-09-25 18:13:38 +02:00
无闻 4f8b209956 Merge pull request #1678 from TheHowl/TheHowl/fix-go-get-not-working-with-user-or-repo-names-with-uppercase-letters 
Fix `go get` not working when there is a username or repository name with some uppercase letters.
 2015-09-24 18:51:02 -04:00
Unknwon e07675b480 fix test custom import path 2015-09-24 18:03:08 -04:00
Unknwon 4c30caad1c fix test import path 2015-09-24 17:58:40 -04:00
Unknwon 216f0477b5 fix subrepo break change 2015-09-24 17:55:01 -04:00
无闻 befed9c20c Merge pull request #1662 from SergioBenitez/develop 
Commit messages now rendered with line breaks and prefix spacing.
 2015-09-24 17:23:53 -04:00
Howl f8c09dc1ff Fix go get not working when there is a username or repository name with some uppercase letters. 2015-09-23 16:16:52 +02:00
Unknwon 700ac8dea7 fix #1664 2015-09-21 10:09:21 -04:00
Unknwon 69b1d65c9b remove unused file and update locale 2015-09-20 23:29:59 -04:00
Sergio Benitez 7acbcf9ddd Commit messages now rendered with line breaks and prefix spacing. 2015-09-18 19:02:23 -07:00
Unknwon 2340bb1ed2 update locales 2015-09-18 10:02:17 -04:00
Unknwon 86d3c5cbb3 update Docker info 2015-09-17 19:18:49 -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 b003b18788 #1649 Using commas to delineate emails 2015-09-16 15:04:54 -04:00
Unknwon 6a1907d994 revert simple LDAP userDN and update example 2015-09-16 12:15:14 -04:00
Unknwon e4ecbcdf4a new sign in page 2015-09-14 22:50:44 -04:00
Unknwon f5c7f22cc8 #1637 able to skip verify for LDAP 2015-09-14 15:48:51 -04:00
Unknwon 2bc3e83e1c fix simple LDAP userDN 2015-09-14 12:24:37 -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 98108e379d #697 update locale and admin panel 2015-09-13 11:16:29 -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 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 26ac016b9f minor fix on #1581 2015-09-10 15:03:14 -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
Unknwon c8d92fad30 #1595 pushing new branch will rereference issues in previous branch 2015-09-10 07:53:40 -04:00
Hongcai Deng e4d4662074 add regexp to restrict <code class=""></code> 2015-09-10 09:06:09 +08:00
Sergio Benitez b954a22ce2 Updated binary data. 2015-09-09 13:45:38 -07:00
Sergio Benitez 964d0262ff Merged conflicts. 2015-09-09 13:44:51 -07:00
Hongcai Deng 357c002c03 add allow attribute class to <code> 2015-09-09 17:31:14 +08:00
Unknwon 32c12d553c Able to use GOGS_WORK_DIR environment variable to specify work directory 2015-09-07 14:06:05 -04:00
Unknwon cc83043edc minor fix on template 2015-09-07 14:02:09 -04:00
无闻 36405d0faa Merge pull request #1596 from denghongcai/develop 
implemented #1528
 2015-09-07 13:10:59 -04:00
Unknwon 56eb252098 #1593 fix repo name router bug 2015-09-07 11:51:53 -04:00
Hongcai Deng fbb3486c95 fix syntax error 2015-09-07 18:28:56 +08:00
Hongcai Deng 7b92dc3d9d implemented #1528 2015-09-07 18:25:15 +08:00
Unknwon 645d4d0c5b #1594 Collaborative Repositories missing suburl on Dashboard 2015-09-07 05:57:19 -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 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
Sergio Benitez 079a2d68db Minor fixes to the LDAP module readme 2015-09-05 15:26:31 -07:00
Unknwon e885d34aa6 update locales 2015-09-05 04:55:23 -04:00
Sergio Benitez 0f07a5cb84 Updated the LDAP auth module README. 2015-09-04 21:14:20 -07:00
Sergio Benitez 7cb4aa8d82 Updated binary data. 2015-09-04 20:52:35 -07: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 07fe846c9f #1579 change e-mail max length to 254 2015-09-04 10:59:34 -04:00
Unknwon d023e81a8f #1577 explore paginator problem 2015-09-04 05:54:22 -04:00
Unknwon 6a5c87afdd prepare 0.6.9 release 2015-09-03 17:19:50 -04:00
Unknwon 38eb000d13 work on #1570 2015-09-03 08:09:08 -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 83dc2468f5 finish initial version of pull request 2015-09-02 16:18:09 -04:00
Unknwon 842770d7fb add merger info and news feed 2015-09-02 11:24:55 -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 65e73c4ac6 support URL param to token, but still restrict to APIs 2015-09-02 02:45:01 -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 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 f1adbca0f1 #1554 check adminFilter length before LDAP search 2015-09-01 08:40:11 -04:00
Unknwon 90a6553c37 #1009 Config option for preserving hard line breaks 2015-09-01 08:32:02 -04:00
Unknwon 7714e792a4 minor fixes on #1551 2015-09-01 07:04:35 -04:00
Unknwon 17c2d1fc7c fix dashboard 500 when no issues at all 
- update locales
- update README
 2015-09-01 06:31:47 -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 c6b039c6f9 new repo options UI 2015-08-30 03:21:59 +08:00
Unknwon 9b9e5f0290 #1545 Cross reference the commit from the issue when it is closed by the commit 2015-08-30 00:45:56 +08:00
Unknwon 302938e646 #1333 Disable Gravatar option when install 2015-08-30 00:22:26 +08:00
Unknwon ea454c21f7 #1542 A way to skip TLS verify for SMTP authentication 2015-08-29 15:45:58 +08:00
Unknwon 384fbeca80 #1474 logic fix 2015-08-29 14:44:38 +08:00
Unknwon 5ddcd8420b #1474 minor fix 2015-08-29 12:03:40 +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 125d314465 more clear error 2015-08-28 19:28:26 +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 4cfa2ca40d #1474 Edit New issue UpdateGravatarSource() assumes insecure protocol 2015-08-28 14:35:08 +08:00
Unknwon a7686e8749 #1203 bundle jquery with gogs 2015-08-28 14:24:05 +08:00
Unknwon 23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon fc2d0e5470 fix locale 2015-08-27 14:15:31 +08:00
Unknwon ce386cfb61 fix suburl 2015-08-27 14:05:24 +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 4330c1f0d8 update locale and org dashboard navbar 2015-08-26 00:01:06 +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
Louis Matthijssen e6917b6be8 Fix missing space in issue emails subject 2015-08-24 21:05:20 +02:00
Unknwon a104248792 update locales 2015-08-24 22:57:22 +08:00
Unknwon aa65761d81 new commits table 2015-08-20 20:18:49 +08:00
Unknwon d7c3c79c00 minor fix on #1517 2015-08-20 19:12:55 +08:00
Unknwon 062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
无闻 9b01a3501b Merge pull request #1517 from haoyixin/master 
Added supported of 'AUTH LOGIN'
 2015-08-20 16:32:13 +08:00
Unknwon ac616c07de fix #966 2015-08-20 15:57:51 +08:00
Yixin Hao d720c92d99 Added supported of 'AUTH LOGIN' 
i've been missing a 'r' in previous, lol~
 2015-08-20 13:56:25 +08:00
Unknwon 78b717f202 update locales 2015-08-20 04:36:59 +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 390027496c #1500 use UTC for TimeSince 2015-08-20 00:16:54 +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
无闻 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 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 71fd10dd37 change minimum password length to 1 2015-08-18 02:30:33 +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
Sergio Benitez bb8e763ede Small style fixes to the LDAP module README 2015-08-16 17:29:56 -07: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 77ade6855d fix style and locale name 2015-08-16 00:05:15 +08:00
Unknwon a8a2992758 update locale and TRANSLATOR 2015-08-15 22:28:06 +08:00
Unknwon c8bb475abb fix autocomplete on migration 2015-08-15 18:16:39 +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
Unknwon c7d5e1f182 clean file and update locales 2015-08-15 16:30:24 +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 b35d7eee31 update locale 2015-08-15 14:14:55 +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 a24141ec9c more on #1319 2015-08-15 02:54:39 +08:00
Unknwon cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +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 f8a4ab25fd Updated the LDAP module readme. 2015-08-12 17:08:16 -07:00
Sergio Benitez 7d84d4a8f0 Significantly enhanced LDAP support in Gogs. 2015-08-12 17:01:22 -07:00
Don Bowman 1cb46ede1a Merge branch 'master' of https://github.com/gogits/gogs 
Conflicts:
	routers/repo/download.go
 2015-08-12 21:10:00 +00:00
Don Bowman 9e6bd31d76 fixes for binary 2015-08-12 21:07:44 +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 496a65ed29 update locales 2015-08-12 02:29:47 +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 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
无闻 2cef9ef5e2 Merge pull request #1460 from manfer/semantic 
new top menu
 2015-08-10 22:44:37 +08:00
Fernando San Julián 4cc198179c new top menu 2015-08-10 16:38:21 +02: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
无闻 8f2a184e04 Merge pull request #1457 from jqs7/customAvatar 
add custom avatar source support
 2015-08-10 11:36:59 +08:00
Jqs7 16f74b62b9 custom avatar source 2015-08-10 09:46:42 +08:00
Unknwon 48f12d4ead upgrade new issue to SUI v2 2015-08-10 01:04:23 +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 9db4acc62e improve fork process 2015-08-08 17:10:34 +08:00
Unknwon 9ba0d8b87a update locale 2015-08-06 23:41:29 +08:00
Unknwon 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon 9f12ab0e88 update locale 2015-08-05 21:12:52 +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 e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Unknwon 487fc8ca39 fix #1439 2015-08-05 10:16:21 +08:00
Unknwon e6792796cc minor fix on #1432 2015-08-04 09:13:37 +08:00
无闻 96c1ce9606 Merge pull request #1432 from manfer/enhance-copy-clipboard 
Enhance copy clipboard
 2015-08-04 08:51:06 +08:00
Fernando San Julián 6a89eeedf3 browser supports copy detection 2015-08-03 21:27:07 +02: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 d496d0cc4d replace path.Join 2015-08-02 11:52:48 +08:00
Unknwon 1490e862cc custom workDir function to handle speical case in Windows 2015-08-02 11:41:28 +08:00
Unknwon 03011e31fe update locale and .gopmfile 2015-08-01 15:57:03 +08:00
Fernando San Julián c5be40decb new markdown styles 2015-08-01 02:26:14 +02:00
Unknwon b983912fce add italian support 2015-07-31 12:19:40 +08:00
Unknwon c541938a3d update locale and prepare for 0.6.3 release 2015-07-30 22:14:06 +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
Unknwon 72377c721c update gopmfile 2015-07-28 22:36:41 +08:00
无闻 678700b74d Merge pull request #1402 from wqweto/develop 
Allow file and directory names to contain percent character
 2015-07-28 17:46:58 +08:00
Vladimir Vissoultchev 167265d533 Allow file and directory names to contain percent character 2015-07-28 11:42:06 +03:00
无闻 7d8121b077 Merge pull request #1399 from wqweto/develop 
Allow explicit charset/codepage setting for ANSI source files to alle…
 2015-07-28 14:23:16 +08:00
Unknwon 589618c8a5 better paging 2015-07-28 03:14:37 +08:00
Vladimir Vissoultchev 53bcf373c1 Allow explicit charset/codepage setting for ANSI source files to alleviate issue #1088 2015-07-27 21:58:51 +03: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 436ef5b50a go-bindata on #1393 and fix #1392 2015-07-26 13:07:04 +08:00
Unknwon fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +08:00
Unknwon 2e7b38db9f fix paging links and issue count 2015-07-25 13:07:00 +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 752b527152 update Chinese locale 2015-07-25 03:13:47 +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
无闻 d86c4841fa Merge pull request #1309 from stettberger/master 
settings/password: no minimal required characters for OldPassword
 2015-07-25 00:45:53 +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 548b95f7b5 fix install form def 2015-07-20 12:34:53 +08:00
Unknwon ff051e2106 #1128: API calls are not hidden behind sign in 2015-07-15 19:17:57 +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 81adbe17ca use pam and update TRANSLATORS 2015-07-14 19:47:20 +08:00
Unknwon 2724dbd450 update locale 2015-07-14 18:35:38 +08:00
Unknwon eb0f0710f0 add more gitignores 2015-07-09 19:46:42 +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
Unknwon 5dd3dd71a0 UI: install - database settings 2015-07-08 01:09:03 +08:00
Unknwon 9af8a6c6a3 update locale 2015-07-06 23:20:07 +08:00
Unknwon 1269ce0538 update locle 2015-07-06 17:47:30 +08:00
Unknwon 1564b77cf5 update locale 2015-07-05 13:16:28 +08:00
Unknwon 1492c905bb update locale 2015-07-04 18:31:16 +08:00
Unknwon 4fca548ed1 update locale 2015-07-03 14:39:36 +08:00
Unknwon c47afdff58 add config options for HELO 2015-07-03 14:08:18 +08:00
Christian Dietrich b36134194c settings/password: no minimal required characters for OldPassword 
If users are added to gogs due a reverse proxy automatically, their password is
set to their initial username. If their username is shorter than 6 characters,
they can never set a password. But since this password is required for some
operations (e.g. repository deletion), they could not use all features of gogs
until now.
 2015-06-03 15:46:37 +02:00
James f3aab5dbe3 Add full name field to admin's user edit page (fixes #1130) 2015-04-28 11:59:05 -04:00
Unknwon c08baee085 Merge branch 'develop' of github.com:gogits/gogs into develop 2015-04-24 05:21:10 -04:00
Unknwon 7a7c096fd0 update typo in locale files 2015-04-24 05:21:00 -04:00
Paolo Borelli 182003aa41 Add PAM authentication 2015-04-24 10:13:01 +02:00
Tony Narlock 6a0fec77ea Allow an SSHDomain configuration option. Defaults to Domain, preserves legacy behavior 2015-04-18 05:21:07 -05:00
Don Bowman 81e6173356 remove blackfriday.EXTENSION_HARD_LINE_BREAK from options. 2015-04-08 22:25:47 +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
blemasle e1a4f99eaa fixed panic error on user login 2015-03-25 15:39:36 +01:00
Unknwon c5c5aac7a5 typo fix 2015-03-25 09:44:57 -04:00
Unknwon aae74c793a #1133 add config option [service] DISABLE_MINIMUM_KEY_SIZE_CHECK 2015-03-25 08:59:48 -04:00
Unknwon 211596f407 #1124 LDAP add and edit form are misleading 2015-03-24 19:04:16 -04:00
Unknwon caf7618ea6 #1098 Hide gravatar email field if gravatar is disabled (or offline mode) 2015-03-24 18:38:12 -04:00
Unknwon ab6b288141 #637 #738 fix markdown: render special links 
- code format for #1020
 2015-03-23 18:32:24 -04:00
无闻 750d82b8e2 Merge pull request #1020 from jcracknell/tag-exclude-nethtml 
Exclude HTML tags from Markdown post-processing
 2015-03-23 18:03:47 -04:00
Unknwon 2bb982dada #1080: Remove footer ads/branding from default template 2015-03-23 10:19:19 -04:00
Unknwon ade343f6dc Add Polish support 2015-03-22 19:22:47 -04:00
Unknwon 75cbb32b1e UI compatibility 2015-03-21 09:24:59 -04:00
Vitaliy Vasilenko 20a8d651f3 add func to autofix couters in repository 2015-03-21 14:55:00 +02:00
Unknwon b6f8b486c7 add sr-only class, change to new tag line 2015-03-20 03:20:05 -04:00
Unknwon 1cb57b1a44 #1094: fix locale 2015-03-19 15:26:04 -04:00
Unknwon e6cf83b8c0 Put default config into binary 2015-03-18 06:37:44 -04:00
Unknwon 49aeb87e44 #1028: Windows Expects UNIX Directory Separator 2015-03-18 04:25:55 -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 33894591a6 #851: Edit Account does not take into consideration password rules 2015-03-17 03:21:58 -04:00
Christophe Le Guern d61962a18a Add setting.AppSubUrl for LANDING_PAGE = explore 
Add setting.AppSubUrl in case of different ROOT_URL and LANDING_PAGE = explore
 2015-03-16 09:14:14 +01:00
Unknwon 588f3215c6 #1040: dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
Unknwon b72e75e522 #1024: OFFLINE_MODE Still Uses Gravatar 2015-03-12 20:32:38 -04:00
Nolan Darilek 98674b2a21 registeration -> registration 2015-03-12 12:25:28 -05: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
James Cracknell 41cc43208e Mousewheel paste 2015-03-08 22:30:15 -06:00
James Cracknell 127eb439d7 Exclude HTML tags from Markdown post-processing 
HTML tags are no longer processed for special links, etc
Contents of <a>, <code> and <pre> are not processed for special links
Processing for special links is done after Markdown conversion
 2015-03-08 22:14:50 -06:00
Unknwon 5e763baa12 modules/git/signature.go: parse date foramt #663 2015-03-06 18:27:20 -05:00
无闻 3db80f2c55 Merge pull request #943 from diseaz/mailer-client-cert 
Use client certificate for SMTP over TLS
 2015-02-28 22:25:48 -05:00
Unknwon 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
无闻 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 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 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 9dfa17faf2 modules/git: able to parse RFC1123Z date format #663 2015-02-21 23:37:32 -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
无闻 065f8d1f56 Merge pull request #973 from uchti/dev 
Fix: 504 5.5.2 <localhost>: Helo command rejected
 2015-02-20 18:25:18 -05:00
Gogs 2f1369c614 add error for hello func 2015-02-20 10:12:27 +03:00
Gogs 5293ae1221 Fix: 504 5.5.2 <localhost>: Helo command rejected 2015-02-19 10:47:05 +03:00
Alexey Makhov 563e8b4ea9 gitlab-like hash naming 2015-02-19 00:52:22 +03:00
无闻 a307574fbc Merge pull request #962 from phsmit/dont_mention_php 
Remove the "PHP" style formatting function
 2015-02-17 23:19:25 -05: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 7759b9ee6e Remove the "PHP" style formatting function 
The "PHP" formatting function doesn't add anything, except an undocumented date format.

All usages in the templates have been replaced with DateFmtShort and DateFmtLong for convenience.
 2015-02-16 14:44:27 +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
Unknwon f625665d8d modules/setting: add abs path check before add workdir prefix 2015-02-14 17:49:33 -05:00
Dmitry Azhichakov 3aaf292ba8 Fix "forcing" client certificate for SMTP 2015-02-13 10:33:55 +03: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
Dmitry Azhichakov 8a6c86644e New feature: SMTP connection may use client certificate. 
New config keys in [mailer] section:
 - CERT_FILE: path to a certificate file.
 - KEY_FILE: path to a key file.
 2015-02-12 18:54:51 +03: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 7e7160eefd first pass work on migration #925 2015-02-11 21:58:37 -05:00
Unknwon d02e45f985 better naming on #891 2015-02-11 12:04:01 -05:00
Unknwon 28580aee63 modules/middleware/auth.go: remove uncheck login for watch a repo #929 2015-02-10 22:53:46 -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
Peter Smit 5cd887dba5 Fixes #921 
Fixes #921 and makes the Mention regexp be in line with the others
 2015-02-09 12:56:46 +02:00
Unknwon 3cc04682c5 modules/setting: mirror path issue 2015-02-08 22:23:01 -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
Unknwon 3a44143b81 modules/ans1-ber: fix LDAP UTF8 string decoding for #916 2015-02-08 14:39:54 -05:00
Lauris BH 00653e52ee Get username, name, surname and e-mail from LDAP server 2015-02-08 01:49:51 +02:00
Unknwon 2a2596fe61 able to disable SSH for #883 2015-02-07 10:46:57 -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 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
Unknwon 0669897226 modules/base: fix markdown mention regex for #826 
- conf/locale: add mew translator profile
 2015-02-06 19:15:58 -05:00
无闻 ddddad9792 Merge pull request #826 from deringer/dev 
Fix user mention bug when parsing markdown documents
 2015-02-06 19:03:35 -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
Raphael Randschau 79f3281548 Add ShowRegistrationButton configuration option 2015-02-05 18:14:54 +01:00
Peter Smit 1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Unknwon bfce0def25 modules/base: fix README filename checker, fix #877 2015-02-02 23:04:36 -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 fb9dcfa921 modules/midlleware: little auth code fix, #777 2015-01-30 20:30:42 -05:00
Unknwon d8394bb2e0 modules/midlleware: little auth code fix 2015-01-30 20:30:07 -05:00
Unknwon ee6786216a modules/base: clean code with #838 2015-01-30 18:12:30 -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
无闻 830bc75107 Merge pull request #866 from vitalvas/dev 
Fix in url if cache avatar is enabled
 2015-01-20 13:38:17 +08:00
Unknwon 8e384ce46c fix #828, may cause unintentional break in other features, but security is no.1 2015-01-20 13:08:49 +08:00
Vitaliy Vasilenko cf59057ef3 fix if service.ENABLE_CACHE_AVATAR is true 2015-01-20 05:20:33 +02:00
Unknwon 452cca35e0 Merge branch 'encoding' of github.com:gogits/gogs into dev 
Conflicts:
	.gopmfile
 2015-01-17 15:29:45 +08:00
Peter Smit e6f97c78ff Change chardet to gogits 2015-01-15 12:40:16 +02:00
Michael Dyrynda c7cbdd34fb Adjust MentionPattern to not match users mid-sentence (or email addresses) 
Fix link to user profile, update based on adjusted MentionPattern
 2015-01-03 22:03:41 +10:30
Unknwon c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Unknwon bd555551ce fix #801 2014-12-31 18:37:29 +08:00
Unknwon 81a44e4cd0 fix API changes 2014-12-28 20:40:35 +08:00
Peter Smit fff8109567 Removing redundant mahonia 2014-12-22 11:29:02 +02:00
Peter Smit 3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
无闻 030b3d751e Merge pull request #766 from phsmit/correct_from 
Correct usage of FROM in email creation
 2014-12-21 01:55:28 -05:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails 
Multiple emails
 2014-12-20 22:47:05 -05:00
Peter c884ecfea1 Parse the from string to extract the email address 2014-12-19 23:06:03 +02:00
Peter edbe1de026 Remove unused "User" member of Message Struct and fix bounce address 
The User member of a message is not needed anymore.

The from that is send to the server, should always be the "system" from. This is also called the Bounce address http://en.wikipedia.org/wiki/Bounce_address
 2014-12-19 22:48:21 +02:00
Peter 2321b4b272 Change from header in email, fixes #765 2014-12-19 22:33:17 +02:00
Peter 007cf33e88 Remove standard mailer port lines 
This lines got committed by accident. They do actually nothing, as SplitHostPort will give an error if port is not given.
 2014-12-19 22:00:11 +02:00
Unknwon b231b8c927 update locale and mirror code format 2014-12-19 00:24:17 -05:00
Peter eca42bcb44 Prefer CRAM-MD5 over PLAIN authentication 2014-12-18 14:15:13 +02:00
Peter 5ffeca35e7 Add option to use CRAM-MD5 as authentication method in the mailer 2014-12-18 13:58:48 +02:00
Peter 87be137b88 Rewrite of SendMail function 
The SendMail function is rewritten and has the following new functionality:
 - It is optional to skip verification of keys. The config option SKIP_VERIFY is added
 - If the port is 465, or ending on 465, the TLS(/SSL) connection is started first.
 2014-12-18 13:34:30 +02:00
Peter b033f2f535 Finish method for having multiple emails/user. 
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
 2014-12-17 17:42:54 +02:00
Peter ec71d538fc Method for activating email addresses through verification email 2014-12-17 17:41:49 +02:00
Unknwon 9803c421f5 fix binding api broken 2014-12-15 01:49:59 -05: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 bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 9ee80e3e54 fix compile error 2014-12-10 05:10:26 -05:00
无闻 b2c6a6920f Merge pull request #727 from Mageti/master 
Correction for #723
 2014-12-10 05:03:50 -05:00
Mageti e321469884 remove unused code in BasicAuthDecode 2014-12-10 11:01:17 +01:00
Mageti b7ebbb4064 Correction for #723 
Correction for #723
Bug was : decode failed if the password contains ```:```
 2014-12-10 10:51:51 +01:00
Unknwon 9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
Alukardd 21081836ba Allow send mail without authentication if SMTP server allow this 2014-12-07 16:07:48 +03: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 069486d169 fix #165 2014-12-05 17:54:57 -05:00
Andrew Burns 35b02997f8 Fix Gravatar images in web view (like commit listing) 
Related to #700

In the original bug report it was referencing only the sytem avatar images for setup users (like in the header); however the problem also persists with things like commit history.

This commit fixes the `tool.AvatarLink` function so that it also uses the already existing `avatar.HashEmail` function.

I also refactored the `tool.AvatarLink` method some to make the control flow more apparent and adhere better to DRY (there were multiple calls to the `EncodeMd5` function that the `HashEmail` function call replaced, now there is only one.)
 2014-12-05 11:02:59 -07:00
Andrew Burns adc1ac689e HashEmail function should also remove spaces 
According to the [Gravatar API](https://en.gravatar.com/site/implement/hash/) whitespace should also be removed from the email, it was not doing this previously.
 2014-12-05 10:58:49 -07:00
dennis-smurf d0a80e432d Addded sha1 pattern in markdown for current repository 2014-12-01 09:30:35 +01:00
Unknwon 9558999698 mirror fix 2014-11-30 18:35:05 -05:00
Unknwon d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon db4951bc61 mirror fix on oauth2 2014-11-28 21:38:35 -05:00
Unknwon d6132aaa88 fix oauth2 2014-11-28 21:20:13 -05:00
Unknwon 54d25c13d7 Fix #543 2014-11-24 18:47:59 -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 3c3f7c2a56 Fix #643 2014-11-20 18:03:42 -05:00
Unknwon ce8d4cc80b #634 2014-11-18 15:13:08 -05:00
Unknwon 37d8d3afe9 more APIs on #12 2014-11-18 11:07:16 -05:00
Unknwon 32dcaefafa fox #620 2014-11-17 14:53:41 -05:00
Unknwon a0f9197b45 GetFile api 2014-11-16 21:32:26 -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
Sean Keery 6bdb8ec4b9 Add function argument missing 
Not enough arguments in call to c.AddFunc when I copied and pasted
 2014-11-14 10:58:37 -07:00
Unknwon 9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -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 e0de6cb5ad work on #616 and update locales 2014-11-10 05:30:07 -05:00
Unknwon 35977cd34c continue work on #255 2014-11-07 16:44:25 -05:00
Unknwon abc57b6e43 work on #609 2014-11-07 14:46:13 -05:00
Unknwon 23eec25274 Fix #605, fix #255, fix #101 2014-11-06 22:06:41 -05:00
Unknwon 0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
Andy Leap 5094e9501c Add basic FCGI support 2014-11-03 20:49:56 -05:00
mcheng89 b9881d1e7b check for smtp AUTH extension 2014-10-31 21:52:03 -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
Unknwon 3abc41ccca Fix API broken 2014-10-18 23:26:55 -04:00
Unknwon fa241efa6d Use binding middleware 2014-10-15 11:19:20 -04:00
Unknwon 9ae92459a5 Fix repo css and rel path img in md 2014-10-14 23:44:34 -04:00
Unknwon 3005c4f6db Fix diff css style, hooks \r char 2014-10-11 18:20:07 -04:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
Unknwon b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
Unknwon 39931f8e00 Allow mail with self-signed certificates 2014-10-09 18:08:07 -04:00
Michel Roux 6705559ce0 Fix malformed address 2014-10-08 18:29:02 +02:00
Unknwon 1e1f9e7166 Update with macaron 2014-10-06 19:12:52 -04:00
Unknwon 64c68220d2 Fix #264 2014-10-06 17:50:00 -04:00
Unknwon 91e5c24a31 Fix #522 2014-10-06 10:36:32 -04:00
无闻 b694cc88e4 Merge pull request #525 from linquize/tag-sort-reverse 
sort tags in descending order by version number
 2014-10-05 00:08:24 -04:00
Linquize 67c44b7d27 If git >= 2.0, sort tags in descending order by version number 2014-10-05 11:59:54 +08:00
Unknwon 263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
Unknwon 2a031c1365 Fix #515 2014-09-30 04:39:53 -04: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
Unknwon 49193bebd2 UI: Confirmation box 2014-09-28 01:38:25 -04:00
Unknwon f69761563b Fix bug on transfer repo 2014-09-25 16:36:19 -04:00
Unknwon 25268577a5 Fix download archive issue 2014-09-24 17:43:33 -04:00
Unknwon a1109e6fbc Page: Repository home page 2014-09-23 13:47:54 -04:00
Unknwon ebb05475ed Fix #495 and cannot view repository by tag 2014-09-23 13:06:25 -04:00
Unknwon 135d3733b3 Feature: Integrate crypto/tls/generate_cert.go command 2014-09-22 17:30:58 -04:00
Unknwon 3f707b3f32 Add basic submodule support 2014-09-22 17:01:19 -04:00
lunnyxiao 7df60af60e submodule support and closed #478 2014-09-22 14:23:36 +08:00
lunnyxiao 79ec08141a Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-22 10:45:20 +08:00
lunnyxiao 150eef93b2 add submodule basic support & buf fixed #478 2014-09-22 10:43:16 +08:00
Unknwon 1273b3d3a9 Support custom robots.txt 2014-09-21 19:39:10 -04:00
Unknwon b72d7c201a Mirror bug fix 2014-09-21 12:22:50 -04:00
Unknwon 4a01bb8fa4 Mirror bug fix 2014-09-21 12:19:50 -04:00
Martin van Beurden 976f1486e0 Set cookiepath to AppSubUrl 2014-09-21 14:25:22 +02: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
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
Unknwon ae3639868e Quick fix on #476 2014-09-16 20:58:06 -04: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 b9560374cd UI fix 2014-09-13 22:12:11 -04:00
Mathieu Gagnon 3549fb0ea8 Remove APP_LOGO setting 2014-09-13 03:52:51 -04:00
Unknwon a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon 2a3660dae3 Fix #453 2014-09-09 18:19:57 -04:00
Unknwon d89e630bc0 Fix test cases 2014-09-07 20:11:13 -04:00
Unknwon 59a7c7c5a5 Remove ldap dep 2014-09-07 20:04:47 -04:00
Unknwon 25d6ae69d1 Remove hg dep 2014-09-07 19:58:01 -04:00
Unknwon 0ddb1eb769 Finish new install page, almost ready for 0.5 release 2014-09-07 19:02:58 -04:00
Unknwon 8b0e815d98 Fix #425 2014-09-02 13:01:02 -04:00
Unknwon bf5595f9a0 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-01 00:16:14 +08:00
Unknwon 36661f53e6 Update deps 2014-09-01 00:12:37 +08:00
Christopher Brickley 2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04:00
Tristan Storch 69e332f432 Removed trailing white spaces 
Removed trailing whitespaces with

```sh
for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done
```

and some handwork.
 2014-08-30 15:12:53 +02:00
Unknwon 9bc63bda7d Finish all new admin pages. 2014-08-30 20:49:51 +08:00
Unknwon 8829174574 Finish new admin users pages 2014-08-29 15:32:52 +08:00
Unknwon 9baf2b38d0 Bug fix on organization 2014-08-27 16:39:36 +08:00
Unknwon f2c263c54f fix #367 2014-08-25 09:45:39 +08:00
Unknwon 21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Unknwon 97a373f5e7 Fix #362, update code with upstream 2014-08-23 21:13:55 +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 5acc948562 Page: /org/:orgname/settings 2014-08-14 14:12:21 +08:00
Unknwon 5fbf8531e6 Finish new home page of organization 2014-08-10 20:11:18 -07:00
Unknwon 7af7584d25 Finish new reset password, etc. 2014-08-09 21:02:00 -07:00
Unknwon 5605af973b Feature: Social sign in 2014-08-09 18:01:29 -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 fa0a389dc4 Fix bare repo bug 2014-08-05 19:40:01 -04:00
Justin Nuß 8023494a94 Fix invalid struct tags and remove unreachable code. 2014-08-04 10:37:57 +02:00
Unknwon 755eec745f Finish new repo settings page 2014-08-02 13:47:33 -04:00
Unknwon 669552e255 Fix #340 2014-08-01 06:12:14 -04:00
Unknwon b95e78f7e6 Mirro fix on PR #311 2014-08-01 00:24:29 -04:00
无闻 568c9b353e Merge pull request #311 from nuss-justin/issue/281 
Fix #281. Add mouse-over precise time and on-click switch listener.
 2014-08-01 00:15:06 -04:00
Unknwon dabf5b057c Finish new migrate page 2014-08-01 00:06:19 -04:00
Unknwon 7bbf644dd5 Convert captcha, cache, csrf as middlewares 2014-07-31 17:25:34 -04:00
Unknwon 3428baa3b5 Mirror fix on template 2014-07-30 10:02:31 -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
Justin Nuß 91480f3791 Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281 
Conflicts:
	modules/base/tool.go
 2014-07-26 11:23:58 +02:00
Unknwon 35c75f06a0 Fix test case 2014-07-26 03:05:56 -04:00
Unknwon 545d320648 Docs fix 2014-07-26 03:02:46 -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
Justin Nuß f7617997ce Ignore EOF error when parsing form. 2014-07-25 10:18:42 +02:00
Justin Nuß 835e85b5ce Fix #281. Add mouse-over precise time and on-click switch listener. 2014-07-24 22:31:59 +02:00
Unknwon c20f5dc2ea Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-24 12:49:43 -04:00
Unknwon a41a1fe60d Mirror fix 2014-07-24 12:49:40 -04:00
Justin Nuß 4d702eb345 Allow disabling uploads 2014-07-24 15:51:40 +02:00
Justin Nuß bfe5b86004 Add file upload for attachments 2014-07-24 15:19:59 +02:00
Justin Nuß 4617bef895 WIP: Allow attachments for comments 2014-07-23 21:15:47 +02:00
Justin Nuß 267870537d Fix issue #278. Fall back to (default) branch for context data, if no branch selected 2014-07-22 14:46:04 +02:00
gima 5a97cc69ed Make possible for administrators to change user's password (fix proposal for #290) 2014-07-18 05:30:57 +03:00
Unknown 63cc14062a Paging function for users and repositories 2014-07-07 04:15:08 -04:00
Unknown 097c8e05e6 Able to set timeout for process monitor 2014-07-06 17:32:36 -04:00
Unknown aed4271c8d Change martini.Static to custom Static function 2014-07-04 17:26:15 -04:00
Unknown 36292060d6 Fix bug that collaborators are able to modify settings of repository 2014-07-04 01:25:06 -04:00
Unknown cdffdeddc9 Fix bug that collaborators are able to modify settings of repository 2014-07-04 01:23:11 -04:00
Unknown 465dc962b5 Finish create organization team 2014-07-02 16:42:16 -04:00
Unknown e57aebb316 Add uuid 2014-06-29 16:39:06 -04:00
Lunny Xiao 1c46d68aba bug fixed for message tag 2014-06-28 23:56:41 +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
Unknown 32b09681b2 Migrate repository by organization 2014-06-25 05:35:23 -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 b2801a2e98 Fix #165 2014-06-24 13:55:47 -04:00
Unknown ceb415df8a Merge branch 'master' of github.com:gogits/gogs into dev 2014-06-24 09:59:21 -04:00
niphor 29a40c97f3 RepoRootPath must be absolute path 2014-06-24 14:28:47 +08:00
Unknown 9924e65ca1 In progress of name template name constant 2014-06-22 13:14:03 -04:00
Unknown 9d2cef23f2 Fix #165 2014-06-21 00:53:46 -04:00
Unknown ad5ec45dd6 Fix #165 2014-06-21 00:51:41 -04:00
Unknown 8bfa7ae745 Remove qiniu/log 2014-06-20 01:14:54 -04:00
Unknown 6c8d630bef Add database log adapter 2014-06-20 00:25:23 -04:00
Unknown f147ad619a Basic process manager 2014-06-19 01:08:03 -04:00
Unknown 8d3276cab0 Fix test cases 2014-06-16 23:19:25 -04:00
Unknown d952b4200c Add corn rask monitor panel 2014-06-13 13:01:52 -04:00
Unknown e07674bff1 Support edit release and save as draft 2014-06-12 17:47:23 -04:00
Unknown 9961f9a53c Fix #197 2014-06-12 09:10:39 -04:00
Unknown a3e1383cac Add gogs fix location command 2014-06-10 19:11:53 -04:00
Unknown 302c863cda Fix #242 2014-06-08 04:45:34 -04:00
Unknown 4f2f3c2857 Code convention 2014-06-05 22:07:35 -04:00
Unknown 63baf76ab2 Fix #214 2014-06-03 12:51:53 -04:00
Unknown 2657f88d9a Fix #222 2014-05-31 17:15:04 -04:00
slene 4ee6bc4fca fix for new git api 2014-05-28 14:01:41 +08:00
Unknown ab13a29cb5 Fix #209 2014-05-28 01:53:06 -04:00
Unknown ff690fd976 Fix #200, add VERSION to template files 2014-05-28 00:06:31 -04:00
Unknown ff48aeddef Little bug fix 2014-05-25 20:57:01 -04:00
Unknown d72fdc9900 Change version to v0.3.6 2014-05-25 20:44:58 -04:00
Unknown 5543a0b6dc 增加版本标识确保二进制和模板文件处于同个版本 2014-05-25 20:33:30 -04:00
Unknown 2f820e01d8 Fixed #209 2014-05-25 20:17:26 -04:00
Unknown 688ec6ecbd Fixed #209 2014-05-25 20:11:25 -04:00
Unknown 5e9a45f74a Code convention 2014-05-21 21:37:13 -04:00
Unknown 5660570d92 Add MustValueRange 2014-05-18 22:05:35 -04:00
Unknown 93f8f92523 Finish create new label 2014-05-18 18:07:04 -04:00
Unknown 44f1ef2493 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-05-15 23:03:31 -04:00
Unknown be82716b66 Clean old LDAP code 2014-05-15 23:03:26 -04:00
Lunny Xiao 57ad8d50b7 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-05-16 10:31:54 +08:00
Lunny Xiao f6c94c29d5 implicated error for ldap dial 2014-05-16 10:31:39 +08:00
Unknown 4744996f9a Make gmail auth work 2014-05-15 14:46:04 -04:00
Lunny Xiao 7869cfccb9 Merge pull request #192 from DerDackel/ldapssl 
Add LDAP over SSL support
 2014-05-15 20:52:05 +08:00
Sebastian Jackel eb264a112b Add LDAP over SSL support 2014-05-15 14:27:16 +02:00
Unknown b0084b1adc Litte bug fix 2014-05-14 08:30:35 -04:00
Unknown 33ec0632ff Fix #183 2014-05-13 19:26:13 -04:00
Unknown 98dbbae2ef Fix #166 2014-05-13 12:40:32 -04:00
Unknown f979d0d6b9 Fix #138 2014-05-12 19:32:35 -04:00
Unknown 54e95fa367 Finish add new milestone 2014-05-12 14:06:42 -04:00
Unknown f1130ce5e9 Fix edit auth page bug 2014-05-12 11:02:36 -04:00
Unknown 0970d6cc38 Log to different adapter according to level 2014-05-11 14:37:12 -04:00
Unknown 605a38759f Fix #94 and fix #169 2014-05-11 12:17:10 -04:00
Unknown fd4b123e88 Fix #94 and fix #169 2014-05-11 11:18:10 -04:00
Unknown 65e628d1f4 ignore broken tests 2014-05-11 07:50:05 -04:00
Unknown c5dbc24ca4 UI fix 2014-05-11 07:43:57 -04:00
Lunny Xiao bf58679390 add support for smtp authentication 2014-05-11 18:10:37 +08:00
Lunny Xiao 55019bfbc5 merge all login methods 2014-05-11 14:12:45 +08:00
Lunny Xiao 4d6de6c7b9 add login name for auth type 2014-05-11 11:56:04 +08:00
jiangjianxiao 501f70e248 fix news feed repo link 2014-05-09 14:42:50 +08:00
Unknown 09dba7d63e Clean names 2014-05-08 22:12:05 -04:00
Unknown 3f4c040f3f Update import path 2014-05-08 22:06:06 -04:00
Unknown 914ffa496f Show private repository activities in dashboard if has access 2014-05-08 19:17:43 -04:00
Unknown e867283406 Assignee back end 2014-05-08 12:24:11 -04:00
Unknown 23a857d107 Add repo info to web hook post 2014-05-08 08:18:03 -04:00
Unknown e05b1385fb Bug fix 2014-05-07 17:23:02 -04:00
Unknown 33d32585b1 Add mention, read/unread support of issue tracker 2014-05-07 16:51:14 -04:00
Unknown 8ca14e2109 Improve delete SSH key 2014-05-06 16:28:52 -04:00
Unknown 7cb5a15c9b Batch of mirror fixes 2014-05-06 13:47:47 -04:00
Unknown e573855a4f Fix #98, support web hook 2014-05-06 11:50:31 -04:00
Unknown 24f614f6db Finish add web hook 2014-05-05 20:52:25 -04:00
Unknown cb505b22ec Fix #164 2014-05-05 20:09:38 -04:00
Unknown 6e3dba2cc5 Clean repo code 2014-05-05 19:58:13 -04:00
Unknown bbdfe25769 User code clean and ui improve 2014-05-05 16:21:43 -04:00
Unknown c1eb4d894a Clean api code 2014-05-05 13:08:01 -04:00
Unknown 3b7465f817 fix code 2014-05-05 05:32:47 -04:00
Lunny Xiao d8136c9c3c Merge branch 'dev-ldap' into dev 2014-05-05 16:42:15 +08:00
Lunny Xiao 1652dd5068 basic authentications 2014-05-05 16:40:25 +08:00
Unknown 02687cbdf3 Add mail notify for new collaborator 2014-05-05 04:27:28 -04:00
Unknown 07c3d497a7 Fix #145 2014-05-05 02:49:33 -04:00
Unknown 816c0ed5e7 Fix import path 2014-05-05 02:42:52 -04:00
Unknown a641854cad command dump 2014-05-05 00:55:17 -04:00
Lunny Xiao 79ea34e70e ldap support 2014-05-03 10:48:14 +08:00
Unknown e10096ee2e Mirror fix on UI 2014-05-02 19:23:06 -04:00
Unknown e7d8fadb08 Add disable gravatar option 2014-05-01 21:30:04 -04:00
Unknown 3bd5fc6d6f Add command dump and move to cmd did 2014-05-01 21:21:46 -04:00
Unknown 100cd181bc Add router log config option 2014-05-01 18:53:41 -04:00
Unknown 75109bbd65 Fix panic when no master branch 2014-05-01 12:03:10 -04:00
Unknown 89c99167b2 Fix #149 2014-05-01 08:26:41 -04:00
Unknown d0ea4c7b68 Fix #149 2014-05-01 07:59:09 -04:00
Unknown 2a1dc0085b fix #91 2014-05-01 07:35:21 -04:00
Unknown 48bfbb7ddf Mirror changes 2014-04-30 03:44:28 -04:00
Unknown 62240b6bc1 Add login by email 2014-04-27 01:54:08 -06:00
Unknown 62d23e9154 HTTP no follow and offline mode 2014-04-27 01:05:13 -06:00
Unknown 59d0e73c35 Batch mirror fix 2014-04-26 22:34:48 -06:00
Unknown 89b68bdd45 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	modules/base/conf.go
 2014-04-26 18:34:58 -06:00
Unknown 9dfb7de371 Fix #102 2014-04-26 01:22:22 -06:00
Lunny Xiao 1b734501bd bug fixed 2014-04-26 14:25:51 +08:00
Lunny Xiao 0da329462e bug fixed 2014-04-26 14:14:48 +08:00
无闻 37cbfc032a Merge pull request #112 from juju2013/master 
basic support for LDAP/Microsoft Active Directory authentication
 2014-04-24 14:25:56 -06:00
juju2013 efc05ea1de initial support for LDAP authentication/MSAD 2014-04-23 23:07:54 +02:00
Unknown 5435b259cc Merge branch 'master' of github.com:gogits/gogs into dev 2014-04-22 05:30:53 -04:00
Unknown 2a9da4b8e5 Fix #92 2014-04-22 03:41:47 -04:00
Bryan Johnson 34d18a19a3 Minor grammatical fix for Disable Registration feature 2014-04-21 18:03:04 -04:00
Unknown de01f81489 Prepare for v0.3.0 release 2014-04-21 06:54:07 -04:00
Unknown 5fdfc2e223 Add debug log 2014-04-19 23:37:04 -04:00
Unknown 8bed017557 Add build tag enable prompt 2014-04-19 22:13:22 -04:00
Unknown eda3f8b3b3 Mirror updates 2014-04-19 06:00:08 -04:00
Unknown aa58320a1b Add 2 more gitignore 2014-04-18 12:17:28 -04:00
Unknown c3a52f7dd0 Mirror bug fix on downloading zip 2014-04-15 20:01:20 -04:00
Unknown 67426534ef Add view by tag support 2014-04-15 17:43:25 -04:00
slene 4fafc76052 zip archive download 2014-04-16 00:29:03 +08:00
Christopher Brickley b9a1d13c29 change gravatar image to match URL scheme 2014-04-14 22:01:24 -04:00
Unknown 337eef2ee5 Weibo oauth 2014-04-14 06:29:47 -04:00
Unknown 516baa4531 Weibo oauth 2014-04-14 06:07:40 -04:00
Unknown a1ab3cad3e Weibo oauth 2014-04-14 05:37:39 -04:00
Unknown 3c3cda7326 Weibo oauth 2014-04-14 05:07:19 -04:00
Unknown c36e7d322e Mirror updates 2014-04-14 04:11:33 -04:00
Unknown f644cefa86 Finish release 2014-04-14 01:57:25 -04:00
Unknown d2b53dd43b Add weibo oauth 2014-04-13 21:00:12 -04:00
Unknown 4b9b8024ba Clean oauth code 2014-04-13 18:12:07 -04:00
Unknown 4c1452574a go get 2014-04-13 05:02:11 -04:00
Unknown ea74be2f2e go get 2014-04-13 04:27:29 -04:00
Unknown d26a333dfb go get 2014-04-13 04:08:25 -04:00
Unknown 9d983f27d6 go vet 2014-04-13 03:14:43 -04:00
Unknown 5c2da610a2 Move binding as subrepo 2014-04-13 01:57:42 -04:00
Unknown c9a1eb4789 Able to change mirror interval now 2014-04-12 22:30:00 -04:00
slene 52b4ab2aa5 update with new git 2014-04-13 09:35:36 +08:00
Unknown 9ffa8a4083 finish mirror fix #63 2014-04-12 21:30:09 -04:00
Unknown 90f6aa8cd1 Add repo mirror and import 2014-04-12 20:35:35 -04:00
Unknown d305448fa8 Mirror bug fix 2014-04-11 23:52:08 -04:00
Unknown 33aa4f7438 Support private repo 2014-04-11 21:47:39 -04:00
Unknown 11f54b1426 Mirror bug fix 2014-04-11 12:14:11 -04:00
Unknown 65c2c62982 Bug fix 2014-04-11 00:01:38 -04:00
Unknown f8e370f8ca Bug fix 2014-04-10 23:49:53 -04:00
Unknown 306aa5bffe Add support default branch 2014-04-10 22:03:31 -04:00
Unknown 45462662e9 Add flash 2014-04-10 16:36:50 -04:00
Unknown af552596cf Work on form resubmit 2014-04-10 14:37:43 -04:00
Unknown b3f1ae1ba6 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-09 21:42:30 -04:00
Unknown 5d4025cb5a Add go get meta support 2014-04-09 21:42:25 -04:00
slene 0f9e07de2d fix render bug 2014-04-10 08:34:19 +08:00
slene 3487f17285 markdown render html 2014-04-10 08:21:51 +08:00
Unknown a773cf1d87 Mirror fix 2014-04-09 14:11:24 -04:00
Unknown 115a349131 Fix #67 2014-04-08 12:41:33 -04:00
Unknown 22feddf804 Fix #66 2014-04-07 14:24:58 -04:00
Unknown 7776f407b6 Fix issue with log in with GitHub but need more error handle after 2014-04-07 13:00:59 -04:00
Unknown 9ea9818d32 Fix issue with log in with GitHub but need more error handle after 2014-04-07 12:56:40 -04:00
Unknown 8c9a0494ec Add @ # commit link detect on all markdown render 2014-04-07 01:55:22 -04:00
Unknown e2fe220905 Work on comment 2014-04-07 00:47:19 -04:00
Unknown e7c8a3cb8d Add salt for every single user 2014-04-06 16:10:57 -04:00
Unknown db1fe3483e Fix bug related to log 2014-04-06 13:54:48 -04:00
Unknown 6a16866f4e Fix bug related to log 2014-04-06 13:41:58 -04:00
Unknown 2846ff7d31 Fix bug related to log 2014-04-06 13:00:20 -04:00
Unknown b7c3b0cc73 Add reset password, fix #58 2014-04-05 12:32:34 -04:00
Unknown 3ebc9b991a Use gogits/session for oauth2 2014-04-05 11:22:14 -04:00
Unknown eb803ec5eb Add transfer repository 2014-04-04 18:31:09 -04:00
Unknown e9c4156c87 Add: rename user 2014-04-03 16:33:27 -04:00
Unknown 79a610592e Add: rename repository 2014-04-03 15:50:55 -04:00
Unknown db66b8da72 Add release tmpl 2014-04-02 12:43:31 -04:00
Unknown 97b133bbee Merge branch 'dev' of github.com:gogits/gogs into dev 
Conflicts:
	routers/user/user.go
 2014-04-02 10:45:01 -04:00
Unknown d9005ee970 Improve issue mail content 2014-04-02 10:38:30 -04:00
skyblue adf42a5b54 change oauth2 to modules 2014-04-02 22:27:54 +08:00
Unknown 91e6db1bae Fix log bug 2014-04-01 00:07:25 -04:00
Unknown 2a0066420a Fix bug work with sqlite3 2014-03-30 16:01:50 -04:00
Unknown d0e6a4c25a Change new martini impot path 2014-03-30 12:11:28 -04:00
Unknown 3698431fc1 Fix install bugs 2014-03-30 11:58:21 -04:00
Unknown 9f91dee53f Bug fix #45 2014-03-30 11:09:59 -04:00
Unknown a6e12aaef6 Fixing bug 2014-03-30 10:47:08 -04:00
slene b1627672f9 fix link 2014-03-30 17:09:19 +08:00
slene 4c70249f75 fix some link 2014-03-30 17:03:00 +08:00
slene d6c9e3413a fix display bare repo 2014-03-30 13:30:17 +08:00
slene 578d981d7e display bare repo page 2014-03-30 11:38:41 +08:00
slene 105f97e61c remove Context.IsValid & verify repo in middleware repo.go 2014-03-30 10:09:59 +08:00
slene 66b697a513 add ShortSha template func 2014-03-30 10:05:54 +08:00
slene 3f65760739 NewLogger set to display line number 2014-03-30 10:05:39 +08:00
Unknown 107a1eadac Finish close and reopen issue, install page, ready going to test stage of v0.2.0 2014-03-29 17:50:51 -04:00
Unknown 8282828820 Fix action email bug 2014-03-29 07:50:25 -04:00
Lunny Xiao a726c125b5 Add PushCommit 2014-03-29 19:29:52 +08:00
Unknown 6e376bb85c Working on install page 2014-03-28 18:40:31 -04:00
Unknown a55941ff83 Add auto-detect home directory 2014-03-28 17:34:07 -04:00
Unknown cb05b8325c Update config option 2014-03-28 08:39:35 -04:00
Unknown 0fd754bbe0 Working on install page 2014-03-28 07:26:22 -04:00
Unknown 5344a03003 Bug fix 2014-03-27 21:15:53 -04:00
Unknown eb6021f73f Fix issue pages URL params 2014-03-27 19:42:10 -04:00
slene 10b412d237 commit raw file 2014-03-28 00:50:13 +08:00
slene 346db02d89 fix image display 2014-03-28 00:30:20 +08:00
Unknown dd6246877d Almost done diff page 2014-03-26 16:41:16 -04:00
skyblue bffa6979b0 Merge branch 'master' of github.com:gogits/gogs 2014-03-26 21:26:54 +08:00
skyblue 4662a73ac3 name change of avatar 2014-03-26 21:26:31 +08:00
Unknown 7ab94fe816 Fix issue on windows 2014-03-26 09:22:08 -04:00
Unknown ed9b7d2db9 More on diff page 2014-03-26 07:24:20 -04:00
Unknown c1a3d4fefb Add mail notify for creating issue 2014-03-25 21:37:18 -04:00
Unknown d3b8e9daa1 Add notify watcher action 2014-03-25 14:04:57 -04:00
Unknown 2fa8d0c8dd Added create issue 2014-03-25 12:12:27 -04:00
Unknown 197c4d4a5b Fix wrong serve command log location and commit repo action 2014-03-25 08:53:11 -04:00
Unknown 4f6889bef2 Add more log to locate issue 2014-03-25 07:47:04 -04:00
Unknown 7aa0a97d10 Mirror fix 2014-03-25 07:10:23 -04:00
Unknown be69e74bc0 Mirror fix 2014-03-25 07:06:56 -04:00
Unknown e95be2cb3e Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	conf/app.ini
 2014-03-25 06:54:22 -04:00
Unknown eeb793524f Check run user 2014-03-25 06:52:56 -04:00
skyblue f0352789cd Merge branch 'master' of github.com:gogits/gogs 2014-03-25 18:35:15 +08:00
skyblue 7048ea4527 update avatar, remove gzip request header 2014-03-25 18:34:57 +08:00
FuXiaoHei 7f6126dd04 install sample page 2014-03-25 16:51:42 +08:00
Unknown d2ceb001d0 Merge branch 'master' of github.com:gogits/gogs 2014-03-24 11:58:58 -04:00
Unknown 6337d3bf19 Show dashbard 2014-03-24 11:58:46 -04:00
slene ff36248419 raw download 2014-03-24 23:56:32 +08:00
Unknown 1b3af2f6c6 Merge branch 'master' of github.com:gogits/gogs 2014-03-24 09:32:30 -04:00
Unknown 8aec5e16c4 Locating issue of git push not update repo last updated time 2014-03-24 09:32:24 -04:00
shxsun 8376b0d53c use modeles/log instead log 2014-03-24 21:16:00 +08:00
Unknown d44c44987f Fix dashboard auto-log bug 2014-03-24 06:50:11 -04:00
Unknown b9b82cfe47 Mirror updates 2014-03-23 19:09:11 -04:00
Unknown 003298ef1d Add default behave of logger 2014-03-23 12:32:16 -04:00
Unknown f8cfb81fb0 Mirror updates 2014-03-23 12:16:17 -04:00
Unknown 6bc7ae971a Mirror fix 2014-03-23 10:58:50 -04:00
skyblue 4bac361605 merge with branch master 2014-03-23 22:40:35 +08:00
Unknown 97debac185 SSL enable config option 2014-03-23 08:40:40 -04:00
Unknown c386bb4bd3 Bug fix 2014-03-23 06:34:41 -04:00
Unknown 1eb078d0a8 Fix action 2014-03-23 06:27:01 -04:00
Gogs 964e537479 append route to web 2014-03-23 18:13:23 +08:00
slene 4adb024715 minor fix markdown setting 2014-03-23 16:40:51 +08:00
skyblue 79604f553f fix download part problem, add png support 2014-03-23 15:55:27 +08:00
skyblue 8e47ae2102 add avatar inorder to view code on github 2014-03-23 12:24:09 +08:00
Unknown 7356153ba3 Batch updates 2014-03-22 17:59:22 -04:00
Unknown cb52f6d07d Add auto-login 2014-03-22 16:40:09 -04:00
Unknown 59ffdbf6f8 Add create, list, view issue 2014-03-22 16:00:46 -04:00
Unknown b3cfd9fe0c Fix SSH key bug in windows 2014-03-22 14:27:03 -04:00
slene 5edd57e482 Merge branch 'master' of github.com:gogits/gogs 2014-03-23 01:45:21 +08:00
slene 076fc98d98 add csrf check 2014-03-23 01:44:02 +08:00
Unknown fd1831052c Update session 2014-03-22 09:21:57 -04:00
slene f9c07c4186 update session 2014-03-22 20:49:53 +08:00
Unknown 7a1ff8636c Add config option: Picture cache path 2014-03-22 06:42:19 -04:00
Unknown 932f717adb Fixing bug 2014-03-22 04:44:57 -04:00
Unknown f219ddcf4e Add log config panel in admin 2014-03-21 12:13:13 -04:00
Unknown d40499e7fa Finsih mail resend limit 2014-03-21 10:09:57 -04:00
slene 770c78a177 fix 2014-03-21 21:31:47 +08:00
slene c7e0d3a499 add cache 2014-03-21 21:06:47 +08:00
Unknown 30618b271a Add admin edit user 2014-03-21 06:15:58 -04:00
Unknown c1576b4c40 Add admin add user 2014-03-21 03:27:59 -04:00
Unknown 5373a3093e config option: Require sign in to view repository 2014-03-21 01:59:15 -04:00
Unknown f6596f11c4 All configuration reload-able 2014-03-21 01:48:10 -04:00
Unknown 369ddf76a8 Batch fix 2014-03-21 01:09:22 -04:00
Unknown 06631ab91f Basic admin data table, models changes 2014-03-20 16:04:56 -04:00
FuXiaoHei 42b08ff261 fix single bare page link 2014-03-20 21:28:12 +08:00
slene 47234f1031 fix ext 2014-03-20 21:11:48 +08:00
slene c6bd723ce1 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	public/js/app.js
 2014-03-20 21:02:52 +08:00
Unknown e8a49c7746 Add data to ui 2014-03-20 08:25:41 -04:00
Unknown 4cf6cc63b0 Work on admin 2014-03-20 08:02:14 -04:00
Unknown 9f9cd6bfc6 Work on admin 2014-03-20 07:50:26 -04:00
slene 21379e30a1 fix link 2014-03-20 17:31:18 +08:00
Unknown f9fd972cbe Bug fix 2014-03-20 02:25:21 -04:00
Unknown ebc3d86e63 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	routers/repo/single.go
 2014-03-20 01:48:55 -04:00
Unknown bbd38829eb Mirror fix 2014-03-20 01:48:03 -04:00
slene 24678d73f5 read single file 2014-03-20 13:31:24 +08:00
Unknown 805732fdc7 Mirror fix 2014-03-20 00:12:33 -04:00
Unknown ee92fb8635 Finish watch backend 2014-03-19 23:48:30 -04:00
Unknown 6f68620860 Pools limit concurrent nums 2014-03-19 21:05:48 -04:00
Unknown 601c10309d Bug fix 2014-03-19 13:24:46 -04:00
Unknown 757f360949 Render data in commit list page 2014-03-19 13:14:56 -04:00
Unknown 35d473f04a Finish verify email 2014-03-19 12:50:44 -04:00
Unknown ddbd2ce152 Add register mail tpl 2014-03-19 10:46:48 -04:00
Gogs 56af7e99a8 fork render 2014-03-19 21:58:51 +08:00
Unknown 0da4975f4f Working on register mail confirmation 2014-03-19 09:29:58 -04:00
Unknown a2fbb24615 Add active page 2014-03-19 09:24:02 -04:00
Unknown de087c7b4a Add send register confirm mail 2014-03-19 08:27:27 -04:00
Unknown fbbae2b721 Working on register mail confirmation 2014-03-19 07:21:23 -04:00
Unknown 9a666f3377 Bug fix 2014-03-19 05:35:52 -04:00
Unknown 04e5d5b71f Use custom logger middleware 2014-03-19 05:31:38 -04:00
Unknown bd9d90d8c4 Add some log 2014-03-19 04:48:45 -04:00
Unknown cef9bbd530 Add complete log configuration 2014-03-19 04:08:25 -04:00
Unknown 57db97b32c Merge branch 'master' of github.com:gogits/gogs 2014-03-19 03:24:23 -04:00
Unknown 460aa3eaa9 optimize log 2014-03-19 03:24:17 -04:00
Lunny Xiao 9e8e910bd6 merge 2014-03-19 14:40:49 +08:00
Lunny Xiao 3da325591b bug fixed for commits list 2014-03-19 14:39:07 +08:00
Unknown a3a93aef11 Add some config options 2014-03-18 01:33:53 -04:00
Unknown e51afe4621 Add postgres support, clean code, code review 2014-03-17 14:03:58 -04:00
slene 4249cec68c resolve relative path in markdown file 2014-03-17 23:22:27 +08:00
slene 5bc2a1a6f9 show readme.md 2014-03-17 18:46:54 +08:00
slene 26f9962b6e clone in ssh 2014-03-17 18:13:07 +08:00
Unknown 0d6aafdef5 Mirror fix 2014-03-17 04:47:42 -04:00
slene 3a2eee0827 fix repo setting and delete repo 2014-03-17 14:36:28 +08:00
FuXiaoHei d64a8e8d3a Merge remote-tracking branch 'origin/master' 2014-03-17 13:12:57 +08:00
FuXiaoHei c101471bdf ui update, repo-assignment panic bug fix 2014-03-17 13:12:28 +08:00
Unknown 0f68930892 Add latest commit in repo viewer 2014-03-17 00:57:18 -04:00
Unknown ec65be79f0 Fix commit feed ui 2014-03-16 12:07:35 -04:00
Unknown 48b2425c1d Push feed 2014-03-16 11:30:35 -04:00
Unknown 828c89de99 Clean code 2014-03-16 02:28:24 -04:00
Unknown 8fb4b3afad Add template func FileSize 2014-03-15 12:31:12 -04:00
Unknown 4224ef142e Add template func FileSize 2014-03-15 12:29:49 -04:00
slene f18c8fc4d9 add Owner to Context.Repo 2014-03-16 00:14:26 +08:00
slene 7ca8306775 modify RepoAssignment 2014-03-16 00:03:23 +08:00
Unknown b43cfc5b39 Clean code 2014-03-15 10:52:14 -04:00
slene b9e57e41ce clean code 2014-03-15 22:34:33 +08:00
Unknown f174633b36 Clean code 2014-03-15 09:17:16 -04:00
slene 9cdded911b fix context 2014-03-15 20:50:17 +08:00
slene a33d03f008 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	routers/user/user.go
	web.go
 2014-03-15 20:39:56 +08:00
slene fa5ad1e465 move templateFuncs to one file, add middleware context. 2014-03-15 19:01:50 +08:00
Unknown 4b8e888437 Finish feeds 2014-03-15 05:30:59 -04:00
slene 06deed820d Add HomeLink and AvatarLink to User model. Please use .SignedUser in template. 2014-03-15 15:28:06 +08:00
Unknown adb17791bd Add basic render of public act 2014-03-15 00:50:51 -04:00
Unknown d50e18ab6d Clean code 2014-03-14 19:34:59 -04:00
Unknown bd6542c2f1 Add TimeSince 2014-03-14 02:32:11 -04:00
Unknown 1ce17cce76 Add log.handle 2014-03-14 01:59:07 -04:00
Unknown 15f8bc417e Add log.handle 2014-03-14 01:51:12 -04:00
Unknown 56cf05be77 Add errHandler mid ware 2014-03-14 01:40:34 -04:00
Unknown 47edf7f4f9 Finish update password and profile 2014-03-14 01:12:07 -04:00
Unknown 52de63e7bb Allow 1 letter usernames 2014-03-13 16:21:16 -04:00
Unknown c01f593daa Add updatePasswd 2014-03-13 04:06:35 -04:00
Unknown 57bc2d1ca0 Add update user profile back end, add new gitignore and license, add template data to public profile page 2014-03-13 03:39:18 -04:00
Unknown 27104ac89a Add delete repo 2014-03-13 02:39:09 -04:00
FuXiaoHei 37fae304d3 single repository page ui, add spec handler to get repo 2014-03-13 13:14:43 +08:00
FuXiaoHei b1fe498eb9 single repository page ui 2014-03-13 12:50:07 +08:00
Unknown 8dd956f88a Move custom dir to custom/ 2014-03-12 21:40:18 -04:00
Unknown af5435d586 Bug fix 2014-03-11 11:54:43 -04:00
Unknown fdc4151ff3 Finish create repo 2014-03-11 01:32:36 -04:00
Unknown b4727c7601 Update create repo 2014-03-11 00:53:53 -04:00
Unknown 6ce9d800d0 Add custom.ini 2014-03-10 23:03:17 -04:00
Unknown 897329a644 Add add and delete SSH key 2014-03-10 20:48:58 -04:00
Unknown 76ce6f9848 Update repo.Create 2014-03-08 21:25:38 -05:00
Unknown 5a05d6633d Merge utils to modules 2014-03-07 17:22:15 -05:00
Unknown a2a59f8ad1 Change /user/profile URL to /user/:username 2014-03-07 17:08:21 -05:00
Unknown ba5c7ea771 Add SignInRequire and SignOutRequire middleware 2014-03-07 16:05:18 -05:00
Unknown 56a7ab4da5 Finish log in user 2014-03-06 11:42:14 -05:00
Unknown 1249392c83 Finish register user 2014-03-06 11:10:35 -05:00
Unknown 5959e344a9 Optimize validate 2014-03-06 02:59:44 -05:00
Unknown c6f2c23b05 Add binding form for register user 2014-03-06 02:21:44 -05:00