Download-Fritz
a467184e13
#2505 Allow to fork and disallow to create PRs for mirrors.
2016-02-19 20:33:06 +01:00
Andrey Nering
658bfc2704
Implement issue and pull request templates.
...
Similar to GitHub:
https://github.com/blog/2111-issue-and-pull-request-templates
Priority:
- root
- .gogs
- .github
2016-02-18 21:21:30 -02:00
Unknwon
632c27802c
Minor fix for #2624
2016-02-15 14:57:15 -05:00
Unknwon
dc89c51f3e
Merge pull request #2624 from mhartkorn/convert-mirror-to-repo
...
Convert mirrors to regular repositories
2016-02-15 14:26:21 -05:00
chriswatt
d710b5e791
Fix when repo is empty
2016-02-14 23:26:47 +00:00
chriswatt
c47866b34a
Add grey bg to tabs on repo page
2016-02-14 23:09:33 +00:00
Martin Hartkorn
15d37b7a95
Refactored according to suggestions
2016-02-14 22:40:39 +01:00
Martin Hartkorn
3650bd8528
Convert mirrors to regular repositories.
2016-02-14 21:12:00 +01:00
chriswatt
af8e323248
Fix tab index on new issue/comment form
2016-02-07 22:14:33 +00:00
Unknwon
b09ddc72d2
Merge pull request #2581 from chriswatt/committab
...
Make commits tab active when on diff page
2016-02-07 15:37:22 -05:00
chriswatt
a881f776d0
Make commits tab active when on diff page
2016-02-07 20:11:25 +00:00
Andrey Nering
2bfb8bb5fd
Enable sintax highlighting on diff view. Close #733
2016-02-04 18:21:47 -02:00
Unknwon
1c74612b3c
Minor fix for #2444
2016-02-01 20:55:12 -05:00
Unknwon
d3ba246693
Merge pull request #2444 from bkcsoft/feature/participants
...
Implemented participant-listing for issue-pages (Fixes #2377 )
2016-02-01 20:31:54 -05:00
Florian Kaiser
d568019306
Remember last selected clone protocol, and establish uniform order (https, ssh)
2016-02-01 17:04:58 +00:00
Unknwon
566163ab82
Merge pull request #2502 from bkcsoft/fix/split-view-diff
...
Split view fixed
2016-01-28 10:11:45 -05:00
Kim "BKC" Carlbäcker
96dee1c354
Split view fixed
2016-01-27 23:52:42 +01:00
Andrey Nering
5deb726f3f
Refactoring of inline diff computing to prevent empty diff box. Fix #2489
2016-01-27 18:54:08 -02:00
Kim "BKC" Carlbäcker
b921161666
Name popup
2016-01-26 17:55:54 +01:00
Kim "BKC" Carlbäcker
2cc1ee3fc0
Implemented participant-listing for issue-pages
2016-01-26 17:55:54 +01:00
Unknwon
d1675c2701
fix CSS of branch dropdown when view commits under revision
2016-01-14 21:27:36 +08:00
Adam Strzelecki
41fdaabcf7
commit.RefUrl expects AppUrl argument
...
This is fixup for ea375c0dcchttps://github.com/gogits/git-module/pull/4
2016-01-13 19:09:50 +01:00
Unknwon
bcf6aed452
Merge pull request #2335 from andreynering/highlight-diff
...
Highlight diff
2016-01-09 13:39:18 +08:00
Unknwon
cc8c67ff29
fix markdown autolink error
2016-01-09 10:59:04 +08:00
Andrey Nering
81ed5c4bee
Declaring specific types for enums constants.
...
This makes the code more strict since you can't assign or compare
values of different types without proper cast.
2016-01-06 18:00:40 -02:00
Andrey Nering
73474c043b
Highlighting differences of lines in the diff view.
2016-01-06 17:46:56 -02:00
Kim "BKC" Carlbäcker
2087156119
Removed opticon-fold
2016-01-06 02:21:20 +01:00
Kim "BKC" Carlbäcker
3870a7a3c8
merged split/unified templates
2016-01-06 00:08:50 +01:00
Kim "BKC" Carlbäcker
8fe5d887ae
Changed name from inline to unified
2016-01-05 19:21:50 +01:00
Kim "BKC" Carlbäcker
4e6d048ba1
i18n-fix for split-view
2016-01-05 19:21:49 +01:00
Kim "BKC" Carlbäcker
0df39b33eb
Implement Split Diff-View
...
- Unified/Inline Diff-View Selectable
2016-01-05 19:21:41 +01:00
Unknwon
93f03707a7
#2283 set text/plain for non-binary files in raw mode
2015-12-25 05:45:07 -05: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
c62a6b7a12
#2014 allow switch branches between two orgs in compose PR
2015-12-20 01:06:54 -05:00
Unknwon
5ff6eedf5e
#2251 fix button name
2015-12-19 22:07:06 -05:00
Unknwon
3bcdb3855c
#2250 Use HTTP/HTTPS as default clone option
2015-12-19 21:12:13 -05:00
Unknwon
6673dcb038
#2103 #2181 improvments of highlight class name
2015-12-16 22:13:12 -05:00
Unknwon
eb918c2368
fix only admin can view milestone desc
2015-12-15 21:25:38 -05:00
Unknwon
ea375c0dcc
new template func
2015-12-13 23:16:58 -05:00
Unknwon
7509fa2c33
improve get commits performance
2015-12-13 22:58:12 -05:00
Unknwon
351dfc95a9
prepare release
2015-12-12 21:58:54 -05:00
Unknwon
40f3142264
#2114 External URL for wiki
2015-12-11 04:55:08 -05:00
Unknwon
c3440c4dd3
#2035 Show author e-mail in commit diff
2015-12-09 11:46:39 -05:00
Angus Gibson
df05134494
Break branch-selection dropdown into a template
...
We only handle branch selection for repo home and commits pages, so the
redirection URL is based on PageIsCommits
2015-12-09 17:15:58 +11: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
a576224d0e
unified name: IsViewBranch, IsViewCommit and IsViewTag
2015-12-09 00:32:53 -05:00
Unknwon
120cd4e471
#1984 Better mirror repo management
2015-12-08 20:06:12 -05:00
Adam Strzelecki
da2585c11e
Indent all templates with tabs
...
This commit improves templates readability, since all of them use consistent
indent with all template command blocks indented too.
1. Indents both HTML containers such as <div>, <p> and Go HTML template blocks
such as {{if}} {{with}}
2. Cleans all trailing white-space
3. Adds trailing last line-break to each file
2015-12-08 00:57:46 +01:00
Adam Strzelecki
e2ca53029e
Render commit msg as header + verbatim description
...
Most commit in Git are expected to follow standard of single header line,
followed by description paragraphs, separated by empty line from previous block.
Previously Gogs were treating everything as single header. Now we are trying to
render only first line as header, but following lines (description chunks) as a
verbatim.
2015-12-07 01:50:45 +01:00
Unknwon
404867f206
fix #2105 and fix #1857
2015-12-05 13:24:13 -05:00
Unknwon
f0ee33267c
fix #2102
2015-12-05 11:46:42 -05:00
Unknwon
1ee7c33e93
template fix
2015-12-04 21:32:33 -05:00
Unknwon
e538ff2770
fix #1829 and fix #890
2015-12-04 21:30:33 -05:00
Adam Strzelecki
edbb67cb3f
UI: Use more subtle grey SHA1 labels
...
Current green SHA1 labels are more pronounced than other UI elements attracting
attention as if they were most important thing in the UI, while they are not as
important, especially without real Git client.
Using grey SHA1 labels makes the UI more balanced, less aggressive and lets
user to focus on other content elements.
NOTE: Neither GitHub or Bitbucket uses so heavy pronunciation as Gogs.
2015-12-03 14:21:20 +01:00
Unknwon
ec2423ad7c
more UI minor fixes
2015-12-02 20:56:26 -05:00
Unknwon
c4bab163cb
Merge pull request #2088 from nanoant/patch/further-layout-fixes
...
Further layout fixes
2015-12-02 20:26:48 -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
3d3498bda1
clean test data
2015-12-02 20:10:47 -05:00
Unknwon
29375059e1
minor CSS fix
2015-12-02 20:10:00 -05:00
Adam Strzelecki
b73241ceb1
UI: Display last-commit header without 2nd column
...
This uses a CSS trick making first th to be relative block with width equal to
first two columns, effectively working around inability to use colspan="2" on
first row that was breaking "fixed-layout" for tables.
Also use grey header for last-commit SHA1 tag.
2015-12-03 01:15:40 +01:00
Adam Strzelecki
314664892c
UI: Keep repo URL action right of ref combo & path
...
Just use secondary menu instead custom ".head.meta", which simplifies code.
Also do not display repo URL action when we are in subdirectory or viewing a
file.
2015-12-02 23:48:36 +01:00
Adam Strzelecki
3eae4ecde7
UI: Make repository menu divide header and content
...
This is more inline with way GitHub looks like and feels much more natural and
in style with rest of the interface.
2015-12-02 22:40:22 +01:00
Adam Strzelecki
ec98deeb8c
UI: Keep repository settings menu button right
2015-12-02 22:06:50 +01:00
Adam Strzelecki
61fdd8c571
Commits & files UI: SUI fixed single line table
...
Instead using own ellipsis, uses Semantic UI fixed single line table which
effectively applies ellipsis to all overflowing table cells.
NOTE: File list cannot use colspan="2" for 1st "Last commit" elements,
otherwise layout breaks with fixed table.
2015-12-02 21:57:39 +01:00
Adam Strzelecki
99b958db43
UI: Mark top menu icons blue only when non-zero
2015-12-02 21:38:52 +01:00
Unknwon
5572884c6b
fix #2057
2015-12-01 20:51:31 -05:00
Unknwon
830d000667
finish wiki
2015-11-30 20:45:55 -05:00
Unknwon
5d1f5f32d0
wiki: finish pages
2015-11-27 02:16:12 -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
144663a3cf
allow admin to migrate for any user/org
2015-11-25 00:55:37 -05:00
Unknwon
b2fb7e3fd2
more HTTP clone word fix
2015-11-22 13:01:42 -05:00
Unknwon
efaf60ba5a
fix #2013
2015-11-22 02:42:39 -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
f04d773f4f
UI: long organization name in create repository owner list
2015-11-18 17:42:20 -05:00
Unknwon
81d7359fdd
fix #1981
2015-11-18 15:11:37 -05:00
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
d370effca5
minor fix for #1961
2015-11-16 11:20:11 -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
951037c0ae
remove test code
2015-11-16 00:16:43 -05:00
Unknwon
7046df6028
UI fix
2015-11-16 00:16:03 -05:00
Unknwon
1db3ae6601
UI fix
2015-11-16 00:03:23 -05:00
Unknwon
612d0d6d25
minor HTML fix
2015-11-15 23:59:39 -05:00
Unknwon
18de67380c
fix #1958
2015-11-15 23:52:46 -05:00
Unknwon
942284648e
fix markdown padding
2015-11-15 14:50:35 -05: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
Unknwon
7c80eba77f
minor UI fix and fix ssh race
2015-11-14 13:21:31 -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
675cd997d8
minor tabindex fix
2015-11-11 16:24:13 -05:00
Unknwon
908f2924ce
fix #1824 and fix #1917
2015-11-11 16:19:28 -05:00
Alexey Makhov
7835c2212c
issue #1824 add tabindex
2015-11-11 22:59:06 +03:00
Unknwon
3b62a0fe0e
fix #1572 fix file histrory paging issue
2015-11-10 16:46:17 -05:00
Unknwon
1b5e1bebc2
fix #1886
2015-11-04 00:32:25 -05:00
Unknwon
6f0a41b8b2
#1511 Allow local import only for admin users
2015-11-03 18:40:52 -05:00
Unknwon
0af035c37e
#1078 not show bin when rename a file
2015-11-03 09:52:17 -05:00
Unknwon
bc82157216
fix #1078
2015-11-02 19:55:24 -05:00
Unknwon
022820103d
#1657 allow forcing all private repos
2015-10-25 04:26:26 -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
fc7959d3bc
New/reopen PR checks if there is any unmerged and open PR
2015-10-18 19:30:39 -04:00
Steven Oud
280fde9b7c
added links to forks/watchers/stars in new layout header
2015-10-03 18:04:44 +02:00
Unknwon
4465c58f4b
new quick start page
2015-10-02 19:58:36 -04:00
kendaru
5c39d3fa7d
changed integrated page number to GET
2015-10-02 10:04:11 +02:00
Steven
87d64acc9f
fixed HTML indenting
2015-10-01 16:16:11 +02:00
Steven
c8aa9c6cb1
implemented #1721 : see users who forked/starred/watched a repository
2015-10-01 15:51:46 +02:00
Steven
ecd59deb27
implemented #1721 : see users who forked/starred/watched a repository
2015-10-01 15:17:27 +02: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
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
923873db85
fix possible XSS in view issue page
2015-09-17 14:22:46 -04:00
Unknwon
c7ac237b57
fix css
2015-09-11 20:49:28 -04:00
Unknwon
f432f1f41c
#1604 suburl for release md preview
2015-09-08 10:05:57 -04:00
Unknwon
6f6f38e7c3
#1603 suburl for comment attachments
2015-09-08 09:09:40 -04:00
Unknwon
31e7b0f588
#1599 status button mrigin-right
2015-09-07 15:22:52 -04:00
Unknwon
cc83043edc
minor fix on template
2015-09-07 14:02:09 -04:00
Unknwon
24658fcbdd
#633 dix suburl
2015-09-06 06:57:25 -04:00
Unknwon
119dec51f2
Mirror repository should not allow fork
2015-09-05 14:31:52 -04:00
Unknwon
1c2dbd7183
fix dropdown style
2015-09-05 05:06:03 -04:00
Unknwon
5c5ccddb02
fix buttons style
2015-09-02 20:04:18 -04:00
Unknwon
c0a899b151
css fix
2015-09-02 18:32:23 -04:00
Unknwon
83dc2468f5
finish initial version of pull request
2015-09-02 16:18:09 -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
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
670ade9a61
#1206 does not allow fork bare repo
2015-09-01 11:57:02 -04:00
Unknwon
398569f6f8
#1021 Forked repo unavailable after deleting original repo
2015-09-01 11:43:53 -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
ee3e0c3c49
fix dropdown search
2015-08-31 17:10:28 +09: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
9ef063cbb0
change checkbox ui
2015-08-29 15:49:14 +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
c7a4369db9
add readme template help link
2015-08-28 19:23:02 +08:00
Unknwon
a00194e665
work on #1548
2015-08-28 19:15: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
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
2f2bf20aae
fix menu overflow
2015-08-26 12:39:32 +08:00
Unknwon
45c2b4bd76
fix HTML
2015-08-26 01:32:12 +08:00
Unknwon
f808df5a7b
new user dahsboard issues
2015-08-25 22:58:34 +08:00
Unknwon
6821527c95
fix style
2015-08-21 00:32:46 +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
ac616c07de
fix #966
2015-08-20 15:57:51 +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
81b8427438
new UI on admin/monitor
2015-08-19 00:34:11 +08:00
Unknwon
7bb5cb444c
fix css styles
2015-08-15 20:55:03 +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
c7d5e1f182
clean file and update locales
2015-08-15 16:30:24 +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
a24141ec9c
more on #1319
2015-08-15 02:54:39 +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
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
a01867cc1a
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
...
# Conflicts:
# public/css/gogs.min.css
2015-08-12 19:10:16 +08:00
Unknwon
33f33e055a
fix on #1466
2015-08-12 19:08:10 +08:00
无闻
52933932d2
Merge pull request #1466 from manfer/semantic
...
modified repo header
2015-08-12 18:46:19 +08:00
Unknwon
ab2d0b3b44
add comment form UI
2015-08-12 18:44:09 +08:00
Gogs
009d716a02
modified repo header
2015-08-12 12:12:06 +02:00
Unknwon
b4c0b7b98b
finish view issue without comments and ops
2015-08-12 17:04:23 +08:00
无闻
d1a82a82b4
Merge pull request #1454 from gustavopaes/bug/1453
...
Remove SSH button when SSH it is disabled
2015-08-12 03:44:30 +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
James Anderson
b2bd6c4c5a
Fix broken collaboration link in repo settings
2015-08-10 09:27:10 -05: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
Gustavo Paes
4564d13496
Remove SSH button when SSH is disabled
2015-08-09 15:03:46 -03: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
8a3ee795d2
finish transforming to v2
2015-08-10 00:23:20 +08:00
