Unknwon
8061447f0e
#1114 'New Release' always visible
2015-03-24 19:20:36 -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
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
2bb982dada
#1080 : Remove footer ads/branding from default template
2015-03-23 10:19:19 -04:00
Unknwon
75cbb32b1e
UI compatibility
2015-03-21 09:24:59 -04:00
Unknwon
b6f8b486c7
add sr-only class, change to new tag line
2015-03-20 03:20:05 -04:00
Unknwon
62e436e6b7
Merge branch 'develop' of github.com:gogits/gogs into release/0.6.1
2015-03-20 01:58:28 -04:00
无闻
e312634286
Merge pull request #1091 from sapk/fix-ng-issue-pages
...
Apply ng to issue dashboard
2015-03-19 17:03:03 -04:00
Unknwon
1cb57b1a44
#1094 : fix locale
2015-03-19 15:26:04 -04:00
Antoine GIRARD
96a71aaed8
Apply ng to issue dashboard
2015-03-19 00:35:17 +01:00
Unknwon
e9c599b48a
prepare for 0.6 release
2015-03-18 07:00:55 -04:00
Unknwon
4aecaf7488
#1082 : missing link for help
2015-03-18 05:00:28 -04:00
Unknwon
82f7a01ded
#1064 : X-Gogs-Event header is empty
2015-03-18 04:51:02 -04:00
Unknwon
33894591a6
#851 : Edit Account does not take into consideration password rules
2015-03-17 03:21:58 -04:00
Unknwon
588f3215c6
#1040 : dashboard no longer accessible when repo is missing
2015-03-16 04:04:27 -04:00
Unknwon
471b8a18ab
Revert "Merge pull request #1047 from ndarilek/accessibility-fixes"
...
This reverts commit c226e92284
, reversing
changes made to 80b23854bc
.
2015-03-15 22:24:41 -04:00
Nolan Darilek
25dd6f8fa0
Add additional accessibility text to repository navbar.
2015-03-14 12:30:14 -05:00
Nolan Darilek
37ab32b613
Various accessibility fixes, mostly labeling icons.
2015-03-14 09:55:04 -05:00
Unknwon
08cd20bad9
Merge branch 'develop' of github.com:gogits/gogs into develop
2015-03-13 15:41:59 -04:00
Unknwon
96a95e9dfd
#988 : fix one missing duplicated prefix
...
- update some locale files
2015-03-13 15:41:51 -04:00
Sternik
d0e34c57cc
Fix for deleting user when gogs instalation is on http://hostname/gogs
2015-03-13 20:17:20 +01:00
Unknwon
0720d3988f
#988 : GetRepoLink already contains AppSubUrl
2015-03-12 16:01:23 -04:00
Unknwon
4aafeace23
fix HTTP/HTTPS push update func call panic #1037 and `http: multiple response.WriteHeader calls`
2015-03-12 01:15:01 -04:00
Unknwon
34102f7889
remove unused scripts and simplify migrate form definition
2015-03-11 09:21:05 -04:00
Filippo Valsorda
5d5d774e03
Handle submodules without a .gitmodules entry - fix #1023
2015-03-10 03:08:17 +00:00
Unknwon
4b9fb43a70
home: new UI
2015-03-07 15:12:13 -05:00
Unknwon
b447d18dca
cmd/serve.go: remove useless code
2015-03-01 18:43:28 -05:00
Unknwon
b0b11fd7b1
Merge branch 'access' of github.com:gogits/gogs into dev
2015-02-28 21:50:29 -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
无闻
cd8b43d984
Merge pull request #915 from Lafriks/dev
...
Get username, name, surname and e-mail from LDAP server
2015-02-23 13:41:29 -05:00
Unknwon
ee68a826a5
v4 migration, merge 'dev', clean code and mirror fix
2015-02-23 02:15:53 -05:00
Unknwon
10e4b5b6c6
Merge branch 'access' of github.com:gogits/gogs into access
2015-02-22 22:55:35 -05:00
Unknwon
7ccab9cd09
Merge branch 'dev' of github.com:gogits/gogs into access
...
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
2015-02-22 22:51:25 -05:00
Unknwon
04164eada3
models: able to rename user with diff letter cases #981
...
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
Unknwon
059338139c
routers: able to migrate repo from local path
...
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
Unknwon
c753fdceaf
templates/org/home.tmpl: fix org member can't see public repo
2015-02-22 03:07:04 -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
Alexey Makhov
d2f439a241
fix typo mistake
2015-02-19 10:19:10 +03:00
Alexey Makhov
c0ad512398
remove not using vars
2015-02-19 00:55:17 +03:00
Alexey Makhov
563e8b4ea9
gitlab-like hash naming
2015-02-19 00:52:22 +03:00
Stefan-Code
b508fb041f
Merge branch 'dev' of https://github.com/gogits/gogs into dev
2015-02-18 11:12:41 +01:00
Stefan-Code
1628ef4ba5
changed repo-clone-url behaviour for bare repo
2015-02-18 08:22:13 +01: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
685ed1f807
models: fix XORM API break
...
cmd/web.go: check version after load config
2015-02-14 17:01:33 -05:00
Unknwon
6b7d35eade
fix mirror issues uncaught #941
2015-02-13 02:14:57 -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
Unknwon
7e7160eefd
first pass work on migration #925
2015-02-11 21:58:37 -05:00
无闻
0af74b36ad
Merge pull request #937 from Stefan-Code/dev
...
Changes to repo-header-download-drop
2015-02-11 12:27:29 -05:00
Unknwon
d02e45f985
better naming on #891
2015-02-11 12:04:01 -05:00
Stefan-Code
e5d6f4ce56
Changes to repo-header-download-drop, different repo-clone-url input behaviour
2015-02-11 07:28:51 +01:00
Unknwon
6a23252edc
able to allow insecure certification of webhook for #891
2015-02-10 21:06:59 -05:00
Unknwon
7d3932b9cd
templates/ng/base: change year to 2015, fix #928
...
- conf/locale: update Japanese locale
2015-02-09 11:04:17 -05: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
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
0669897226
modules/base: fix markdown mention regex for #826
...
- conf/locale: add mew translator profile
2015-02-06 19:15:58 -05:00
Tony Tsang
fc6d80d619
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-06 17:02:32 +08:00
Raphael Randschau
3c65265871
Hide the registration button depending on the setting
2015-02-05 18:15:00 +01:00
Raphael Randschau
79f3281548
Add ShowRegistrationButton configuration option
2015-02-05 18:14:54 +01:00
Unknwon
f706102890
models: sanitize user full name when update settings
2015-02-04 20:04:01 -05:00
Unknwon
7140f50637
public/ng/js: script fix on #901
2015-02-04 19:52:31 -05:00
Alexey Makhov
e91b28eb9b
little fix
2015-02-04 22:06:40 +03:00
Alexey Makhov
5d4425bbbc
add multifile support to diff view highlighting
2015-02-04 21:54:45 +03:00
Alexey Makhov
7f71fe9dae
fix diff lines highlighting
2015-02-04 12:41:35 +03:00
Alexey Makhov
a7662f4a39
fix error at admin/config
2015-02-03 17:26:56 +03:00
Unknwon
8e238058b2
public/ng/css: code fix on #895
...
- templates/user/settings: fix email panel nav highlight
2015-02-03 06:54:29 -05:00
Unknwon
26bccef297
Merge branch 'master' of github.com:gogits/gogs into dev
2015-02-03 06:51:44 -05:00
Alexey Makhov
e43bd15b96
fix settings/email html&css
2015-02-03 10:32:55 +03:00
Unknwon
bfce0def25
modules/base: fix README filename checker, fix #877
2015-02-02 23:04:36 -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
Tristan Storch
4c4488213a
correction: updated docker link
2015-02-01 20:30:22 +01: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
3d9cda2d98
public/ng: fix auto-completion #832
2015-02-01 08:46:53 -05:00
Unknwon
faddaff90d
templates: fix commit message render issue #828
2015-01-31 15:31:09 -05:00
Unknwon
32152d2363
routers/repo: set raw page content type to 'text/plain' #828
2015-01-31 15:27:57 -05:00
Unknwon
37fcc8daf2
modules/base: add RenderCommitMessage with XSS-safe and special links
...
- update russian locale
2015-01-30 18:05:20 -05:00
Unknwon
8e384ce46c
fix #828 , may cause unintentional break in other features, but security is no.1
2015-01-20 13:08:49 +08:00
Unknwon
d5c6b53571
use new Redis client
2015-01-03 02:54:22 +08:00
Peter Smit
fd70f9ec1b
Fix #799 by adding a tooltip for all dates in all settings/panels
2015-01-02 12:41:05 +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
63c1f9a23f
fix 500: E-mail already used in user settings page
2014-12-29 20:00:07 +08:00
Unknwon
81a44e4cd0
fix API changes
2014-12-28 20:40:35 +08:00
fuxiaohei
c0cfd62b90
add label-edit and label-delete logic
2014-12-22 21:26:05 +08:00
Unknwon
ebbe6177a9
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-12-22 03:44:52 -05:00
Unknwon
97b39ae2e4
fix invite bug(shouldn't include full name to search box)
2014-12-22 03:44:49 -05:00
Peter Smit
8b31be43c6
Forgot to i18n "Primary"
2014-12-22 09:41:29 +02:00
Peter Smit
21dbcb7c77
Create English locale keys for multiple e-mails feature
...
Also, change all current 'emails' to 'e-mails'.
Still todo: some CSS for the user/settings/email page, but that is not my specialty
2014-12-22 09:11:30 +02:00
无闻
a18decf4cc
Merge pull request #755 from phsmit/multiple_emails
...
Multiple emails
2014-12-20 22:47:05 -05:00
Unknwon
57b3be4016
work on #756
2014-12-17 23:04:05 -05:00
Peter
b033f2f535
Finish method for having multiple emails/user.
...
All basics are implemented. Missing are the right (localized) strings
and the page markup could have a look at by a frontend guy.
2014-12-17 17:42:54 +02:00
Peter
f34b04cfc0
Template for email activation email
2014-12-17 17:42:31 +02:00
Unknwon
1a5aa5e0c0
fix #741
2014-12-16 02:28:57 -05:00
Unknwon
9803c421f5
fix binding api broken
2014-12-15 01:49:59 -05:00
Unknwon
c9e0b3b987
prepare for 0.5.9
2014-12-13 20:32:30 -05:00
Unknwon
b553ea45ee
modes/repo: incorrect SSH clone URL for #742
2014-12-13 16:46:00 -05:00
Unknwon
ac4a10456e
api: able to create repo and fix #726
...
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon
2f3a7e53cb
fix #735
2014-12-12 01:29:36 -05:00
Unknwon
42c7bb7529
mirror code clean
2014-12-11 18:55:09 -05:00
Unknwon
bc8721fb6c
Finish new UI for release page
2014-12-10 16:37:54 -05:00
Unknwon
9ee80e3e54
fix compile error
2014-12-10 05:10:26 -05:00
Unknwon
9a1fe801e5
fix #711
2014-12-09 02:18:25 -05:00
fuxiaohei
0daef29053
add label-create ui elements
2014-12-07 21:29:37 +08:00
Unknwon
069486d169
fix #165
2014-12-05 17:54:57 -05:00
dennis-smurf
528c075ad6
Added issue link rendering in commit messages
2014-12-05 11:02:52 +01:00
Tony Tsang
d4a1d9f82a
Display multi-line commit message on commit diff page.
2014-12-05 10:53:37 +08:00
fuxiaohei
0af3a5b603
add issue list filter ui
2014-12-04 23:22:16 +08:00
Unknwon
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
Unknwon
db4951bc61
mirror fix on oauth2
2014-11-28 21:38:35 -05:00
Unknwon
d6132aaa88
fix oauth2
2014-11-28 21:20:13 -05:00
无闻
9adc8e9d3f
Merge pull request #683 from jcracknell/admin-repos-cols
...
Fix swapped issue/star columns in /admin/repos
2014-11-28 15:28:08 -05:00
James Cracknell
64d90a761b
Fix swapped issue/star columns in /admin/repos
2014-11-28 12:40:02 -07:00
James Cracknell
4d123d0a93
Fix user links
2014-11-28 11:53:00 -07:00
Unknwon
9c2120eb34
fix #675
2014-11-27 21:36:12 -05:00
Unknwon
a43164877c
fix #664
2014-11-25 23:05:43 -05:00
fuxiaohei
23d53561d1
update milestone page design
2014-11-24 23:13:42 +08:00
Unknwon
0cce61de3a
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-11-24 09:54:22 -05:00
Unknwon
5b96e3fcc7
fix #660
2014-11-24 09:54:08 -05:00
fuxiaohei
79dae254cf
add milestone page design
2014-11-24 22:33:04 +08:00
Unknwon
dc53270da9
Fix 653
2014-11-22 10:22:53 -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
0c92da7e9c
fix invalid user links in admin panels
2014-11-19 21:19:37 -05:00
Unknwon
2d8c414f8c
Fix #635
2014-11-18 19:05:33 -05:00
Unknwon
37d8d3afe9
more APIs on #12
2014-11-18 11:07:16 -05:00
Unknwon
32dcaefafa
fox #620
2014-11-17 14:53:41 -05:00
fuxiaohei
d1a60e3643
add pull-request and labels page design
2014-11-17 23:07:34 +08: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
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
4f360d8f08
Fix #617 and update Germeny locale
2014-11-11 15:30:11 -05:00
Unknwon
e0de6cb5ad
work on #616 and update locales
2014-11-10 05:30:07 -05:00
Unknwon
35977cd34c
continue work on #255
2014-11-07 16:44:25 -05:00
Unknwon
abc57b6e43
work on #609
2014-11-07 14:46:13 -05:00
Unknwon
23eec25274
Fix #605 , fix #255 , fix #101
2014-11-06 22:06:41 -05:00
Unknwon
4e7eb5be9d
Work on #5 fork and fix #608
2014-11-05 23:30:04 -05:00
Unknwon
b375192352
fix tpl error
2014-11-04 12:07:43 -05:00
Unknwon
0c5ba4573a
fix session API broken and SQL pretection
2014-11-04 11:37:15 -05:00
fuxiaohei
b866dc92d7
finish issue list ui draft
2014-11-04 21:58:28 +08:00
Unknwon
e9875edcad
Update gopmfile
2014-11-02 10:57:29 -05:00
Unknwon
c7f56d7483
Fix #584
2014-10-27 11:18:00 -04: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
Eryx
8209bf74f8
Fix #575
2014-10-20 11:44:11 +08:00
Unknwon
d88ebd9a4b
Fix #554
2014-10-19 02:22:38 -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
Unknwon
3abc41ccca
Fix API broken
2014-10-18 23:26:55 -04:00
fuxiaohei
9e3a1bc11a
add nav bar in issue list
2014-10-18 22:52:34 +08:00
Unknwon
1aa12c7452
Fix #572
2014-10-15 16:28:38 -04:00
Unknwon
ecf3eb4307
Fix #570
2014-10-15 07:55:20 -04:00
Unknwon
9ae92459a5
Fix repo css and rel path img in md
2014-10-14 23:44:34 -04: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
451f328a4c
Fix #457 and fix #557
2014-10-13 03:07:47 -04:00
Unknwon
3005c4f6db
Fix diff css style, hooks \r char
2014-10-11 18:20:07 -04:00
Unknwon
963354c5d7
Add raw, history file button, and other mirror fixes
2014-10-11 18:02:48 -04:00
Vyacheslav Bakhmutov
5103f16f78
add omitted lang
2014-10-11 13:43:21 +07:00
Unknwon
3600498c8f
Add push tag action
2014-10-10 21:58:13 -04:00
Unknwon
b2632dec09
Page: Compare 2 commits
2014-10-10 21:40:51 -04:00
Unknwon
41dbb4c148
Hide org member in collar page
2014-10-10 06:15:27 -04:00
Unknwon
d78abd3561
Mirror fix on admin/orgs paging
2014-10-10 03:28:21 -04: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
39931f8e00
Allow mail with self-signed certificates
2014-10-09 18:08:07 -04:00
Unknwon
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
Vyacheslav Bakhmutov
ce7422473a
add omitted lang
2014-10-08 12:27:05 +04:00
Unknwon
fc18741cc7
Fix #524
2014-10-07 07:02:53 -04:00
Unknwon
64c68220d2
Fix #264
2014-10-06 17:50:00 -04:00
Unknwon
91e5c24a31
Fix #522
2014-10-06 10:36:32 -04:00
Unknwon
263d409326
Basic xss prevention
2014-10-04 17:15:22 -04:00
unknown
1031271224
Add German translation to home page
2014-10-04 21:33:32 +02: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
f03b6be8f9
Work on #516
2014-10-01 07:40:48 -04:00
Unknwon
2a031c1365
Fix #515
2014-09-30 04:39:53 -04:00
Unknwon
a046a31d2b
UI: Confirmation box
2014-09-29 18:52:28 -04:00
Unknwon
3cfa4a581c
Bug: 500 when transfer repository to collaborator
2014-09-29 04:04:48 -04:00
Unknwon
5e747bc877
Clean old dockerfiles
2014-09-28 03:31:50 -04:00
Unknwon
11af8658cf
Simple fix
2014-09-28 01:54:25 -04:00
Unknwon
e3b78c47e2
Merge branch 'master' of github.com:gogits/gogs
...
Conflicts:
public/ng/less/gogs/repository.less
templates/repo/home.tmpl
2014-09-28 01:44:09 -04:00
Unknwon
49193bebd2
UI: Confirmation box
2014-09-28 01:38:25 -04:00
fuxiaohei
7d48f811f1
add issue router for new issue page ui preview
2014-09-27 19:03:07 +08:00
fuxiaohei
e3a27aeb25
template and ui fix
2014-09-27 17:31:44 +08:00
fuxiaohei
dccc50e9d4
template and ui fix
2014-09-27 17:08:57 +08:00
Unknwon
ad2ab6d214
Add modal to change username
...
Signed-off-by: Unknwon <joe2010xtmf@163.com>
2014-09-26 22:33:30 -04:00
Unknwon
b8368f98ff
Add directory level commit message
2014-09-26 08:55:13 -04:00
fundon
54724c33ec
no neet for md5 email
2014-09-26 13:46:51 +08: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