Commit Graph

660 Commits

Author SHA1 Message Date
Unknwon cb381078ff finish new repo options page 2015-08-31 13:36:31 +08:00
Unknwon d01f688257 fix repository count of user is messed up 2015-08-30 01:13:24 +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 a00194e665 work on #1548 2015-08-28 19:15:25 +08:00
Unknwon c75cd33f2f #965 Remember visibility preference 2015-08-28 18:45:25 +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 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 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 f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon 4275b3720a finsih diff and compare 2015-08-21 00:18:30 +08:00
Unknwon aa65761d81 new commits table 2015-08-20 20:18:49 +08:00
Unknwon 062adbed8a add confirmation to delete ssh key 2015-08-20 17:11:29 +08:00
Unknwon 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 03b85b73af token recent activity 2015-08-19 06:22:33 +08:00
Unknwon 4c7b6414eb new access token UI 2015-08-19 03:36:16 +08:00
Unknwon d17f102339 try to fix HTTP ops not GC 2015-08-17 22:32:43 +08:00
Unknwon 407385db7e work on #1493 2015-08-17 17:05:37 +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 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 30b428bf0e #1419: 500 when visit a issue with issue/comments of deleted user 2015-08-15 02:48:05 +08:00
Unknwon 13a74c3a0c Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2 2015-08-15 00:42:57 +08:00
Unknwon cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
无闻 8be0bb177b Merge pull request #1485 from donbowman/mime-type
43bfee0d48 reverted my change
2015-08-14 13:38:14 +08:00
Don Bowman 4137426c88 43bfee0d48 reverted my change
423b1c69be, which in turn
causes all content to be served as text/plain. Let go decide
what the mime type is (e.g. text/html instead of text/plain).
2015-08-13 23:21:49 +00: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
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 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 17f3e840ec fix cannot parse JSON for attachments 2015-08-11 12:44:14 +08:00
Unknwon cbc7b7132f finish new issue action and mentions 2015-08-10 23:31:59 +08:00
Unknwon 884bc4ffd8 rename functions 2015-08-10 22:45:49 +08:00
Unknwon 75aff60c90 finish create issue with milestone and assignee 2015-08-10 21:47:23 +08:00
Unknwon 09a1b2a1f5 finish create issue with milestone 2015-08-10 18:57:57 +08:00
Unknwon 922f3f3062 finish create issue with labels 2015-08-10 16:52:08 +08:00
Unknwon 17de3ab0a3 add migrate from issue.label_ids to issue_label 2015-08-10 14:42:50 +08:00
Unknwon 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 e3bdfd51ff better fork permission check 2015-08-08 17:24:10 +08:00
Unknwon 9db4acc62e improve fork process 2015-08-08 17:10:34 +08:00
Unknwon 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 39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon 34795770c3 fix issue stats with milestone filter 2015-08-05 20:52:17 +08:00
Unknwon 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 ce4dcf1e83 fix naming 2015-08-05 11:18:24 +08:00
Unknwon e50982f5ec allow anonymous SSH clone 2015-08-05 11:14:17 +08:00
Unknwon 9311a9858a milestone: pagination 2015-08-04 22:24:04 +08:00
Unknwon 04458d49a0 milestone: list view 2015-08-03 17:42:09 +08:00
无闻 eedac73229 Merge pull request #1404 from wqweto/develop
Allow space and/or percent in file and directory names
2015-07-30 20:22:42 +08:00
Unknwon 869113704b fix #1407 2015-07-30 20:00:57 +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
Vladimir Vissoultchev 43bfee0d48 Raw text file view returns correct charset in content-type header if not utf-8 2015-07-28 19:50:35 +03:00
Unknwon 589618c8a5 better paging 2015-07-28 03:14:37 +08:00
Unknwon fa298a2c30 #835: Realtime webhooks 2015-07-25 21:32:04 +08:00
Unknwon 68cacf9c63 fix issue paging 2015-07-25 07:59:54 +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
无闻 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
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 42a72b62fc fix about #1289 2015-07-19 17:11:16 +08:00
Unknwon ced212f8fa fix hidden bug on tpl rendering 2015-07-10 17:26:50 +08:00
Unknwon 35be8741c4 fix #1112 2015-07-10 16:51:25 +08:00
Don Bowman 423b1c69be don't set mime type to text/plain. This will break serving e.g. raw images,
html, etc

According to http://golang.org/pkg/net/http/#DetectContentType
"If the Header does not contain a Content-Type line, Write adds
a Content-Type set to the result of passing the initial 512 bytes
of written data to DetectContentType."
2015-04-08 00:44:38 +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
Unknwon 5169a0e025 mirror fix of #1105 2015-03-25 08:43:07 -04:00
Linquize 3a977fc0ae Allow to migrate through git:// protocol 2015-03-20 22:26:58 +08:00
Unknwon 466facc009 #1067: Deleting users should remove them from collaborator lists
- fix delete user but repository watches are not decreased
2015-03-17 21:51:39 -04:00
Unknwon fc6db829b2 fix read access team visibility of private repo 2015-03-16 04:52:11 -04:00
Unknwon 588f3215c6 #1040: dashboard no longer accessible when repo is missing 2015-03-16 04:04:27 -04:00
Unknwon 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 18c0697329 routers/repo/setting.go: fix LDAP cannot validate password #1006 2015-03-05 19:20:27 -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 8896c82d34 models: fix issue with transfer repository
README: fix typo
2015-02-24 00:27:22 -05:00
Raphael Randschau 1f61340fa3 Properly calculate the number of open issues per label 2015-02-23 21:26:24 +01:00
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
无闻 fc4dff1b17 Merge pull request #959 from phsmit/access_update
Updating context and fixing permission issues
2015-02-21 02:55:30 -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 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
Peter Smit f9454cc32c Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon 6d0f3a07d4 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Peter Smit 6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
2015-02-12 14:25:07 +02:00
Peter Smit 0a4cda0dd4 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-12 14:14:45 +02:00
无闻 e805fdb29c Merge pull request #925 from phsmit/newcollaboration
Collaboration
2015-02-11 12:43:13 -05:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
无闻 6ed96b7a20 Merge pull request #911 from TonyTsangHK/dev
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
Unknwon ba77a3b0b4 routers/repo/http.go: allow HTTP push/pull by token for #845 2015-02-07 15:47:23 -05:00
无闻 19525abfc4 Merge pull request #845 from compressed/token_http
allow http push by token - #842
2015-02-07 15:27:59 -05:00
Unknwon 5a99e9a37b models/action.go: add action reopen for #462
- models/issue.go: format comment type names
2015-02-06 20:47:21 -05:00
Unknwon afccd0a3ee models/action.go: mirror fix on #892
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
2015-02-06 20:34:49 -05:00
Peter Smit 4e79adf6b5 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-06 13:18:11 +02:00
Tony Tsang fc6d80d619 Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files. 2015-02-06 17:02:32 +08:00
Peter Smit 03af37554e Merge branch 'dev' into newcollaboration 2015-02-05 11:08:10 +02: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
Peter Smit 76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
无闻 edbfbfa66e Merge pull request #822 from phsmit/fix_807
Fix #807 parse the userinfo with the golang tools
2015-01-22 19:31:51 +08:00
Christopher Brickley d0827e5d5e allow http push by token - #842 2015-01-08 09:30:22 -05:00
Unknwon c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Peter Smit d016eaaa09 Fix #807 parse the userinfo with the golang tools
Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: 07d86b1f2d
2015-01-02 12:14:11 +02:00
Unknwon 677b1ec627 fix #808 2015-01-02 12:56:08 +08:00
Thomas Laroche e948c7c262 Fix #795 2014-12-29 11:55:46 +01:00
Unknwon 1a5aa5e0c0 fix #741 2014-12-16 02:28:57 -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
codeskyblue db6c0ebf76 fix git clone error when repo has upper case name 2014-12-11 15:57:32 +08:00
Unknwon bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon 9a1fe801e5 fix #711 2014-12-09 02:18:25 -05:00
Joseph Crail 39c068400e Fix spelling errors in comments. 2014-12-06 20:22:48 -05:00
dennis-smurf 528c075ad6 Added issue link rendering in commit messages 2014-12-05 11:02:52 +01:00
Unknwon a43164877c fix #664 2014-11-25 23:05:43 -05:00
fuxiaohei 79dae254cf add milestone page design 2014-11-24 22:33:04 +08: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 a0f9197b45 GetFile api 2014-11-16 21:32:26 -05:00
Unknwon 9dc3c93a6a #12, add/edit hook 2014-11-13 12:57:00 -05:00
Unknwon 21b9d5fa1f Fix #618 2014-11-11 16:56:57 -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
isotas38 2c28ed8c05 Fix #595 2014-11-02 14:18:37 +09:00
semlanik 377530ec21 Fix Issue 589 2014-10-30 22:13:52 +03:00
Christopher Brickley 3794111460 update slack hook to use new format 2014-10-24 08:56:12 -04:00
Tony Tsang d87a9cb362 Avoid setting missing label/milestone/assignee ids
Label, milestone, assignee ids are not includes in post request, possible
js or form building bug.
2014-10-22 14:52:49 +08:00
Tony Tsang 93b9a2acc0 Fix misuse of issue index for issue id.
- UpdateAssignee
- UpdateIssueMilestone
2014-10-21 16:27:01 +08: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
Unknwon 1aa12c7452 Fix #572 2014-10-15 16:28:38 -04:00
evolvedlight 8d2a6fc484 Merge remote-tracking branch 'upstream/dev'
Conflicts:
	models/repo.go
2014-10-13 20:30:31 +01:00
Unknwon 963354c5d7 Add raw, history file button, and other mirror fixes 2014-10-11 18:02:48 -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
evolvedlight 211dc74816 Got the fork count working 2014-10-10 00:21:36 +01:00
Unknwon 64c68220d2 Fix #264 2014-10-06 17:50:00 -04:00
evolvedlight c9e5e38fcf Initial cut of git fork 2014-10-04 18:19:14 +01: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
fuxiaohei 7d48f811f1 add issue router for new issue page ui preview 2014-09-27 19:03:07 +08:00
Unknwon b8368f98ff Add directory level commit message 2014-09-26 08:55:13 -04:00
lunnyxiao d1911658e1 remove debug info 2014-09-26 12:17:46 +08:00
Unknwon ad52b2d791 Mirror fix on transfer repo 2014-09-25 22:36:07 -04:00
Unknwon 977779cdcf Mirror template bug fix 2014-09-25 20:55:14 -04:00
Unknwon 25268577a5 Fix download archive issue 2014-09-24 17:43:33 -04:00
Unknwon 5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Unknwon 3f707b3f32 Add basic submodule support 2014-09-22 17:01:19 -04:00
lunnyxiao 7df60af60e submodule support and closed #478 2014-09-22 14:23:36 +08:00
lunnyxiao 79ec08141a Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-22 10:45:20 +08:00
lunnyxiao 150eef93b2 add submodule basic support & buf fixed #478 2014-09-22 10:43:16 +08:00
Martin van Beurden 976f1486e0 Set cookiepath to AppSubUrl 2014-09-21 14:25:22 +02:00
Unknwon 7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden 0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts:
	modules/setting/setting.go

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

Conflicts:
	routers/repo/setting.go
2014-09-18 20:50:48 +02:00
Unknwon a596388ebf Add success message after transfer repository #481 2014-09-17 14:52:46 -04:00
lunnyxiao ed84adb679 toutf8 improved & add max git diff lines 2014-09-17 12:03:03 +08:00
Unknwon a2cac952a4 Prepare 0.5 release 2014-09-12 21:36:26 -04:00
Unknwon cfed11f092 Bug: Transfer repository doesn't update the count 2014-09-12 18:29:58 -04:00
Unknwon 25d6ae69d1 Remove hg dep 2014-09-07 19:58:01 -04:00
无闻 e79e4b1580 Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
Christopher Brickley f7be61c819 getOrgRepoCtx returns values directly & err 2014-09-05 07:19:34 -04:00
Christopher Brickley 85c35a6b8b add organization-level webhooks 2014-09-05 07:19:34 -04:00
Christopher Brickley 7269b06fd5 HookType is case-sensitive
Update webhook wasn’t showing up because of the wrong case
2014-09-05 07:19:34 -04:00
Vyacheslav Bakhmutov 6498fce04b Render milestone content as markdown 2014-09-05 09:10:58 +07:00
Vyacheslav Bakhmutov 2a7a03e5b3 take params for milestone and assignee from query instead of path args 2014-09-03 00:04:22 +07:00
Christopher Brickley 00a864e693 add commit compare functionality 2014-09-01 14:56:19 -04:00
Christopher Brickley 2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04:00
Unknwon 904bf1a50b Add migrate repo API 2014-08-29 17:31:53 +08:00
Unknwon 9baf2b38d0 Bug fix on organization 2014-08-27 16:39:36 +08:00
Unknwon 21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Unknwon b765229a6d Fix code style 2014-08-23 20:30:29 +08:00
lunnyxiao 97fb62f51e auto detect text file encode and convert to utf8 2014-08-20 16:34:48 +08:00
Unknwon 36b4c57ff1 Finish new organization members and invitation page 2014-08-15 18:29:41 +08:00