test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity
14,874 Commits 15 Branches 204 Tags 10 GiB
Commit Graph

465 Commits

Author SHA1 Message Date
Unknwon b73318bc62 Fix 404 when comment on pulls and not using interal issue tracker 2016-08-08 11:29:50 -07:00
Sandro Santilli 90dd0657b5 Add support for federated avatars (#3320) 
* Add support for federated avatars

Fixes #3105

Removes avatar fetching duplication code
Adds an "Enable Federated Avatar" checkbox in user settings
(defaults to unchecked)

Moves avatar settings all in the same form, making
local and remote avatars mutually exclusive

Renames UploadAvatarForm to AvatarForm
as it's not anymore only for uploading

* Run gofmt on all modified files

* Move Avatar form in its own page

* Add go-libravatar dependency to vendor/ dir

Hopefully helps with accepting the contribution.
See also #3214

* Revert "Add go-libravatar dependency to vendor/ dir"

This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82.

* Make federated avatar setting a global configuration

Removes the per-user setting

* Move avatar handling back to base tool, disable federated avatar in offline mode

* Format, handle error

* Properly set fallback host

* Use unsupported github.com mirror for importing go-libravatar

* Remove comment showing life exists outside of github.com

... pity, but contribution would not be accepted otherwise

* Use Combo for Get and Post methods over /avatar

* FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR

* Fix persistance of federated avatar lookup checkbox at install time

* Federated Avatars -> Enable Federated Avatars

* Use len(string) == 0 instead of string == ""

* Move import line where it belong

See
https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md

Pity the import url is still the unofficial one, but oh well...

* Save a line (and waste much more expensive time)

* Remove redundant parens

* Remove an empty line

* Remove empty lines

* Reorder lines to make diff smaller

* Remove another newline

Unknwon review got me start a fight against newlines

* Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE

On re-reading the diff I figured what Unknwon meant here:
https://github.com/gogits/gogs/pull/3320/files#r73741106

* Remove newlines that weren't there before my intervention
 2016-08-07 10:27:38 -07:00
Unknwon ab9c5fb5e7 #2593 allow render raw content 
Use URL query parameter render=1 to render content in raw mode.
 2016-08-05 18:34:13 -07:00
Unknwon 2f105f3979 #2162 completely disable builtin issue tracker when enable external tracker 2016-08-04 16:32:02 -07:00
Unknwon e7fd65f0cf #3290 better code structure and batch minor improvements 2016-08-03 11:51:22 -07:00
Unknwon 899e799459 #1601 support delete issue comment 2016-07-26 02:48:17 +08:00
Unknwon ae88d76032 Bump version 2016-07-22 21:52:39 +08:00
Unknwon f1b8d52eb3 #2854 fix no mail notification when issue is closed/reopened 2016-07-16 00:36:39 +08:00
Unknwon a752f09055 #2709 validate username attribute fetched from LDAP 2016-07-12 07:07:57 +08:00
Unknwon de10387f41 #2586 bump git-module requirement 2016-07-12 06:20:09 +08:00
Unknwon 1faaaeb3d9 Update glide.lock 2016-07-11 07:57:15 +08:00
Unknwon 7938506e07 #518 update git-module require version 2016-06-30 02:21:23 +08:00
Unknwon 73b4acbb63 Update glide.yaml 2016-06-27 23:40:36 +08:00
Unknwon a4eaddff81 #2958 Update dep version 2016-06-12 17:54:22 +08:00
Unknwon 7826eae452 #3045 fix DEPRECATED Action signature erorr 2016-05-12 14:32:28 -04:00
Unknwon 60ae8ac3d2 Add route for #2846 2016-03-21 10:49:46 -04:00
Unknwon 9bd9ad4205 #1692 add CRUD issue APIs 
- Fix go-gogs-client#10
- Related to #809
 2016-03-13 23:20:22 -04:00
Unknwon dd6faf7f9b Convert all API handers to use *context.APIContext 2016-03-13 18:49:16 -04:00
Unknwon b4f47a7623 #1891 attempt to fix invalid csrf token 2016-03-12 20:56:03 -05:00
Unknwon d733efc1cc #1286 #2098 Alpha support for custom templates 
No guarantee for compatibility with future changes
 2016-03-12 13:48:34 -05:00
Unknwon f76d821bda fix #2804 2016-03-11 17:12:37 -05:00
Unknwon 2bf8494332 #13 finish user and repository search 
Both are possible on explore and admin panel
 2016-03-11 15:33:12 -05:00
Unknwon 514382e2eb Rename module: middleware -> context 2016-03-11 11:56:52 -05:00
Unknwon 58f0c68151 Some minor changes 2016-03-06 16:40:04 -05:00
Unknwon 12b5a76b0d Minor fix for #2772 2016-03-06 15:37:49 -05:00
Tamás Molnár 9c91e27933 Added: Ability to delete org avatar. 2016-03-06 17:36:30 +01:00
Unknwon a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -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
Unknwon 2d2d85bba4 #1597 support pull requests in same repository 2016-03-04 15:43:01 -05:00
Unknwon 9df6ce48c5 Minor fixes for #2746 2016-03-04 13:32:17 -05:00
Josh Frye 2f228ddf31 Update delete wiki page route 2016-03-04 09:26:52 -05:00
Josh Frye 1ca171dbe9 Add ability to delete single wiki pages. 2016-03-04 09:26:52 -05:00
Unknwon 9e89584cb4 Allow setting git operations timeouts 
- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull
 2016-02-29 19:29:49 -05:00
Unknwon baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
Josh Frye c27038e392 Test mailer button. Addresses #1531 2016-02-24 09:48:05 -05:00
Unknwon 72ce06eab8 #2682 fix missing slash for go-get meta 2016-02-23 00:12:04 -05:00
Unknwon 912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Unknwon 7140dbac95 Fix #857 2016-02-20 15:10:34 -05:00
Download-Fritz a1b28fc33c Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls(). 2016-02-19 20:48:32 +01:00
Unknwon 58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon 9adfe453d5 #2569 delete repo local copy when transfer 
Remote repository path is renamed but does not delete
outdated local copy which still has old repository path
as remote.
 2016-02-14 19:42:38 -05:00
Josh Frye 8662990746 Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Josh Frye 47adc0e8f7 Bump git-module. Fixes #2589 2016-02-11 17:03:39 -05:00
Unknwon 739d5aa1d3 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page 
Hide other teams & repos from organization page
 2016-02-04 12:52:11 -05:00
Florian Kaiser 71bb7f6053 Escape unescaped periods in route regular expression 2016-02-02 17:39:56 +00:00
Florian Kaiser e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Unknwon ee814bf8d6 #2491 minor fix for sr on dashboard 2016-01-29 15:28:24 -05:00
Unknwon db719abff2 stop compile bindata for TRANSLATORS 
- update required version of git-module for #2373
 2016-01-11 15:01:38 +08:00
Unknwon e0f0f72a36 #2345 disallow access of some pages for empty repo 2016-01-07 11:07:17 +08:00
Unknwon cc22c8a1ae update dep lib version requirement 2016-01-06 13:34:34 +08:00
Unknwon a49af93faf #1692 APIs: Users Followers 
- User profile un/follow
- List user's followers/following
 2015-12-21 04:24:11 -08:00
Unknwon f00fef0cd0 #2251 show commits count in PR tabs 2015-12-19 21:09:03 -05:00
Unknwon 19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon 50264200f0 fix huge diff hangs 2015-12-14 09:38:21 -05:00
Unknwon 7509fa2c33 improve get commits performance 2015-12-13 22:58:12 -05:00
Unknwon 79dcd7ee6e #2167 able to identify git version on Windows 2015-12-13 18:20:39 -05:00
Unknwon 59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon 477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon 2a0bb1fa90 #1575 Limit repo creation 2015-12-10 12:37:53 -05:00
Unknwon 9a2e43bff2 move out git module and #1573 send push hook 2015-12-09 20:46:05 -05:00
Unknwon 4e0c697aaf force new INI version 2015-12-07 11:33:04 -05:00
Unknwon ca8ce793d1 #2063 Ability to delete repo from admin panel 2015-12-05 17:39:29 -05:00
Unknwon 404867f206 fix #2105 and fix #1857 2015-12-05 13:24:13 -05:00
Unknwon f3eaa4c592 Set default language for i18n 2015-12-05 01:20:11 -05:00
Unknwon f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon 56dd430a10 refactor API routes and some work for #976 2015-12-04 17:16:42 -05:00
Unknwon 5742f9fe69 fix #2095 2015-12-03 14:31:31 -05:00
Unknwon cc8f5add6e fix #976 2015-12-03 00:24:37 -05:00
Unknwon ec2423ad7c more UI minor fixes 2015-12-02 20:56:26 -05:00
Adam Strzelecki 2580e7b57e UI: Always show menu on repo pages 
Merges repo/sidebar.tmpl with repo/header.tmpl and makes every repo page use
middleware.RepoRef() necessary to display information on this menu.
 2015-12-03 02:16:18 +01:00
Unknwon 0be8b1b1a1 #2052 Ability to batch delete system notices 2015-12-01 23:33:08 -05:00
Unknwon e42fcb033d wiki: finish edit 2015-11-27 01:50:38 -05:00
Unknwon 392f3ee210 wiki: finish new 2015-11-27 00:24:24 -05:00
Unknwon c50a3503e6 introduce git-shell 2015-11-26 17:33:45 -05:00
Unknwon 2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon 3ca544912f #1944 Drop /org/ URL path prefix in organization home page 2015-11-24 19:14:00 -05:00
Unknwon 52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon 987dcc5372 fix #1383 2015-11-20 02:38:41 -05:00
Unknwon f455125d4d fix #878 2015-11-18 21:21:47 -05:00
Unknwon 29ed7872f8 repo sidebar active class 2015-11-16 11:16:52 -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 e030109b5a fix api broken 2015-11-15 17:07:44 -05:00
Unknwon 7c80eba77f minor UI fix and fix ssh race 2015-11-14 13:21:31 -05:00
Unknwon 1d57f0d64f Show custom avatars in commits 2015-11-13 17:10:25 -05:00
Unknwon 676d774d88 fix #1902 2015-11-07 00:39:45 -05:00
Unknwon a374751eb8 add Makefile 2015-11-03 12:16:43 -05: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 b5fdf0947b reduce code 2015-10-22 17:47:08 -04:00
Unknwon 35a65736fa add get repo API 2015-10-22 17:46:07 -04:00
Unknwon 932dbccb67 fix import path, fix #1782 2015-10-15 21:28:12 -04:00
Unknwon aff49b1c9e unified API error response 2015-10-08 20:36:07 -04:00
Steven Oud 6fe868a4d5 added repository remove option to api 2015-10-04 23:29:23 +02:00
kendaru b05c7b3faa moved routes to RouterRef group 2015-10-02 10:48:31 +02:00
kendaru 5c39d3fa7d changed integrated page number to GET 2015-10-02 10:04:11 +02:00
Steven c8aa9c6cb1 implemented #1721: see users who forked/starred/watched a repository 2015-10-01 15:51:46 +02:00
Unknwon e787e73e2f fix URL match 2015-09-24 14:20:07 -04:00
Unknwon 3fb1b6a608 drop oauth2 feature support 2015-09-17 16:11:44 -04:00
Unknwon e5ed5904c6 #1606 GUI bug while adding ldap user 2015-09-13 10:05:18 -04:00
Unknwon 121a81a2c5 finish new edit auth UI 2015-09-11 12:03:08 -04:00
Unknwon 52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Unknwon 5020576e80 minor regexp fix on #1593 2015-09-07 11:56:06 -04:00
Unknwon 56eb252098 #1593 fix repo name router bug 2015-09-07 11:51:53 -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 6a5c87afdd prepare 0.6.9 release 2015-09-03 17:19:50 -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 d951824ff9 able to download archive by API 2015-09-02 09:54:35 -04:00
Unknwon 953bb06857 basic PR feature 2015-09-02 09:26:56 -04:00
Unknwon 37e0cee877 finish PR UI 2015-09-02 04:08:05 -04:00
Unknwon 8c046073a8 work on PR conversation 2015-09-01 19:07:02 -04: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 a329bbc215 new org dashboard issues 2015-08-25 23:22:05 +08:00
Unknwon 062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +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 1453e91f41 minor fix on API response 2015-08-19 20:08:57 +08:00
Unknwon 54b52de6ee minor fix on API response 2015-08-19 05:47:45 +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 2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon 81b8427438 new UI on admin/monitor 2015-08-19 00:34:11 +08:00
Unknwon 6fdc881bd4 detect kill signal 2015-08-18 23:36:08 +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 cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
Unknwon 133b19d0c5 finish view comments on issue page 2015-08-13 16:07:11 +08:00
Unknwon b410207dc1 add cache-control for attachments 2015-08-12 04:58:39 +08:00
Unknwon e67659bf8e fix serve attachment content type 2015-08-12 04:49:51 +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 590c464c56 UI: create issue with title and content 2015-08-09 15:23:02 +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 3d0583df0f fix private repo cannot trigger hook by SSH 2015-08-08 01:04:12 +08:00
Unknwon 9d414d4dd9 remove Index field of milestone 2015-08-06 23:25:35 +08:00
Unknwon 952c480f4f better version checker 2015-08-06 23:03:04 +08:00
Unknwon 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +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 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 cc0d963f75 fix check template version 2015-08-02 11:36:18 +08:00
Unknwon bdd92dc7d1 fix disable router log option 2015-07-31 15:03:30 +08:00
Unknwon 4cd892c99f fix #1227 2015-07-31 14:25:12 +08:00
Unknwon ba47306a69 fix #1305 2015-07-28 18:01:39 +08:00
Unknwon fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +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 ff051e2106 #1128: API calls are not hidden behind sign in 2015-07-15 19:17:57 +08:00
Unknwon 27c3c5415f #1101 Anyone can see organization pages even without logging in when sign in required 2015-03-23 17:58:52 -04:00
Unknwon e6cf83b8c0 Put default config into binary 2015-03-18 06:37:44 -04:00
Unknwon 8e815abeb0 #1079: Custom robots.txt should be send with plaintext content-type 2015-03-18 01:29:54 -04:00
Unknwon 33894591a6 #851: Edit Account does not take into consideration password rules 2015-03-17 03:21:58 -04:00
Unknwon 10e4b5b6c6 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -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
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 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
Peter Smit 1ab09e4f1b Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Unknwon 4dfffee9fb cmd: update csrf version requirement 2015-02-04 19:14:09 -05:00
Unknwon 89ea3e1acc routers: save partial config when install 2015-02-01 14:39:58 -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 7170011f4d update with deps 2015-01-17 15:17:53 +08:00
Unknwon 13e35398aa prepare for mirror update release 2015-01-05 20:37:22 +08:00
Unknwon d5c6b53571 use new Redis client 2015-01-03 02:54:22 +08:00
Unknwon f0ca16d78f add cache version require 2015-01-02 23:59:06 +08:00
Unknwon c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Unknwon 0f1ff9b1ad fix cache dep API broken 2014-12-31 17:08:57 +08:00
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
Unknwon 97b39ae2e4 fix invite bug(shouldn't include full name to search box) 2014-12-22 03:44:49 -05:00
Unknwon 79537467da mirror fix and update 2014-12-20 22:51:16 -05:00
无闻 a18decf4cc Merge pull request #755 from phsmit/multiple_emails 
Multiple emails
 2014-12-20 22:47:05 -05:00
Unknwon b231b8c927 update locale and mirror code format 2014-12-19 00:24:17 -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
Unknwon 9803c421f5 fix binding api broken 2014-12-15 01:49:59 -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 42c7bb7529 mirror code clean 2014-12-11 18:55:09 -05:00
Henry 4f4392b83e increase minimum version vor HTTPS to TLS 1.0 (POODLE, fixes #730) 2014-12-11 11:14:41 +01:00
Unknwon bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 82da024a4d fix #687 2014-11-30 10:55:26 -05:00
Unknwon d6132aaa88 fix oauth2 2014-11-28 21:20:13 -05: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 55dfe2c978 custom avatar upload 2014-11-21 10:58:08 -05:00
Unknwon 37d8d3afe9 more APIs on #12 2014-11-18 11:07:16 -05:00
fuxiaohei d1a60e3643 add pull-request and labels page design 2014-11-17 23:07:34 +08:00
Unknwon a0f9197b45 GetFile api 2014-11-16 21:32:26 -05:00
Kyle P Davis 47f37e55e9 use AppSubUrl as prefix for routes in FCGI mode 2014-11-16 00:06:09 -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 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