lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4190 commits 1 branch 0 tags 229 MiB
Commit graph

1238 commits

Author SHA1 Message Date
Unknwon
ff5f14431e fix #1448 2015-11-17 02:18:05 -05:00
Unknwon
9ab96172fc new watchers, stars and forks UI 2015-11-16 23:28:46 -05:00
Unknwon
e06558e208 #1922 Pull request fail to merge with BIN 2015-11-16 21:18:04 -05:00
Unknwon
bb1fbe4e70 octicon fix in feeds 2015-11-16 11:39:48 -05:00
Unknwon
5dc3dd1704 fix #1960 2015-11-16 11:11:59 -05:00
Unknwon
134d8e7681 work on #1961 2015-11-16 10:14:12 -05:00
Unknwon
18de67380c fix #1958 2015-11-15 23:52:46 -05:00
Unknwon
1a901433e2 minor fix for #1949 2015-11-15 17:37:26 -05:00
Unknwon
e030109b5a fix api broken 2015-11-15 17:07:44 -05:00
Unknwon
35d49d3b34 Merge pull request #1949 from TheHowl/develop 
Fix bad issue links in non-readme markdown files
 2015-11-15 16:23:55 -05:00
Howl
ca5678da32 Safely detect urlPrefix in the format /:owner/:repo 2015-11-15 22:22:25 +01:00
Unknwon
4f03b81ec7 #1931 Test patch does not checkout correct base branch 2015-11-15 14:41:36 -05:00
Unknwon
b4970b3cc3 fix #1948 2015-11-15 14:05:51 -05:00
Howl
85c58eba90 Fix bad issue links in non-readme markdown files 2015-11-15 12:04:43 +01:00
Unknwon
7c80eba77f minor UI fix and fix ssh race 2015-11-14 13:21:31 -05:00
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