TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
15650 commits 17 branches 219 tags 581 MiB
Commit graph

3721 commits

Author SHA1 Message Date
Unknwon
8e0a69f86a #697 disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon
e2d6b0116e #1500 only regulateTimeZone for MySQL 2015-09-13 07:32:00 -04:00
Unknwon
cd37fccdfb #1625 remove auto_register and makes it default 2015-09-12 20:58:51 -04:00
Unknwon
6969c20afd #1625 LDAP not working 2015-09-12 19:20:37 -04:00
Unknwon
d185f601d3 #1622 comment with whitespace 2015-09-12 16:58:18 -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
247017d9ff clean log 2015-09-11 13:33:36 -04:00
Unknwon
362d64df04 #1620 add allowed domains for SMTP auth 2015-09-11 13:32:33 -04:00
Unknwon
373ef5d15e #1500 timezone minutes offset 2015-09-11 12:33:27 -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
Unknwon
9899ea71e8 #1611 fix bool type in sqlite query 2015-09-09 18:07:10 -04:00
Sergio Benitez
964d0262ff Merged conflicts. 2015-09-09 13:44:51 -07:00
Unknwon
b75d0378cb clean log 2015-09-09 12:42:24 -04:00
Unknwon
49e120a67c #1602 change status after comment issue 2015-09-08 06:34:02 -04:00
Unknwon
3d9b98fae4 #1585 order owners list by last changed time 2015-09-07 13:58:23 -04:00
Unknwon
645d4d0c5b #1594 Collaborative Repositories missing suburl on Dashboard 2015-09-07 05:57:19 -04:00
Unknwon
0806725ca5 minor fix on #1589 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 18:19:30 -04:00
无闻
d504ee0417 Merge pull request #1589 from siadat/migrating-empty-repository 
Set IsBare true if migrated repo is empty
 2015-09-06 18:17:58 -04:00
Sina Siadat
ae1650824c Set IsBare true if migrated repo is empty. 
Executes `git log -1` and sets IsBare to true if stderr contains this
string:

  fatal: bad default revision 'HEAD'
 2015-09-07 02:20:51 +04:30
Unknwon
85f34ba538 new user profile settings UI 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 16:31:22 -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
38eb000d13 work on #1570 2015-09-03 08:09:08 -04:00
Unknwon
b1f0f85789 #1569 force InnoDB for MySQL 2015-09-03 05:05:58 -04:00
Unknwon
a7ee654646 #1544 better tmp dir name for creating repo 2015-09-03 04:44:20 -04:00
Unknwon
b6131793da #1545 prevent duplicated refs of issues in single commit 2015-09-03 04:34:08 -04:00
Unknwon
1fd5f8edf8 fix #1568 2015-09-03 03:58:44 -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
842770d7fb add merger info and news feed 2015-09-02 11:24:55 -04:00
Unknwon
5da306c0e5 tmp: fix issue open count 2015-09-02 11:13:37 -04:00
Unknwon
953bb06857 basic PR feature 2015-09-02 09:26:56 -04:00
Unknwon
6ea28f2a47 work on #1558 2015-09-02 05:16:30 -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
63fecac537 XSS in username 2015-09-01 12:19:52 -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
17c2d1fc7c fix dashboard 500 when no issues at all 
- update locales
- update README
 2015-09-01 06:31:47 -04:00
Unknwon
d01f688257 fix repository count of user is messed up 2015-08-30 01:13:24 +08:00
Unknwon
8d73832bdf fix sql 2015-08-29 23:49:17 +08:00
Unknwon
a3683ca5d6 #1544 Creating new repository fails occasionally 2015-08-29 16:07:02 +08:00
Unknwon
ea454c21f7 #1542 A way to skip TLS verify for SMTP authentication 2015-08-29 15:45:58 +08:00
Unknwon
63799b3c18 #1526 URL escape for username and password 2015-08-29 12:08:37 +08:00
Unknwon
55ddf225bb webhook APIs 2015-08-29 11:49:59 +08:00
Unknwon
8e92d4352f slack JSON indent 2015-08-28 23:38:09 +08:00
Unknwon
f509c59ac1 new create webhook event 2015-08-28 23:36:13 +08:00
Unknwon
a541ca16b6 fix bare repo issue 2015-08-28 19:34:23 +08:00
Unknwon
d07033a0f0 fix 1093 2015-08-28 18:49:44 +08:00
Unknwon
11ce720f9f add more README vars 2015-08-28 18:36:32 +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
23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon
b900863d60 rename a user method 2015-08-27 13:26:38 +08:00
Unknwon
4217c2333c new create webhook UI 2015-08-27 00:30:06 +08:00
Unknwon
2881456421 new webhooks list UI 2015-08-26 21:45:51 +08:00
Unknwon
b3a45693c3 minor update 2015-08-26 12:26:01 +08:00
Unknwon
a329bbc215 new org dashboard issues 2015-08-25 23:22:05 +08:00
Unknwon
f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon
260301bf2e #1535 Removing deploy key does not remove key 2015-08-25 03:30:39 +08:00
Unknwon
87152f89ba fix release created timezone issue 2015-08-24 21:01:23 +08:00
Yixin Hao
5f25553b0d Modify minimumKeySize of RSA to 1024 for old keys. 2015-08-21 15:29:43 +08:00
Unknwon
aa65761d81 new commits table 2015-08-20 20:18:49 +08:00
Unknwon
062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
Unknwon
9b42f53aa8 more on #966 2015-08-20 16:08:26 +08:00
Unknwon
371572cf5f allow edit issue and comment 2015-08-20 04:31:28 +08:00
Unknwon
f114f78743 fix timezone! 2015-08-20 00:56:12 +08:00
Unknwon
6c2536b89c fix timezone 2015-08-20 00:32:18 +08:00
Unknwon
a5b09b30d0 print time to debug 2015-08-20 00:25:32 +08:00
Unknwon
b846f195c1 work #1500 2015-08-20 00:12:43 +08:00
Unknwon
1453e91f41 minor fix on API response 2015-08-19 20:08:57 +08:00
Girish Ramakrishnan
24d7a86a8d Set IsAdmin using LDAP 
The IsAdmin flag is set based on whether the admin filter
returned any result. The admin filter is applied with the user dn
as the search root.

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

Listing them explicitly fixes the issue with the wrong issue counts
 2015-02-21 09:37:48 +01:00
Peter Smit
e6fc58a744 Remove GoGet option from repository and handle it with ?go-get=1 instead 
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
 2015-02-17 10:36:17 +02:00
Peter Smit
aa68e86206 Rewrite/simplify gogs serve 2015-02-16 16:38:01 +02:00
Peter Smit
b6519f78c7 Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +02:00
Unknwon
685ed1f807 models: fix XORM API break 
cmd/web.go: check version after load config
 2015-02-14 17:01:33 -05:00
Peter Smit
0009a1d2b1 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Peter Smit
ddf7014b9b Rewrite of access migration 
The old migration had a few issues:
 - It left old column names around
 - It did not give the right access levels for owners and admins

Also, this includes a migration that fixes the authorization of owner teams, which was previously ORG_ADMIN (instead of ORG_OWNER)
 2015-02-13 13:58:19 +02:00
Unknwon
25f5a8d798 some fixes, but not done yet! 2015-02-13 02:56:42 -05:00
Unknwon
6b7d35eade fix mirror issues uncaught #941 2015-02-13 02:14:57 -05:00
Unknwon
6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Unknwon
b99c4baab2 models/migrations: finish accessRefactor 2015-02-12 22:43:32 -05:00
无闻
7fda0cdb93 Merge pull request #941 from phsmit/access_refactor 
Access refactor
 2015-02-12 21:34:27 -05:00
Unknwon
0b3722c359 models/migrations: fix little logic error 2015-02-12 12:46:21 -05:00
Unknwon
67a9416ae5 templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled #884 2015-02-12 12:38:44 -05:00
Peter Smit
6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor 
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
 2015-02-12 14:25:07 +02:00
Peter Smit
0a4cda0dd4 Refactoring of the Access Table 
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
 2015-02-12 14:14:45 +02:00
Peter Smit
2804784df9 Some comments and improvements for migrations 2015-02-12 13:59:42 +02:00
Unknwon
876a856759 models/migartions: make Migration as interface and use session 2015-02-11 23:10:30 -05:00
Unknwon
7e7160eefd first pass work on migration #925 2015-02-11 21:58:37 -05:00
Unknwon
c5c467a9cd Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
Unknwon
c7a042ef36 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-11 12:43:43 -05:00
无闻
e805fdb29c Merge pull request #925 from phsmit/newcollaboration 
Collaboration
 2015-02-11 12:43:13 -05:00
Unknwon
d02e45f985 better naming on #891 2015-02-11 12:04:01 -05:00
Unknwon
485ea6f14f models: make code change for session issue with SQLite3 #739 2015-02-10 23:44:16 -05:00
Unknwon
6a23252edc able to allow insecure certification of webhook for #891 2015-02-10 21:06:59 -05:00
Unknwon
bad533a219 models/repo.go: add update hook when migrate for #789 2015-02-09 12:42:53 -05:00
Peter Smit
0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit
aa35be975f Fix #922 2015-02-09 12:27:15 +02:00
无闻
6ed96b7a20 Merge pull request #911 from TonyTsangHK/dev 
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
 2015-02-09 00:31:16 -05:00
Unknwon
f15fa9167a cmd: code fix for #905 
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
 2015-02-08 21:26:14 -05:00
无闻
cd0ee35b3f Merge pull request #905 from phsmit/conf_on_cli 
Add option to provide configuration file on command line
 2015-02-08 20:22:02 -05:00
Lauris BH
00653e52ee Get username, name, surname and e-mail from LDAP server 2015-02-08 01:49:51 +02:00
Unknwon
ba77a3b0b4 routers/repo/http.go: allow HTTP push/pull by token for #845 2015-02-07 15:47:23 -05:00
无闻
19525abfc4 Merge pull request #845 from compressed/token_http 
allow http push by token - #842
 2015-02-07 15:27:59 -05:00
Unknwon
2a2596fe61 able to disable SSH for #883 2015-02-07 10:46:57 -05:00
Unknwon
5a99e9a37b models/action.go: add action reopen for #462 
- models/issue.go: format comment type names
 2015-02-06 20:47:21 -05:00
Unknwon
afccd0a3ee models/action.go: mirror fix on #892 
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
 2015-02-06 20:34:49 -05:00
Peter Smit
4e79adf6b5 Refactoring of the Access Table 
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
 2015-02-06 13:18:11 +02:00
Tony Tsang
fc6d80d619 Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files. 2015-02-06 17:02:32 +08:00
Peter Smit
1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Peter Smit
03af37554e Merge branch 'dev' into newcollaboration 2015-02-05 11:08:10 +02:00
无闻
02c5bade0f Merge pull request #892 from EtienneBruines/commit_reference 
Referencing issues from commit messages is now possible.
 2015-02-04 23:21:20 -05:00
Unknwon
f706102890 models: sanitize user full name when update settings 2015-02-04 20:04:01 -05:00
Peter Smit
fd1df86c44 Fix dashboard issue after collaboration migration 2015-02-04 16:08:55 +02:00
Peter Smit
bef38d9d3f Fix collaboration migration code 2015-02-04 16:03:39 +02:00
Unknwon
4de0b19cec models: mirro code fix for #821 2015-02-02 23:42:53 -05:00
无闻
902f19f70b Merge pull request #821 from phsmit/fix_819 
Fix #819 by fetching the repository from db before updating
 2015-02-02 23:38:04 -05:00
Etienne Bruines
5c4b85c029 Referencing issues from commit messages is now possible. 
Code-wise: the fixing-part of the code now doesn't reference the issue any more, because this is done by the referencing-part of the code, which is called just before.

Fixes #462, #668, #732.
 2015-02-02 16:34:07 +01:00
Unknwon
0a2068d7fb models: code fix on #818 2015-02-01 17:21:56 -05:00
无闻
cd6376f093 Merge pull request #818 from fzerorubigd/master 
add a function to rewrite all public keys on admin request
 2015-02-01 16:56:34 -05:00
Unknwon
b293b6eaa6 cmd: CMD option for port number of gogs web to prevent first time run conflict 
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
 2015-02-01 12:41:03 -05:00
Unknwon
ee6786216a modules/base: clean code with #838 2015-01-30 18:12:30 -05:00
Peter Smit
76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
Peter Smit
4ef3245413 Migration code: errors are not to be forgotten 2015-01-22 15:01:45 +02:00
Peter Smit
2a70d6b723 Clean up migrations code 2015-01-22 14:56:50 +02:00
Peter Smit
bb103e8723 Create db migrations framework 2015-01-22 14:52:58 +02:00
无闻
161774d4fb Merge pull request #825 from phsmit/ssh2_keys 
Implement #798 Flexible ssh-key input
 2015-01-22 19:39:35 +08:00
Unknwon
452cca35e0 Merge branch 'encoding' of github.com:gogits/gogs into dev 
Conflicts:
	.gopmfile
 2015-01-17 15:29:45 +08:00
Christopher Brickley
d0827e5d5e allow http push by token - #842 2015-01-08 09:30:22 -05:00
Unknwon
bb26285a12 fix #827 2015-01-06 17:14:49 +08:00
Peter Smit
6251626de4 Implement #798 Flexible ssh-key input 
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
 2015-01-02 15:38:11 +02:00
Unknwon
c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Peter Smit
44fa9147b7 Fix #819 by fetching the repository from db before updating 2015-01-02 11:15:42 +02:00
Unknwon
0b56272c13 fix #805 2015-01-02 13:30:45 +08:00
Unknwon
3ea1443885 work on #784 2015-01-02 12:47:33 +08:00
fzerorubigd
6643647687
add afunction to rewrite all public keys on admin request 
refs #763
 2015-01-01 02:15:52 +03:30
Unknwon
bd555551ce fix #801 2014-12-31 18:37:29 +08:00
无闻
477bea574a Merge pull request #782 from estetsenko/dev 
fix for  #747
 2014-12-29 20:08:39 +08:00
无闻
afdb0c7f9d Merge pull request #790 from euank/master 
Initialize unset git user.email / user.name correctly; fix Dockerfile
 2014-12-29 20:06:27 +08:00
Unknwon
63c1f9a23f fix 500: E-mail already used in user settings page 2014-12-29 20:00:07 +08:00
euank
234a7c19a4 Default values for both user.name and user.email 
The previous behavior was to set default values only if user.name was
not set, but to always set it for both. This only sets a value if there
wasn't one; this fixes cases where someone has a user.name but no
user.email (see included Dockerfile) or someone has a user.email but no
user.name (before the email would have been over-written).
 2014-12-27 19:07:54 -08:00
estetsenko
bae1d65564 bugfix: Unable to assign any issue myself 2014-12-24 20:47:45 +03:00
Peter Smit
3af757ed77 Replace mahonia with the standard functions in the Golang Sub-repositories 2014-12-22 11:01:52 +02:00
Peter Smit
66e2016eeb Fix for wrong email query 
Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change
 2014-12-21 09:16:56 +02:00
无闻
a18decf4cc Merge pull request #755 from phsmit/multiple_emails 
Multiple emails
 2014-12-20 22:47:05 -05:00
Peter
20b5c23a19 Small fixes to multiple_emails feature 2014-12-20 09:26:51 +02:00
Unknwon
c4820f119d work on #754 2014-12-18 03:26:09 -05:00
Peter
6919c80f0b Add function to the model for email address management (add/delete/activate) 2014-12-17 17:40:10 +02:00
Peter Smit
99599c099f Add alternative email addresses to the model 
A new struct is created named EmailAddress that contains alternative
email addresses for users. Also the email related methods; IsEmailUsed
and GetUserByEmail are updated.

DeleteUser deletes the extra email addresses and DeleteInactivateUsers
also deletes inactive accounts. This could be factored out, but should
do it for now.
 2014-12-17 10:26:19 +02:00
Unknwon
b553ea45ee modes/repo: incorrect SSH clone URL for #742 2014-12-13 16:46:00 -05:00
Unknwon
ac4a10456e api: able to create repo and fix #726 
- POST /user/repos
- POST /org/:org/repos
 2014-12-12 20:30:32 -05:00
Unknwon
2f3a7e53cb fix #735 2014-12-12 01:29:36 -05:00
Unknwon
9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
Joseph Crail
39c068400e Fix spelling errors in comments. 2014-12-06 20:22:48 -05:00
Unknwon
0b785ad967 work on #672 2014-12-05 18:08:09 -05:00
Unknwon
e577f2fff3 fix #706 and other mirror improve 2014-12-04 23:07:51 -05:00
Andrew Burns
00cf3e4dab Use the avatar.HashEmail function instead of hashing email directly. Fixes #700 2014-12-03 16:19:35 -07:00
Unknwon
5338808600 fix #676 2014-11-30 18:29:16 -05:00
Unknwon
d75013a0e8 fix #580 2014-11-30 02:26:29 -05:00
Unknwon
1b66600bd0 Fix #652 2014-11-23 02:33:47 -05:00
Unknwon
dc53270da9 Fix 653 2014-11-22 10:22:53 -05:00
Unknwon
8ea7ba3afa fix #644 2014-11-21 13:10:00 -05:00
Unknwon
ef275ebf62 more on change avatar 2014-11-21 12:51:36 -05:00
Unknwon
55dfe2c978 custom avatar upload 2014-11-21 10:58:08 -05:00
Unknwon
2d8c414f8c Fix #635 2014-11-18 19:05:33 -05:00
Unknwon
ce8d4cc80b #634 2014-11-18 15:13:08 -05:00
Unknwon
1e47e2df85 quick fix 2014-11-17 16:29:23 -05:00
Unknwon
5d9ef2bb12 lock gopmfile 2014-11-17 16:25:39 -05:00
无闻
d21d7171b0 Merge pull request #587 from eryx/dev 
Fix #266
 2014-11-17 16:17:52 -05:00
Unknwon
32dcaefafa fox #620 2014-11-17 14:53:41 -05:00
Unknwon
340a4595dd support duoshuo mirror of gravatar 2014-11-16 20:27:04 -05:00
Unknwon
52d66ba6c8 #12, use go-gogs-client 2014-11-14 17:11:30 -05:00
Unknwon
9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -05:00
Unknwon
9e22840483 fix #622 2014-11-13 05:27:01 -05:00
Unknwon
8eb5120fbd #12, API: list user repos, list repo hooks 2014-11-13 02:32:18 -05:00
Unknwon
8c9338a537 add personal access token panel #12 2014-11-12 06:48:50 -05:00
Unknwon
4e7eb5be9d Work on #5 fork and fix #608 2014-11-05 23:30:04 -05:00
Unknwon
0c5ba4573a fix session API broken and SQL pretection 2014-11-04 11:37:15 -05:00
luto
bff1e157d5 force the use of InnoDB as db engine for all tables, fixes #59 2014-10-28 16:40:09 +01:00
Eryx
e84e0ab904 Fix #266 2014-10-28 10:36:47 +08:00
Unknwon
83283bca4c Safe work 2014-10-25 07:50:19 -04:00
Unknwon
f1d8746264 Fix fork repo and macaron API broken 2014-10-24 18:43:17 -04:00
Christopher Brickley
3794111460 update slack hook to use new format 2014-10-24 08:56:12 -04:00
Unknwon
a342d58d7e Able to fork repo to individuals 2014-10-19 01:35:24 -04:00
无闻
d7d167ac63 Merge pull request #560 from evolvedlight/master 
First cut of fork repo
 2014-10-18 23:59:36 -04:00
Tony Tsang
e0f945959e Replace white spaces with tab for format consistency 2014-10-14 17:31:35 +08:00
Tony Tsang
91127d9016 Fixes #562 2014-10-14 16:46:25 +08:00
evolvedlight
8d2a6fc484 Merge remote-tracking branch 'upstream/dev' 
Conflicts:
	models/repo.go
 2014-10-13 20:30:31 +01:00
evolvedlight
29ac3980ff More changes 2014-10-13 20:23:30 +01:00
Unknwon
c04aea8d9d Fix #540 2014-10-12 02:39:00 -04:00
Unknwon
0d7b9065c6 Fix #540 2014-10-12 02:06:46 -04:00
Unknwon
452ccff81c Mirror fix on add ssh key 2014-10-11 21:04:42 -04:00
Unknwon
fb839ca0fb More debug info 2014-10-11 20:34:48 -04:00
Unknwon
b7b7863364 Work on ssh key issue 2014-10-11 20:06:35 -04:00
Unknwon
963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -04:00
lunnyxiao
e848b17fab bug fixed for #540 2014-10-11 13:24:36 +08:00
Unknwon
b2632dec09 Page: Compare 2 commits 2014-10-10 21:40:51 -04:00
evolvedlight
211dc74816 Got the fork count working 2014-10-10 00:21:36 +01:00
Unknwon
79262173a6 Webhook delivery locking & Hide repo for org members if they don't have access 2014-10-09 19:01:22 -04:00
Unknwon
1aa76bd279 Fix #532, add system notice 2014-10-08 18:29:18 -04:00
Unknwon
263d409326 Basic xss prevention 2014-10-04 17:15:22 -04:00
evolvedlight
c9e5e38fcf Initial cut of git fork 2014-10-04 18:19:14 +01:00
Unknwon
405ee14711 Fix SMTP auth logic 2014-10-03 13:12:54 -04:00
Unknwon
86eac0842b Fix feeds display issue 2014-09-29 18:58:04 -04:00
Unknwon
3cfa4a581c Bug: 500 when transfer repository to collaborator 2014-09-29 04:04:48 -04:00
fundon
eb1e6f8e3e support dsa key format 2014-09-29 12:37:34 +08:00
无闻
c1d047d16e Merge pull request #508 from chadoe/homelink 
Fix user HomeLink when using a suburl
 2014-09-28 18:05:58 -04:00
无闻
38f71af363 Merge pull request #509 from chadoe/avatarlink 
Fix AvatarLink when using a suburl
 2014-09-28 18:05:35 -04:00
evolvedlight
b7b0ee7df9 Fix minor typo 2014-09-28 22:01:05 +01:00
Martin van Beurden
bb05ef907b Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached 2014-09-28 14:27:13 +02:00
Martin van Beurden
204952439a Fix user HomeLink when using a suburl 2014-09-28 13:55:58 +02:00
Unknwon
b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
Unknwon
10673417dc Mirror fix on transfer repo 2014-09-25 22:42:31 -04:00
Unknwon
ad52b2d791 Mirror fix on transfer repo 2014-09-25 22:36:07 -04:00
Unknwon
71e4689d11 Page: User profile 2014-09-25 19:33:39 -04:00
Unknwon
f69761563b Fix bug on transfer repo 2014-09-25 16:36:19 -04:00
lunnyxiao
089d934547 add action repousername for transfer 2014-09-25 16:43:14 +08:00
Unknwon
bd55b78775 Page: Commits and fix #249 2014-09-23 23:18:14 -04:00
Unknwon
5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Christopher Brickley
25c8d01676 increase max commits in payload to 5 2014-09-22 08:25:39 -04:00
Unknwon
7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden
0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/ 
Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
 2014-09-18 20:50:48 +02:00
Unknwon
8a09256941 Mirror fix and fix #481 2014-09-17 14:22:51 -04:00
Christopher Brickley
f94d7c3f51 clarify name/username/owner/pusher for webhook 2014-09-17 09:20:14 -04:00
lunnyxiao
061a879cea Merge branch 'dev' of github.com:gogits/gogs into dev 
Conflicts:
	conf/app.ini
 2014-09-17 12:04:18 +08:00
lunnyxiao
ed84adb679 toutf8 improved & add max git diff lines 2014-09-17 12:03:03 +08:00
Unknown
ebb4f1b78c Work #475 and #458 2014-09-16 13:34:09 -04:00
Unknwon
62f21ff3ed Work on #476 2014-09-16 11:29:53 -04:00
Unknwon
0d9c41be7d Work on #476 2014-09-16 10:10:33 -04:00
Unknwon
c1ceec45da Fix mirror UI style and work on #475 2014-09-16 08:32:13 -04:00
Unknwon
a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon
bba401a5dc Prepare 0.5 release 2014-09-12 19:42:11 -04:00
Unknwon
1b7adf57e9 fix https://github.com/go-xorm/xorm/issues/161 2014-09-12 18:58:24 -04:00
Unknwon
cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Christopher Brickley
52d15ddec8 deliver hooks immediately after commit 2014-09-10 08:57:11 -04:00
Unknwon
33659ed9a5 Fix #452 2014-09-09 10:17:35 -04:00
Christopher Brickley
132590fab8 update specific hook_task, not all 2014-09-09 08:37:34 -04:00
lunnyxiao
d84d6dfdae add showinfo for xorm 2014-09-08 12:11:25 +08:00
无闻
e79e4b1580 Merge pull request #442 from compressed/org_hook 
Organization-level Webhooks
 2014-09-07 19:30:51 -04:00
Unknwon
ab7206d6b7 Fix #348 2014-09-05 17:28:09 -04:00
Christopher Brickley
85c35a6b8b add organization-level webhooks 2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov
31d8011843 Set milestone content field to TEXT orm type 2014-09-05 08:10:41 +07:00
无闻
d8290c9bac Merge pull request #444 from tstorch/database-cleanup 
Code dedoublication in models/models.go
 2014-09-04 11:38:35 -04:00
Tristan Storch
bdfdf3cacb Code dedoublication in models/models.go 
Just some code dedoublication in models/models.go
 2014-09-04 17:19:26 +02:00
Tristan Storch
9fc4ded369 Standard git user.name and user.email if not set 
Git user.name and user.email will now be set to the standard values

  - Gogs
  - gogitservice@gmail.com

if user.name is not set or empty.

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

	user_name | repo_name
	----------+-------------
	toby      | toby/blog
	toby      | toby/test
	toby      | tobyzxj/blog
	toby      | tobyzxj/test
 2014-06-11 16:54:25 +08:00
Unknown
a3e1383cac Add gogs fix location command 2014-06-10 19:11:53 -04:00
Unknown
f160b4f33c Add tar.gz download button and other mirror updates 2014-06-08 17:53:53 -04:00
Unknown
1f58d6f5d9 Mirror fix on #242 2014-06-08 04:54:52 -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
11f9d738e8 Fix #237 2014-06-03 21:51:25 -04:00
Unknown
32c5fa514c Fix #230 2014-06-02 23:17:21 -04:00
Unknown
eaa7d71fc7 Fix #232 2014-06-02 21:59:56 -04:00
Unknown
e1332c5239 Fix #230 2014-06-01 21:47:48 -04:00
Unknown
01a516b584 Fix #229 2014-06-01 10:53:57 -04:00
Unknown
6696610aea Fix zombie 2014-05-28 22:15:15 -04:00
Unknown
ab13a29cb5 Fix #209 2014-05-28 01:53:06 -04:00
Unknown
688ec6ecbd Fixed #209 2014-05-25 20:11:25 -04:00
Unknown
87854c95a9 Fixed #200 2014-05-24 15:34:02 -04:00
Unknown
80055bde86 Code convention 2014-05-24 15:28:31 -04:00
Unknown
dce17c86ac Almost done issue label #200 2014-05-24 03:05:41 -04:00
Unknown
b1bdbd7f94 Almost done issue label #200 2014-05-24 02:31:58 -04:00
Unknown
5e9a45f74a Code convention 2014-05-21 21:37:13 -04:00
Unknown
93f8f92523 Finish create new label 2014-05-18 18:07:04 -04:00
Unknown
956f011dd3 Fix #186 2014-05-16 13:41:08 -04:00
Unknown
be82716b66 Clean old LDAP code 2014-05-15 23:03:26 -04:00
Unknown
4744996f9a Make gmail auth work 2014-05-15 14:46:04 -04:00
Unknown
db6b71ad03 Update issue-user when change milestone 2014-05-15 12:08:53 -04:00
Lunny Xiao
f4486f3eec bug fixed #193 2014-05-15 22:34:36 +08:00
Unknown
b70db61854 Fix #185 2014-05-14 13:04:57 -04:00
Unknown
16bddd593a Finish change issue’s milestone 2014-05-14 11:14:51 -04:00
Unknown
46fc36c3a6 Finish change issue’s milestone 2014-05-14 10:55:36 -04:00
Unknown
e8dd480f10 Litte bug fix 2014-05-14 09:23:33 -04:00
Unknown
9100786beb Fix #185 2014-05-14 08:51:04 -04:00
Unknown
5ed5aa5228 Finish milestone 2014-05-13 19:46:48 -04:00
Unknown
5d5c4535cb Fix #181 2014-05-13 14:49:20 -04:00
Unknown
2eee1e9bc2 Finish edit a milestone 2014-05-13 13:28:21 -04:00
Unknown
98dbbae2ef Fix #166 2014-05-13 12:40:32 -04:00
Unknown
a913aff1d0 Show collaborative repositories in dashboard 2014-05-12 15:14:22 -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
98eeec4cbb Fix #174 2014-05-11 14:03:51 -04:00
Unknown
68fb62347f Finish issue assignee 2014-05-11 13:46:36 -04:00
Lunny Xiao
f68e279150 spell bug fixed 2014-05-11 20:18:57 +08:00
Lunny Xiao
d2231bb54c smtp login bug fixed 2014-05-11 20:04:28 +08:00
Lunny Xiao
bf58679390 add support for smtp authentication 2014-05-11 18:10:37 +08:00
Lunny Xiao
b33f255c40 add smtp authentication 2014-05-11 15:49:36 +08:00
Lunny Xiao
26c0113ea0 delete unused codes 2014-05-11 14:13:49 +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
slene
7d84cc96e8 update with git api 2014-05-10 11:14:24 +08:00
jiangjianxiao
501f70e248 fix news feed repo link 2014-05-09 14:42:50 +08:00
Unknown
830494a8aa Remove old files 2014-05-08 22:03:34 -04:00
Unknown
25713ab209 Fix #167 2014-05-08 20:00:07 -04:00
Unknown
914ffa496f Show private repository activities in dashboard if has access 2014-05-08 19:17:43 -04:00
Unknown
a742ee543e Add change assignee back end 2014-05-08 17:17:45 -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
495d939ca5 Waiting for UI 2014-05-07 20:36:00 -04:00
Unknown
7d89e765ab Bug fix 2014-05-07 18:57:00 -04:00
Unknown
31fd45ba02 Bug fix 2014-05-07 17:38:03 -04:00
Unknown
abd8c2a7ca Bug fix 2014-05-07 17:37:09 -04:00
Unknown
e05b1385fb Bug fix 2014-05-07 17:23:02 -04:00
Unknown
8b6766ecbe Bug fix 2014-05-07 17:10:46 -04:00
Unknown
269281ab76 Bug fix 2014-05-07 17:04:32 -04:00
Unknown
33d32585b1 Add mention, read/unread support of issue tracker 2014-05-07 16:51:14 -04:00
Unknown
7407f9caf3 Finish issue design 2014-05-07 12:09:30 -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
94bccbb148 Finish edit and remove web hook 2014-05-05 21:36:08 -04:00
Unknown
24f614f6db Finish add web hook 2014-05-05 20:52:25 -04:00
Unknown
bbdfe25769 User code clean and ui improve 2014-05-05 16:21:43 -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
a641854cad command dump 2014-05-05 00:55:17 -04:00
Unknown
bb0bc0a240 Merge branch 'dev' of github.com:gogits/gogs 2014-05-03 01:38:22 -04:00
Unknown
7b60756f2c Fix Collaborators cannot commit 2014-05-03 01:37:49 -04:00
Lunny Xiao
163fcec59f resolved #155 2014-05-03 11:12:15 +08:00
Lunny Xiao
79ea34e70e ldap support 2014-05-03 10:48:14 +08:00
Unknown
e7d8fadb08 Add disable gravatar option 2014-05-01 21:30:04 -04:00
Unknown
cd2020429a Fix #153 2014-05-01 20:29:51 -04:00
Unknown
ff9872104e Fix #153 2014-05-01 20:26:40 -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
f6c4fbeb37 Collaborator 2014-05-01 11:32:12 -04:00
Unknown
a7584d16e4 Fix #150 2014-05-01 09:09:37 -04:00
Unknown
480a4ae8c5 Fix #150 2014-05-01 09:00:30 -04:00
Unknown
a2333d95d5 Fix #148 2014-05-01 08:35:05 -04:00
Unknown
89c99167b2 Fix #149 2014-05-01 08:26:41 -04:00
Unknown
49dc57e336 Add /api/v1/users/search 2014-04-30 23:48:01 -04:00
Unknown
de46c06d2e Merge branch 'master' of github.com:gogits/gogs into dev 2014-04-30 03:44:42 -04:00
Lunny Xiao
1e9f376d3d bug fixed 2014-04-30 11:12:03 +08:00
Lunny Xiao
a85f242030 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-30 10:24:00 +08:00
Lunny Xiao
cdc843f06b add fix command for upgrade 2014-04-30 10:23:43 +08:00
Unknown
41b0a7b97c Mirror fix on public key 2014-04-27 17:01:39 -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
1badb2bbcc Fix #107 2014-04-26 19:06:59 -06:00
Lunny Xiao
8bab21d795 add login.go 2014-04-26 14:21:04 +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
8bc502a1ea New err check style 2014-04-22 22:34:49 -04:00
Unknown
de01f81489 Prepare for v0.3.0 release 2014-04-21 06:54:07 -04:00
Unknown
ea29a9b846 API fix 2014-04-21 02:24:35 -04:00
Unknown
0e41726ece API change 2014-04-19 06:15:47 -04:00
Unknown
eda3f8b3b3 Mirror updates 2014-04-19 06:00:08 -04:00
Unknown
49c01c0b57 Fix import path 2014-04-18 09:35:09 -04:00
Unknown
f8571f4db1 Bug fix on build tag 2014-04-17 03:31:21 -04:00
Unknown
c3a52f7dd0 Mirror bug fix on downloading zip 2014-04-15 20:01:20 -04:00
Unknown
5378bb326b Merge branch 'master' of github.com:gogits/gogs into dev 2014-04-14 22:48:01 -04:00
Christopher Brickley
b9a1d13c29 change gravatar image to match URL scheme 2014-04-14 22:01:24 -04:00
Christopher Brickley
caeddb79a3 update SetEngine for postgresql #76 2014-04-14 21:07:21 -04:00
skyblue
6cb636f8a0 fix title extra quoted 2014-04-14 22:42:17 +08:00
Unknown
c3c2cfebaa Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-14 04:11:41 -04:00
Unknown
c36e7d322e Mirror updates 2014-04-14 04:11:33 -04:00
Lunny Xiao
8283e16ef7 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-14 14:50:37 +08:00
Lunny Xiao
6cee65db5a bug fixed #76 2014-04-14 14:49:50 +08:00
Unknown
f644cefa86 Finish release 2014-04-14 01:57:25 -04:00
Unknown
190b83e05e push tag support 2014-04-13 22:20:28 -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
d26a333dfb go get 2014-04-13 04:08:25 -04:00
Unknown
9d983f27d6 go vet 2014-04-13 03:14:43 -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
23bba7633b Mirror fix on sqlite3 tag 2014-04-12 16:24:09 -04:00
Unknown
d60f7b85e5 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-12 16:19:16 -04:00
Unknown
47f3dd43a5 Merge branch 'master' of github.com:gogits/gogs into dev 2014-04-12 16:19:10 -04:00
Michael Crosby
25fd495b2e Add sqlite build tag 
This adds a sqlite build tag so that you don't have to have the sqlite
import commented out in code and users can run:
    go build -tags sqlite
if they want to have sqlite support enabled.  It is disabled by default
so nothing changes with the default go get or build commands.
 2014-04-12 12:12:48 -07:00
skyblue
75d2affcbf add oauth2 qq support 2014-04-13 01:15:19 +08:00
skyblue
f92851e347 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-12 23:19:22 +08:00
skyblue
2ce0c3befe add google oauth2 support 2014-04-12 23:19:17 +08:00
Unknown
559a57330e Mirror fix 2014-04-12 02:08:12 -04:00
Unknown
794b457252 Mirror fix 2014-04-12 01:47:59 -04:00
Unknown
31d613c01d Mirror fix 2014-04-12 01:45:43 -04:00
Unknown
d305448fa8 Mirror bug fix 2014-04-11 23:52:08 -04:00
Unknown
4fc5dcc764 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-11 21:47:43 -04:00
Unknown
33aa4f7438 Support private repo 2014-04-11 21:47:39 -04:00
skyblue
f8e97b75fb Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-12 09:42:15 +08:00
skyblue
5c1312f38e clean oauth2 code 2014-04-12 09:42:09 +08:00
Unknown
d6dac160df Pages in commits list page 2014-04-11 20:23:34 -04:00
Unknown
47aa53bd36 Add search commits 2014-04-11 19:44:13 -04:00
Unknown
7d07b58114 UPDATE README 2014-04-11 13:24:19 -04:00
skyblue
dd815ae7b5 finish github oauth2 support 2014-04-12 01:01:30 +08:00
Lunny Xiao
8cfa2be433 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-11 10:28:23 +08:00
Lunny Xiao
db39e58a13 add actions for http push 2014-04-11 10:27:13 +08: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
zhsso
a4cbe79567 fix 2014-04-10 14:20:58 -04:00
zhsso
f3ed11d177 mistakes 2014-04-10 14:20:01 -04:00
Gogs
fde5b16332 Fix wrong path name 2014-04-10 12:59:20 -04:00
Gogs
7811e58726 speedup models.getReposFiles, using os.Exec 
but the results may different with before
 2014-04-10 12:44:05 -04:00
Unknown
5d4025cb5a Add go get meta support 2014-04-09 21:42:25 -04:00
Unknown
5f6bd323f5 Merge branch 'dev' of github.com:gogits/gogs into dev 
Conflicts:
	models/oauth2.go
 2014-04-09 14:15:09 -04:00
Unknown
a773cf1d87 Mirror fix 2014-04-09 14:11:24 -04:00
skyblue
8683d2f857 remove martini oauth2 depend 2014-04-10 00:07:57 +08:00
Unknown
b506429803 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-08 12:41:37 -04:00
Unknown
115a349131 Fix #67 2014-04-08 12:41:33 -04:00
skyblue
24d0ca4aa0 clean tail 2014-04-09 00:31:09 +08:00
skyblue
d4565483e6 add id for oauth2 2014-04-09 00:26:12 +08:00
Unknown
22feddf804 Fix #66 2014-04-07 14:24:58 -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
skyblue
05fb34eacd first works oauth2(github). need to login with /user/login/github 2014-04-07 18:01:25 +08:00
Unknown
e7c8a3cb8d Add salt for every single user 2014-04-06 16:10:57 -04:00
skyblue
5e534bf2a5 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-06 23:12:29 +08: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
skyblue
1336d8d54d Merge branches 'dev' and 'dev' of github.com:gogits/gogs into dev 2014-04-05 22:53:17 +08:00
skyblue
c22d3503fd add oauth2 table init 2014-04-05 22:52:24 +08:00
skyblue
ce350a737a update models, add licence in start.sh 2014-04-05 22:46:32 +08:00
Lunny Xiao
9791e70da6 bug fixed 2014-04-05 22:24:10 +08:00
Unknown
e41ab839c7 Use session for rolling back 2014-04-04 18:55:17 -04:00
Unknown
eb803ec5eb Add transfer repository 2014-04-04 18:31:09 -04:00
Unknown
4a4997a3c7 Merge branch 'master' of github.com:gogits/gogs into dev 2014-04-04 10:34:18 -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
skyblue
bbadbbdf68 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-03 11:13:44 +08:00
skyblue
bfdadaa13c add oauth2 models 2014-04-03 11:13:35 +08:00
Martin Garton
4586c386e7 fix unique 2014-04-02 20:35:29 +01:00
Unknown
db66b8da72 Add release tmpl 2014-04-02 12:43:31 -04:00
Unknown
d9005ee970 Improve issue mail content 2014-04-02 10:38:30 -04:00
Lunny Xiao
a187ba9651 improved log locations 2014-03-31 21:26:15 +08:00
Unknown
2a0066420a Fix bug work with sqlite3 2014-03-30 16:01:50 -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
4c70249f75 fix some link 2014-03-30 17:03:00 +08:00
Lunny Xiao
af2129c254 bug fixed delete repo 2014-03-30 11:03:38 +08:00
Lunny Xiao
cd800d7837 Merge branch 'master' of github.com:gogits/gogs 2014-03-30 10:19:36 +08:00
Lunny Xiao
50391f434e bug fixed 2014-03-30 10:18:36 +08:00
slene
b27c34f39a update git api. fix link... and so on 2014-03-30 10:13:02 +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
ffa59739b6 Add edit issue 2014-03-29 10:24:42 -04:00
Unknown
2c073afbec Mirror fix and update 2014-03-29 10:01:52 -04:00
Lunny Xiao
ec1b801732 bug fixed 2014-03-29 19:59:02 +08:00
Unknown
8282828820 Fix action email bug 2014-03-29 07:50:25 -04:00
FuXiaoHei
d01820c125 conf support mysql port 2014-03-29 13:40:22 +08:00
Unknown
76b8642348 Bug fix 2014-03-28 09:06:48 -04:00
slene
d800a44a26 display commits by sha1 id 2014-03-28 19:34:01 +08:00
Unknown
0fd754bbe0 Working on install page 2014-03-28 07:26:22 -04:00
Unknown
eb6021f73f Fix issue pages URL params 2014-03-27 19:42:10 -04:00
Unknown
34f4af9ebf Working on issue and install page 2014-03-27 16:31:32 -04:00
Unknown
f76eb8a666 IP: RC Code Review 2014-03-27 15:24:11 -04:00
Unknown
3144fac03c IP: RC Code Review 2014-03-27 12:48:29 -04:00
slene
bce8586bc6 Merge branch 'master' of github.com:gogits/gogs 2014-03-28 00:32:19 +08:00
slene
16cb1e974c print err 2014-03-28 00:14:09 +08:00
slene
677643b812 fix read commit source 2014-03-28 00:07:22 +08:00
Unknown
f470c241d6 IP: RC Code Review 2014-03-27 11:37:33 -04:00
Unknown
ce679cce52 Update Wiki 2014-03-27 07:26:03 -04:00
Lunny Xiao
bc1abb010d bug fixed 2014-03-27 14:00:23 +08:00
Unknown
dd6246877d Almost done diff page 2014-03-26 16:41:16 -04:00
Unknown
4b9eef50c9 Add comment of issue 2014-03-26 12:31:01 -04:00
Unknown
32e05ae212 Fix issue: update hook text busy 2014-03-26 09:40:02 -04: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
78979c6d4c I need to rewrite this 2014-03-26 06:43:58 -04:00
Unknown
ac3a653442 Make it compile 2014-03-26 06:33:09 -04:00
Lunny Xiao
3a27a0c146 improved diff 2014-03-26 18:02:08 +08:00
Lunny Xiao
74b3c953de improved diff 2014-03-26 17:57:13 +08:00
Lunny Xiao
9dbc808c7b Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	models/repo.go
	modules/base/tool.go
	serve.go
 2014-03-26 14:38:14 +08:00
Lunny Xiao
f9024b3f43 fixed branch name 2014-03-26 14:14:48 +08:00
Unknown
06cf878471 More on diff page 2014-03-26 00:13:01 -04:00
Unknown
87de66561c Start working on diff page 2014-03-25 23:53:01 -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
Lunny Xiao
d374b13d44 bug fixed 2014-03-26 00:19:18 +08:00
Lunny Xiao
29fe44da50 bug fixed 2014-03-26 00:12:31 +08:00
Lunny Xiao
9b509054cf bug fixed 2014-03-26 00:00:36 +08:00
Unknown
197c4d4a5b Fix wrong serve command log location and commit repo action 2014-03-25 08:53:11 -04:00
Unknown
414ebe7553 Merge branch 'master' of github.com:gogits/gogs 2014-03-24 11:44:53 -04:00
Unknown
40b22822fc Update README 2014-03-24 11:44:47 -04:00
Lunny Xiao
0e28dcdac4 Merge branch 'master' of github.com:gogits/gogs 2014-03-24 22:30:50 +08:00
Lunny Xiao
48ea9b12f6 add log 2014-03-24 22:26:05 +08:00
Unknown
8aec5e16c4 Locating issue of git push not update repo last updated time 2014-03-24 09:32:24 -04:00
Unknown
ae92f92dee Locating issue 2014-03-24 09:01:25 -04:00
Unknown
59bbddb318 Mirror fix 2014-03-24 07:36:38 -04:00
Unknown
b9b82cfe47 Mirror updates 2014-03-23 19:09:11 -04:00
Unknown
f8cfb81fb0 Mirror updates 2014-03-23 12:16:17 -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
Lunny Xiao
97e82a0ff6 bug fixed 2014-03-23 20:04:26 +08:00
Lunny Xiao
3d1a967477 bug fixed 2014-03-23 19:53:50 +08: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
Lunny Xiao
24630e0c9b improved activity 2014-03-23 18:00:09 +08:00
Lunny Xiao
0119675480 bug fixed 2014-03-23 17:40:50 +08:00
Lunny Xiao
5c57a06c51 merge 2014-03-23 16:43:31 +08:00
Lunny Xiao
1201c6a9b4 bug fixed & more commits for push 2014-03-23 16:31:13 +08: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
Unknown
61e2922601 Working on issues 2014-03-22 13:50:50 -04:00
Unknown
e3f55ca0fb Need a field to specify if repository is bare 2014-03-22 11:59:14 -04:00
Unknown
76cd448e79 Add admin delete user 2014-03-22 06:20:00 -04:00
Unknown
19104f156f Merge branch 'master' of github.com:gogits/gogs 2014-03-22 04:45:03 -04:00
Unknown
932f717adb Fixing bug 2014-03-22 04:44:57 -04:00
Lunny Xiao
17da2fd2e3 merged 2014-03-22 00:50:47 +08:00
Lunny Xiao
efdaf6ee15 add http protocol clone support 2014-03-22 00:48:26 +08:00
Unknown
d40499e7fa Finsih mail resend limit 2014-03-21 10:09:57 -04:00
Unknown
c1576b4c40 Add admin add user 2014-03-21 03:27:59 -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
53a17bbd24 Bug fix 2014-03-20 16:14:50 -04:00
Unknown
06631ab91f Basic admin data table, models changes 2014-03-20 16:04:56 -04:00
Unknown
3b387336bf Add Repository/user name filter 2014-03-20 11:41:24 -04:00
Unknown
4a6c56d2fd Bug fix 2014-03-20 09:49:06 -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
24678d73f5 read single file 2014-03-20 13:31:24 +08:00
Unknown
ee92fb8635 Finish watch backend 2014-03-19 23:48:30 -04:00
Unknown
59ea3c0413 Finish watch backend 2014-03-19 23:39:00 -04:00
Unknown
a922c3ff6a Watch backend 2014-03-19 23:20:55 -04:00
Unknown
6f68620860 Pools limit concurrent nums 2014-03-19 21:05:48 -04:00
Unknown
35d473f04a Finish verify email 2014-03-19 12:50:44 -04:00
Unknown
dd8e7868ce Mirror fix 2014-03-19 10:01:45 -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
Lunny Xiao
7076f466c9 bug fixed 2014-03-19 16:42:50 +08:00
Lunny Xiao
01162bfc78 remove unused codes 2014-03-19 15:46:16 +08: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
shengxiang[skyblue]
ccd43b09b2 add some comment 2014-03-18 21:58:58 +08:00
Unknown
a3a93aef11 Add some config options 2014-03-18 01:33:53 -04:00
Unknown
d886f4df97 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	models/repo.go
	routers/repo/single.go
	templates/repo/single.tmpl
 2014-03-18 00:19:15 -04:00
Unknown
e44d9ffd89 Delete commit and update getlastcommit 2014-03-18 00:14:05 -04:00
Lunny Xiao
3ceb008e1f add commit view 2014-03-18 11:22:19 +08:00
Unknown
e656609b0d Bug fix 2014-03-17 17:00:35 -04:00
Unknown
6ca32ef44f Bug fix 2014-03-17 16:03:40 -04:00
Unknown
97b7cb0dca Bug fix 2014-03-17 15:58:32 -04:00
Unknown
971cd87cc6 Add log output 2014-03-17 15:47:27 -04:00
Unknown
9eabbe68a6 Bug fix 2014-03-17 15:32:33 -04:00
Unknown
e51afe4621 Add postgres support, clean code, code review 2014-03-17 14:03:58 -04:00
Unknown
9d3b003add Merge branch 'master' of github.com:gogits/gogs 2014-03-17 11:56:55 -04:00
Unknown
757e4f658c Completely rule out the cgo 2014-03-17 11:56:50 -04:00
Lunny Xiao
45a6444b1e add commits 2014-03-17 23:04:49 +08:00
Lunny Xiao
be8baea7ad bug fixed 2014-03-17 20:16:58 +08:00
Lunny Xiao
a30e72323d merge 2014-03-17 20:04:58 +08:00
Lunny Xiao
914ce405af bug fixed 2014-03-17 18:56:22 +08:00
slene
5bc2a1a6f9 show readme.md 2014-03-17 18:46:54 +08:00
slene
3a2eee0827 fix repo setting and delete repo 2014-03-17 14:36:28 +08:00
Unknown
0f68930892 Add latest commit in repo viewer 2014-03-17 00:57:18 -04:00
Unknown
685631627e Show branches in repo viewer 2014-03-16 23:43:22 -04:00
Unknown
48b2425c1d Push feed 2014-03-16 11:30:35 -04:00
Lunny Xiao
015174484a Merge branch 'master' of github.com:gogits/gogs 2014-03-16 23:03:27 +08:00
Lunny Xiao
1fb457ac1f commit format improved 2014-03-16 23:02:59 +08:00
Unknown
2fd3608388 Merge branch 'master' of github.com:gogits/gogs 2014-03-16 10:35:29 -04:00
Unknown
425a58afd6 Bug fix 2014-03-16 10:35:25 -04:00
Lunny Xiao
f824d6a4b1 Merge branch 'master' of github.com:gogits/gogs 2014-03-16 22:32:50 +08:00
Lunny Xiao
f620f23c35 add post update 2014-03-16 22:32:33 +08:00
slene
f6e32b1b08 finish delete ssh key and delete account. all with confirm. 2014-03-16 21:07:50 +08:00
Unknown
0754dd2f95 Add delete all feeds when delete account 2014-03-16 06:38:39 -04:00
Unknown
fb960db6af Add check if public key name has been used 2014-03-16 06:25:16 -04:00
Unknown
ca956d5cec Add generate fingerprint of ssh key 2014-03-16 06:16:03 -04:00
Unknown
c83657307e Fix delete SSH key in file 2014-03-16 05:53:06 -04:00
Unknown
bcafba47e8 Bug fix 2014-03-16 05:48:20 -04:00
Unknown
ab747f2790 Fix delete SSH key in file 2014-03-16 05:24:13 -04:00
Unknown
c3e0554fd7 Clean code 2014-03-16 02:53:41 -04:00
Unknown
50df58a893 Merge branch 'master' of github.com:gogits/gogs 2014-03-16 02:28:28 -04:00
Unknown
828c89de99 Clean code 2014-03-16 02:28:24 -04:00
Lunny Xiao
3035a38caa add update 2014-03-16 12:18:34 +08:00
Lunny Xiao
6bdd6f9b18 add size for file 2014-03-15 23:38:11 +08:00
Lunny Xiao
aa8b38fe35 refactoring for Repofile 2014-03-15 22:43:55 +08:00
Lunny Xiao
218cafed1d show folder first on file list page 2014-03-15 22:27:24 +08:00
Unknown
e9fdf1031d Clean code 2014-03-15 05:53:13 -04: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
Lunny Xiao
4470192c70 add pure go git lib to instead cgo git lib 2014-03-15 00:18:09 +08:00
Lunny Xiao
d80f43ca81 bug fixed 2014-03-14 23:57:14 +08:00
Lunny Xiao
b27e8e87f8 add tree view 2014-03-14 23:54:16 +08:00
Lunny Xiao
607303e4de add id 2014-03-14 22:36:22 +08:00
Unknown
47edf7f4f9 Finish update password and profile 2014-03-14 01:12:07 -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
Lunny Xiao
1902500b0d Merge branch 'master' of github.com:gogits/gogs 2014-03-13 14:50:32 +08:00
Lunny Xiao
3a1fa012f7 update repo page 2014-03-13 14:50:09 +08:00
Unknown
27104ac89a Add delete repo 2014-03-13 02:39:09 -04:00
Unknown
ea765d25e2 Update action struct 2014-03-13 02:09:36 -04:00
FuXiaoHei
f2ce1eebbb merge 2014-03-13 13:16:14 +08:00
FuXiaoHei
37fae304d3 single repository page ui, add spec handler to get repo 2014-03-13 13:14:43 +08:00
Unknown
3c67318d8f Add GetRepositoryByName and GetRepositoryById 2014-03-12 22:27:11 -04:00
Unknown
caf05599df Bug fix 2014-03-11 22:38:33 -04:00
Unknown
0b5f6b176f Bug fix 2014-03-11 22:09:33 -04:00
Unknown
12f81de349 Finish delete user 2014-03-11 11:40:47 -04:00
Lunny Xiao
23400dd0a2 add GetReposFiles 2014-03-11 18:10:19 +08:00
Lunny Xiao
b5cc4078a9 add repo list of dashboard 2014-03-11 14:17:05 +08: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
Lunny Xiao
5b5d54621e Merge branch 'master' of github.com:gogits/gogs 2014-03-11 12:18:56 +08:00
Lunny Xiao
f9907bbfa4 add README support for creating repository 2014-03-11 12:18:44 +08: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
Lunny Xiao
3ca7a33907 add del publickey 2014-03-10 17:15:02 +08:00
Unknown
0d9b2f3860 Update CreateRepository 2014-03-09 20:06:29 -04: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
Lunny Xiao
8e821c75d7 add publickey list 2014-03-07 11:34:41 +08: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
c6f2c23b05 Add binding form for register user 2014-03-06 02:21:44 -05:00
Unknown
e59f90b8fe Update 2014-03-03 19:03:08 -05:00
Unknown
3f849ddfab Merge branch 'master' of github.com:gogits/gogs 2014-03-02 15:25:14 -05:00
Unknown
e9487cb59c Update 2014-03-02 15:25:09 -05:00
Lunny Xiao
c8909d4758 add fork 2014-03-02 21:58:20 +08:00
Lunny Xiao
9c3a8ff299 add run user 2014-02-25 18:58:55 +08:00
Lunny Xiao
52984f85d5 add publickey 2014-02-25 18:30:48 +08:00
Lunny Xiao
d42c194aad add publickey 2014-02-25 16:13:47 +08:00
Lunny Xiao
bbf5345004 ssh push support 2014-02-25 15:28:04 +08:00
Lunny Xiao
f7826d4ed7 create repository from web 2014-02-25 15:11:54 +08:00
Lunny Xiao
3b8657d917 finished serve command 2014-02-25 14:01:52 +08:00
Unknown
594ec0b659 Add code of add public key 2014-02-20 16:51:03 -05:00
Lunny Xiao
104aa23a9e improved ssh supports 2014-02-20 17:52:07 +08:00
Lunny Xiao
b1b6def5bc improved ssh supports 2014-02-20 14:53:56 +08:00
Unknown
4b92a6c2df Add code of delete user 2014-02-19 13:04:31 -05:00
Lunny Xiao
be0ba9ea88 add ssh supports(unfinished) 2014-02-19 17:50:53 +08:00
Unknown
94311e187f Finish register user 2014-02-18 17:48:02 -05:00
Unknown
b455478df8 Finish register user 2014-02-18 17:31:16 -05:00
Unknown
3eb1ab9e8b Add UI for register user 2014-02-17 18:38:50 -05:00
Lunny Xiao
ee9bcf4d9f add publickey & access 2014-02-17 23:57:23 +08:00
Unknown
8ef198dfac Formatting 2014-02-14 18:16:54 -05:00
Lunny Xiao
237193ef2a add user models 2014-02-14 22:20:57 +08:00
Lunny Xiao
a30e5bcaf8 add createrepository & deleterepository 2014-02-13 23:23:23 +08:00
Unknown
4836fea876 Init commit 2014-02-12 12:49:46 -05:00