Commit Graph

341 Commits

Author SHA1 Message Date
Andrew Boyarshin dc8248f8a4 Markdown rendering overhaul (#186)
* Markdown rendering overhaul

Cleaned up and squashed commits into single one.

Signed-off-by: Andrew Boyarshin <boyarshinand@gmail.com>

* Fix markdown API, add markdown module and API tests, improve code coverage

Signed-off-by: Andrew Boyarshin <boyarshinand@gmail.com>
2017-02-14 09:13:59 +08:00
Bo-Yi Wu 40f4377717 feat: fill in ssh key title automatically. (#863) 2017-02-09 17:58:04 +08:00
Lunny Xiao f35b20b042 track issue title changes (#841) 2017-02-05 22:36:00 +08:00
Shyim de81f68d4d Fixed form control is not focusable #687 (#837) 2017-02-04 14:02:24 +08:00
Lunny Xiao 081485ecfd add milestone changed traker on issue view (#804) 2017-02-01 10:36:08 +08:00
Lunny Xiao 77ab60df83 fix bug caused by #788 (#799) 2017-01-30 22:21:17 +08:00
Lunny Xiao f94869d2d1 Track labels changed on issue view & resolved #542 (#788)
* track labels changed on issue view & resolved #542

* add missing head comment & sort & fix refresh
2017-01-30 20:46:45 +08:00
Bo-Yi Wu d078aa30d6 feat: add search repository on dashboard. (#773) 2017-01-30 13:57:47 +08:00
Kjell Kvinge f9a3aa8737 add scroolbars to wide graphs. (#608)
* Add scrollbars to graph and revlist if needed.

* Add border
2017-01-22 20:10:01 +08:00
Andrey Nering d2bb8ef503 Notifications: trying to get a better layout (#660)
* i18n button titles

* Improvements on notification page layout

* Notification count badge fixes

* Make table <tr> clickable

* Fix octicon aligment

* Fix use of AppSubUrl
2017-01-18 09:18:55 +08:00
Shyim 88f45ce38c Fix #646 (#669) 2017-01-14 21:07:43 +08:00
Kazuki Sawada e5620f07a4 Fix: Issues cannot be created with labels (#622)
Signed-off-by: Kazuki Sawada <kazuki@6715.jp>
2017-01-10 21:57:03 +08:00
vz 19570f2d43 Fix install.tmpl input default value (#611)
* Fix install.tmpl input default value

* Update db_user to gitea

* Add when INSTALL_LOCK = false
2017-01-09 17:16:10 +08:00
Bwko 9ccc3698d5 Fix wrong anchors for non-latin headings (#3981) (#512)
Change Javascript regular expression to match non-latin characters
The regex comes from here: http://stackoverflow.com/questions/150033/regular-expression-to-match-non-english-characters#comment22322603_150078

And this patch should fixed these two issues: #3919 #3843
2016-12-31 18:06:09 +08:00
Kjell Kvinge 22e1bd31c6 commithgraph / timeline (#428)
* Add model and tests for graph

* Add route and router for graph

* Add assets for graph

* Add template for graph
2016-12-29 07:44:32 +08:00
btrepp 25b5ffb6af Enables mssql support (#383)
* Enables mssql support

Port of dlobs work in gogs.
Enables options in index.js
Enables MSSQL as a database option in go.
Sets ID to 0 on initial migration. Required for
MSSQL insert statements.

Signed-off-by: Beau Trepp <beautrepp@gmail.com>

* Vendors in denisenkom/go-mssqldb

Includes golang.org/x/crypto/md4
as this is required by go-msssqldb

Signed-off-by: Beau Trepp <beautrepp@gmail.com>
2016-12-24 09:37:35 +08:00
Bwko 39d0db52de Fix for #361, renamed username to login 2016-12-07 15:56:43 +01:00
Joubert RedRat 28bee28102 Replace Gogs to Gitea in installation options 2016-11-07 13:26:19 -02:00
Joubert RedRat ff54e4d929 Set default less and css to new default name 2016-11-04 08:53:18 -02:00
无闻 cd9b926af7 Support Editorconfig on web editor (#3512) 2016-08-30 16:47:22 -07:00
Andrey Nering 9ac46fb983 Support Editorconfig on web editor 2016-08-30 20:30:47 -03:00
Unknwon c0c1a4b01b js: fix comment issue status button title change 2016-08-30 14:37:46 -07:00
Unknwon 0114fdcba4 Web editor: improve delete file process 2016-08-28 01:41:44 -07:00
Unknwon f8a48ffaad Web editor: improve code quality 2016-08-24 21:35:03 -07:00
Unknwon 7f7216be6e Code quality improvement on JS 2016-08-17 22:44:07 -07:00
Unknwon ec332cf903 Minor naming improvement 2016-08-17 16:10:07 -07:00
Unknwon a00c932bbc General code quality improvement 2016-08-16 23:06:38 -07:00
Unknwon 4a19fd6441 Web editor: temporarily disable upload and quick fix for edit and new
Try to merge into develop branch ASAP, then continue minor fixes afterwards.
2016-08-15 01:42:20 -07:00
Unknwon 15845cb287 Code clean up for new config options 2016-08-14 23:52:24 -07:00
Richard Mahn d0a0239bac Squashed commit of the following:
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

    Removed Upload stats as the upload table is just a temporary table

commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600

    Fix for CodeMirror mode

commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600

    Made tabbing in editor use spaces

commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600

    Fix for data-url

commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600

    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file

commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600

    Code cleanup

commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600

    Code cleanup

commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600

    Code cleanup and fixes

commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600

    Fixes per Unknwon's requests

commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go

commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600

    Fix in gogs.js

commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600

    Update for using CodeMirror mode addon

commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600

    Update for Edit

commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go

commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600

    Feature for editing, creating, uploading and deleting files
2016-08-14 23:52:24 -07:00
Rory McNamara c8b45ecc27 Render the Code view on the server (minus syntax highlighting) (#2942)
* render code view server side

* remove debug print

* fix multiline selection bug

* change string concatenation to bytes.Buffer for efficiency

* Fix newlines added by previous for hljs

* fix selection highlighting

* make css changes in .less
2016-08-09 12:35:20 -07:00
Unknwon 99385db0c4 #3320 code cleanup 2016-08-07 11:01:47 -07:00
Unknwon 72dd299ca0 Update .gitattributes 2016-08-06 10:36:40 -07:00
Unknwon 991ce42c48 #2162 improve repository advance options UI display
Enable/disable input based on user chosen options for wiki and issue tracker.
2016-07-31 01:26:43 +08:00
Unknwon 4d8b905541 models/ssh_key: code cleaning 2016-07-26 10:47:25 +08:00
Unknwon 899e799459 #1601 support delete issue comment 2016-07-26 02:48:17 +08:00
Unknwon c2fb01a257 #3299 don’t pop up confirm box when leave on signin page 2016-07-21 14:36:26 +08:00
Unknwon 401bf944ef Use SecurityProtocol to replace UseSSL in LDAP config
Initially proposed by #2376 and fixes #3068 as well.
2016-07-08 07:25:09 +08:00
Unknwon 326c982660 Upgrade frontend assets 2016-07-07 06:04:55 +08:00
Kim Carlbäcker b3c05026df [Feature/WIP] Confirm on editing forms (fixes #2881) (#2980)
* Add and start jQuery AreYouSure

* Update SimpleMDE to 1.10.1 for `forceSync` support

* Forgot to remove old version SimpleMDE 1.10.0

* formatting -.-
2016-04-19 16:45:28 -04:00
PsychoMario b35157f4ff reduce line number creation to one DOM manipulation 2016-03-30 20:28:40 +01:00
Unknwon 0c9a616326 Update frontend resources 2016-03-07 00:11:12 -05:00
Unknwon 045f14fbd0 #1146 finsih UI work for access mode of collaborators
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
2016-03-05 18:08:42 -05:00
Unknwon a2f13eae55 #1157 some avatar setting changes
- Allow to delete current avatar
2016-03-05 00:51:51 -05:00
Andrey Nering 13e71acadf Render emojis in more places. 2016-03-02 21:54:05 -03:00
Florian Kaiser eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00:00
Florian Kaiser 0d41827f23 Fix syntax highlighting for markdown code blocks on issue description/comment save 2016-02-01 22:50:22 +00:00
Unknwon 66d2ba1b4e Merge pull request #2537 from fnkr/remember-clone-protocol
Remember last selected clone protocol
2016-02-01 15:58:01 -05:00
Florian Kaiser 84749736a8 Select HTTPS if remembered clone protocol is SSH but SSH is disabled now 2016-02-01 20:42:10 +00:00
Florian Kaiser 3e0a27157c Make highlighted markdown code blocks work on issue pages 2016-02-01 19:53:58 +00:00
Florian Kaiser d568019306 Remember last selected clone protocol, and establish uniform order (https, ssh) 2016-02-01 17:04:58 +00:00
Unknwon 8436d69eaf Update and reorganize front-end resources 2016-01-30 22:10:20 -05:00
Unknwon 7436ce6403 emojify.js: ignore_emoticons 2015-12-14 06:04:24 -05:00
Unknwon ed001d70e4 #2171 fix wiki preview does not work on Firefox 2015-12-13 17:55:13 -05:00
Unknwon 71123c816d update hightlight.js 2015-12-13 00:58:30 -05:00
Unknwon 7a3eccc709 Drop 0.5.x support 2015-12-10 19:52:06 -05:00
Angus Gibson 9bd3ebe207 Dropdown on commits page to choose branch #1846
I've mostly duplicated the dropdown code from repo/home.tmpl, which
basically only required a change to the URL. This could probably be
broken out into something more modular.
2015-12-09 16:37:04 +11:00
Unknwon 404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon 98e989d52c minor JS and UI fix 2015-12-03 15:01:15 -05:00
Unknwon e42fcb033d wiki: finish edit 2015-11-27 01:50:38 -05:00
Unknwon 2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Andrey Nering 880849a283 Fixing Dropzone should accept all files when config is "*/*". 2015-11-23 13:46:58 -02:00
Unknwon e6b2a01e5d minor JS fix 2015-11-22 02:29:20 -05:00
Unknwon 52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon b80e848d02 upgrade libs 2015-11-21 21:09:18 -05:00
Unknwon ff5f14431e fix #1448 2015-11-17 02:18:05 -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 6a664e88c7 #1854 show issue content 2015-11-13 12:11:45 -05:00
Unknwon 0f438ef0b3 new dashboard ui 2015-11-13 12:05:48 -05:00
Unknwon 020fb43b77 space bar as click 2015-11-11 18:44:39 -05:00
Unknwon 908f2924ce fix #1824 and fix #1917 2015-11-11 16:19:28 -05:00
Unknwon 92535c9df0 update some libs 2015-11-02 02:00:12 -05: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 4465c58f4b new quick start page 2015-10-02 19:58:36 -04:00
Unknwon d9c5b3bcee #1659 fix change label title resets color 2015-09-18 06:18:31 -04:00
Unknwon 5f1183cecf #697 add install option 2015-09-13 12:14:32 -04:00
Unknwon 83e747bfda #697 and #1606 and new admin edit user UI 2015-09-13 11:07:21 -04:00
Unknwon 8e0a69f86a #697 disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon 0617448282 finish new add auth UI 2015-09-10 17:11:41 -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 24658fcbdd #633 dix suburl 2015-09-06 06:57:25 -04:00
Unknwon 46dce2d653 fix emoji edit not rendered 2015-09-05 14:18:02 -04:00
Unknwon 3b0c2cb480 #633 Add Emoji support 2015-09-05 14:11:05 -04:00
Unknwon d023e81a8f #1577 explore paginator problem 2015-09-04 05:54:22 -04:00
Unknwon 768c78d143 update semantic 2015-09-02 17:53:11 -04:00
Unknwon dde9ace91b fix rename repo JS 2015-09-01 09:37:41 -04:00
Unknwon ee3e0c3c49 fix dropdown search 2015-08-31 17:10: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 302938e646 #1333 Disable Gravatar option when install 2015-08-30 00:22:26 +08:00
Unknwon f509c59ac1 new create webhook event 2015-08-28 23:36:13 +08:00
Unknwon a7686e8749 #1203 bundle jquery with gogs 2015-08-28 14:24:05 +08:00
Unknwon 70e0153b93 add highlight js 2015-08-27 23:58:50 +08:00
Unknwon 23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon 4275b3720a finsih diff and compare 2015-08-21 00:18:30 +08:00
Unknwon 371572cf5f allow edit issue and comment 2015-08-20 04:31:28 +08:00
Unknwon 87f5ca8e1f able edit issue title 2015-08-19 23:14:57 +08:00
Unknwon 4c7b6414eb new access token UI 2015-08-19 03:36:16 +08:00
Unknwon 2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon 2e30b421b4 comletely remove v1 UI files of Gogs 2015-08-15 19:07:21 +08:00
Unknwon c8bb475abb fix autocomplete on migration 2015-08-15 18:16:39 +08:00
Unknwon e633425f27 #1180 and #1250: migration 2015-08-15 16:03:20 +08:00
Unknwon cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
Unknwon 1fb53067f4 finish close/reopen issue 2015-08-13 23:21:43 +08:00
Unknwon 34f6cbfc2a finish attachments when create issue 2015-08-11 23:24:40 +08:00
Unknwon 89c2bd4a0d finish create issue attachment UI 2015-08-11 17:54:00 +08:00
Unknwon 17f3e840ec fix cannot parse JSON for attachments 2015-08-11 12:44:14 +08:00
Unknwon 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
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 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 43a87b0caf auto-redirect when finish filter branch 2015-08-08 23:12:23 +08:00
Unknwon dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +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
Fernando San Julián eebcbf9d34 add clipboard API support 2015-08-03 21:27:15 +02:00
Unknwon 04458d49a0 milestone: list view 2015-08-03 17:42:09 +08:00
Fernando San Julián b92bb77b54 autofocus for new and edit issue forms 2015-07-31 22:12:33 +02: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 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 ffd17924fd update UI framework 2015-07-07 13:51:28 +08:00
Unknwon 4b9fb43a70 home: new UI 2015-03-07 15:12:13 -05:00
Unknwon 3d9cda2d98 public/ng: fix auto-completion #832 2015-02-01 08:46:53 -05:00
Deiwin Sarjas 54ef1cee1d add full name to found users' list 2014-12-02 16:55:52 +02:00
Vyacheslav Bakhmutov 2a7a03e5b3 take params for milestone and assignee from query instead of path args 2014-09-03 00:04:22 +07:00
Tristan Storch 69e332f432 Removed trailing white spaces
Removed trailing whitespaces with

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

and some handwork.
2014-08-30 15:12:53 +02:00
Justin Nuß 2cb754b5af Fix wrong selector for AJAX issue creation. 2014-08-04 11:02:29 +02:00
无闻 568c9b353e Merge pull request #311 from nuss-justin/issue/281
Fix #281. Add mouse-over precise time and on-click switch listener.
2014-08-01 00:15:06 -04:00
无闻 02a81ddb62 Merge pull request #332 from acusti/dev
Styling plus a couple small fixes for issue attachments (& misc cleanup)
2014-07-26 13:55:32 -04:00
Justin Nuß 91480f3791 Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
	modules/base/tool.go
2014-07-26 11:23:58 +02:00
无闻 0a739cf9ac Merge pull request #325 from nuss-justin/dev
Remove 'None yet' message when adding first label to issue.
2014-07-25 20:58:31 -04:00
Andrew Patton 6407caa761 Semicolons for consistency ;); 2014-07-25 17:51:41 -04:00
Andrew Patton ef8eef7519 Trivial cleanup
using `event.preventDefault` instead of `return false` for being more
explicit
2014-07-25 17:51:18 -04:00