Paolo Borelli
182003aa41
Add PAM authentication
2015-04-24 10:13:01 +02:00
Lunny Xiao
673a76d638
Merge pull request #1211 from mephux/hotfix/type-fix-ValidatePassword
...
Hotfix/type fix validate password
2015-04-24 15:03:21 +08:00
Dustin Willis Webber
5a4f314cf7
fix calls that go rename missed
2015-04-16 14:42:24 -04: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
无闻
f7219b0cf0
Merge pull request #1105 from linquize/migrate-git
...
Allow to migrate through git:// protocol
2015-03-24 19:28:55 -04:00
Unknwon
5f594d8774
#1140 MySQL root password exposure
2015-03-24 19:15:36 -04:00
Unknwon
211596f407
#1124 LDAP add and edit form are misleading
2015-03-24 19:04:16 -04:00
Linquize
3a977fc0ae
Allow to migrate through git:// protocol
2015-03-20 22:26:58 +08: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
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
33894591a6
#851 : Edit Account does not take into consideration password rules
2015-03-17 03:21:58 -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
e3dece1371
modules/setting: simple behave change in startup
2015-02-26 19:45:38 -05: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
无闻
f92bfabf86
Merge pull request #960 from phsmit/access_action
...
Fix that owners also see actions on their repositories
2015-02-23 13:51:02 -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
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
无闻
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
0fa209d07b
Update/simplify fix that owners also see actions on their repositories
2015-02-18 08:59:22 +02: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
455fad0fbd
Fix that owners also see actions on their repositories
...
This is a balance between speed and nice code, where speed has won. To prevent a repository query for each action the ownername is match with the current user.
It would be "cleaner" or "better" if we fetch the repository each time. Another option is to add the RepoOwnerID to action
2015-02-16 13:16:24 +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
a38e4a0b02
routers/install.go: able to keep previous custom settings for 2nd time install
...
- .gopmfile: update all commits
2015-02-13 16:48:23 -05: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
Unknwon
c5c467a9cd
Merge branch 'dev' of github.com:gogits/gogs into access
2015-02-11 19:25:59 -05:00
无闻
e805fdb29c
Merge pull request #925 from phsmit/newcollaboration
...
Collaboration
2015-02-11 12:43:13 -05:00
Unknwon
485ea6f14f
models: make code change for session issue with SQLite3 #739
2015-02-10 23:44:16 -05:00
Unknwon
6a23252edc
able to allow insecure certification of webhook for #891
2015-02-10 21:06:59 -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
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
无闻
cd0ee35b3f
Merge pull request #905 from phsmit/conf_on_cli
...
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
Lauris BH
00653e52ee
Get username, name, surname and e-mail from LDAP server
2015-02-08 01:49:51 +02: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
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
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
Raphael Randschau
3c65265871
Hide the registration button depending on the setting
2015-02-05 18:15:00 +01:00
Peter Smit
1ab09e4f1b
Add option to provide configuration file on command line
2015-02-05 12:17:35 +02:00
Peter Smit
03af37554e
Merge branch 'dev' into newcollaboration
2015-02-05 11:08:10 +02: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
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
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
无闻
161774d4fb
Merge pull request #825 from phsmit/ssh2_keys
...
Implement #798 Flexible ssh-key input
2015-01-22 19:39:35 +08: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
Peter Smit
6251626de4
Implement #798 Flexible ssh-key input
...
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
2015-01-02 15:38:11 +02: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
fzerorubigd
6643647687
add afunction to rewrite all public keys on admin request
...
refs #763
2015-01-01 02:15:52 +03:30
Unknwon
bd555551ce
fix #801
2014-12-31 18:37:29 +08:00
Thomas Laroche
e948c7c262
Fix #795
2014-12-29 11:55:46 +01:00
Unknwon
81a44e4cd0
fix API changes
2014-12-28 20:40:35 +08: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
Peter
20b5c23a19
Small fixes to multiple_emails feature
2014-12-20 09:26:51 +02:00
Unknwon
0a697517ac
work on #754
2014-12-18 03:37:31 -05:00
Unknwon
c4820f119d
work on #754
2014-12-18 03:26:09 -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
ec71d538fc
Method for activating email addresses through verification email
2014-12-17 17:41:49 +02:00
Unknwon
d01f2f3c22
fix #751
2014-12-16 20:47:10 -05:00
Unknwon
1a5aa5e0c0
fix #741
2014-12-16 02:28:57 -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
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
Deiwin Sarjas
48bb0fadc2
update user api search results to include the full name
...
Is fully backwards compatible
Fixes #677
2014-12-02 11:44:03 +02:00
Unknwon
5338808600
fix #676
2014-11-30 18:29:16 -05:00
Unknwon
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
Unknwon
b6437b5a4c
safe check
2014-11-28 21:54:49 -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
Unknwon
a43164877c
fix #664
2014-11-25 23:05:43 -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
1b66600bd0
Fix #652
2014-11-23 02:33:47 -05: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
22ab4fa1b0
fix #139
2014-11-21 11:08:24 -05:00
Unknwon
55dfe2c978
custom avatar upload
2014-11-21 10:58:08 -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
a0f9197b45
GetFile api
2014-11-16 21:32:26 -05: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
9dc3c93a6a
#12 , add/edit hook
2014-11-13 12:57:00 -05:00
Unknwon
9e22840483
fix #622
2014-11-13 05:27:01 -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
21b9d5fa1f
Fix #618
2014-11-11 16:56:57 -05:00
Unknwon
e0de6cb5ad
work on #616 and update locales
2014-11-10 05:30:07 -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
Unknwon
83283bca4c
Safe work
2014-10-25 07:50:19 -04: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
146c8efee3
Fix API broken
2014-10-18 23:42:43 -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
Eryx
fb8beaf19a
Fix pagination() to get the right total number of pages
2014-10-14 09:54:45 +08:00
evolvedlight
8d2a6fc484
Merge remote-tracking branch 'upstream/dev'
...
Conflicts:
models/repo.go
2014-10-13 20:30:31 +01:00
Unknwon
452ccff81c
Mirror fix on add ssh key
2014-10-11 21:04:42 -04: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
Unknwon
85c9f7c5f3
Issue: Show error prompt when add repository to team and it does not exist #533
2014-10-10 05:06:12 -04:00
Unknwon
d78abd3561
Mirror fix on admin/orgs paging
2014-10-10 03:28:21 -04:00
evolvedlight
211dc74816
Got the fork count working
2014-10-10 00:21:36 +01:00
Unknwon
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
Unknwon
1e1f9e7166
Update with macaron
2014-10-06 19:12:52 -04: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
061a879cea
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
conf/app.ini
2014-09-17 12:04:18 +08:00
lunnyxiao
ed84adb679
toutf8 improved & add max git diff lines
2014-09-17 12:03:03 +08:00
tobyzxj
ad041167f7
fix user's actions on domain/org/name-of-organization/dashboard
2014-09-16 16:20:32 +08:00
Unknwon
632b1b694d
Fix #465
2014-09-15 09:56:12 -04:00
Unknwon
efb68a0a96
Fix UI issue
2014-09-14 19:22:52 -04:00
Mathieu Gagnon
3549fb0ea8
Remove APP_LOGO setting
2014-09-13 03:52:51 -04: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
无闻
40bc130b19
Merge pull request #447 from m0sth8/fix-milestone-render-markdown
...
Render milestone content as markdown
2014-09-07 19:19:10 -04:00
Unknwon
0ddb1eb769
Finish new install page, almost ready for 0.5 release
2014-09-07 19:02:58 -04:00
Unknwon
ab7206d6b7
Fix #348
2014-09-05 17:28:09 -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
9bc63bda7d
Finish all new admin pages.
2014-08-30 20:49:51 +08:00
Unknwon
d2aff9a46a
Continue working on new admin pages
2014-08-29 20:50:43 +08:00
Unknwon
904bf1a50b
Add migrate repo API
2014-08-29 17:31:53 +08:00
Unknwon
8829174574
Finish new admin users pages
2014-08-29 15:32:52 +08:00
lunnyxiao
a6ec6def8d
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-29 11:25:03 +08:00
lunnyxiao
c40e815763
add migrate api
2014-08-29 11:24:37 +08:00
Unknwon
1aec1a2dda
Finish new admin dashboard
2014-08-28 22:29:00 +08:00
Unknwon
81287ba022
Mirror issue fix
2014-08-27 22:40:45 +08:00
Unknwon
9baf2b38d0
Bug fix on organization
2014-08-27 16:39:36 +08:00
Unknwon
50de06056b
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-26 18:11:27 +08:00
Unknwon
74b31566cf
Finsih add/remove repo in organization
2014-08-26 18:11:15 +08:00
Marios Andreopoulos
510d5a5d74
import strings
2014-08-25 21:07:08 +03:00
Marios Andreopoulos
cd0ddcfa01
fix typo
2014-08-25 20:35:23 +03:00
Marios Andreopoulos
3d79f59671
fix wrong variable name
2014-08-25 20:20:44 +03:00
Marios Andreopoulos
b40922f4d4
remove extra comma
2014-08-25 20:07:47 +03:00
Marios Andreopoulos
12639c577f
Remove newline characters from ssh key before processing it.
...
Fixes issue #370 : https://github.com/gogits/gogs/issues/370
2014-08-25 18:54:50 +03: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
Unknwon
e0a2d23baf
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-08-23 20:24:31 +08:00
Unknwon
fa60502a70
Working on organization pages
2014-08-23 20:24:02 +08:00
lunnyxiao
97fb62f51e
auto detect text file encode and convert to utf8
2014-08-20 16:34:48 +08:00
Unknwon
a60edbe88c
Add/remove member need add/remove access to repositories as well
2014-08-16 16:58:32 +08:00
Unknwon
bba707de36
Finish team list, create new team, join/leave team page
2014-08-16 16:21:17 +08:00
Unknwon
36b4c57ff1
Finish new organization members and invitation page
2014-08-15 18:29:41 +08:00
Unknwon
5acc948562
Page: `/org/:orgname/settings`
2014-08-14 14:12:21 +08:00
Unknwon
5fbf8531e6
Finish new home page of organization
2014-08-10 20:11:18 -07:00
Unknwon
7af7584d25
Finish new reset password, etc.
2014-08-09 21:02:00 -07:00
Unknwon
5605af973b
Feature: Social sign in
2014-08-09 18:01:29 -07:00
Unknwon
78defd238c
Page: Manage social accounts
2014-08-09 17:25:02 -07:00
Unknwon
9a1d5d2489
Finish new web hook pages
2014-08-09 15:40:10 -07:00
Unknwon
9820b8e134
Finish new hooks list page
2014-08-09 10:29:51 -07:00
Unknwon
e8c9bb2c66
Finish new collaboration page
2014-08-07 06:40:05 -04:00
Unknwon
a8e05fdf1b
Use toolbox
2014-08-06 17:21:24 -04:00
Unknwon
6fc2107529
Add missing less files
2014-08-05 21:18:29 -04:00
Unknwon
755eec745f
Finish new repo settings page
2014-08-02 13:47:33 -04:00
Unknwon
dabf5b057c
Finish new migrate page
2014-08-01 00:06:19 -04:00
Unknwon
7bbf644dd5
Convert captcha, cache, csrf as middlewares
2014-07-31 17:25:34 -04:00
Unknwon
9813161411
Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page
2014-07-26 23:53:16 -04:00
Unknwon
5e81383413
Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module
2014-07-26 18:37:18 -04:00
Justin Nuß
7de3dd01de
Use :index instead of :issue in UpdateIssueMilestone
2014-07-26 11:10:49 +02:00
Unknwon
5c4bc3c848
Huge updates!!!!! Be careful to merge!!!!
2014-07-26 02:28:04 -04:00
Unknwon
8dd07c0ddd
New UI merge in progress
2014-07-26 00:24:27 -04:00
Justin Nuß
12fb42de5a
Fix IE bug and show errors.
2014-07-25 11:13:42 +02:00
Justin Nuß
4e2477a1a5
Fix #318 . Switch to JS(ON) implementation for issue/comment creation.
2014-07-25 10:47:37 +02:00
Justin Nuß
dedb156d4a
Fix #321 . Allow empty comments as long as there are attachments.
2014-07-25 08:01:34 +02:00
Justin
ad7beb78d0
Fix #312 . Quote file names of attachments.
2014-07-24 23:13:35 +02:00
Justin Nuß
620c0ef297
Merge branch 'dev' of https://github.com/gogits/Gogs into trello/244
2014-07-24 19:15:35 +02:00
Justin Nuß
cbcd08aa17
Mention organisation users when organisation gets mentioned
2014-07-24 19:15:31 +02:00
Justin Nuß
4d702eb345
Allow disabling uploads
2014-07-24 15:51:40 +02:00
Justin Nuß
bfe5b86004
Add file upload for attachments
2014-07-24 15:19:59 +02:00
Justin Nuß
43e5de7f83
Show attachments in issues/comments and add preview for images
2014-07-24 13:50:03 +02:00
Justin Nuß
ef1cbcd761
Allow admins to delete attachments.
2014-07-24 12:39:03 +02:00
Justin Nuß
967856f36e
Merge branch 'dev' into feature/attachments
...
Conflicts:
models/issue.go
routers/repo/issue.go
2014-07-24 12:29:37 +02:00
Justin Nuß
d43c5895bc
Update template and style, only close commit if commit is in same repository
2014-07-24 10:15:05 +02:00
Justin Nuß
3c025b3950
Add delete route for attachments, remove upload buttons from issues/comments
2014-07-24 09:05:15 +02:00
Justin Nuß
34304e6a0c
WIP: Allow attachments for issues, not only comments
2014-07-23 21:24:24 +02:00
Justin Nuß
4617bef895
WIP: Allow attachments for comments
2014-07-23 21:15:47 +02:00
Justin Nuß
469cbc8813
Update progress of milestones when closing/reopening issues and allow closing of issues in commit messages
2014-07-23 13:48:06 +02:00
Justin Nuß
812f71e21b
Update milestone issue stats when reopening/closing issue
2014-07-22 22:35:59 +02:00
无闻
536f65b8ad
Merge pull request #293 from wmark/master
...
Enable users to upload other key types than RSA (+ ED25519, ECDSA, NTRU, McE)
2014-07-20 21:05:27 -04:00
W-Mark Kubacki
887ad1ec8b
Utilize ssh-keygen for checking of keys.
...
Removes the limitation to RSA and enables us to use all key types
SSH recognizes.
2014-07-20 18:56:07 +02:00
gima
5a97cc69ed
Make possible for administrators to change user's password (fix proposal for #290 )
2014-07-18 05:30:57 +03:00
Unknown
3969d704a0
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-07-12 00:55:35 -04:00
Unknown
0f907301b7
Fix #285
2014-07-12 00:55:19 -04:00
fuxiaohei
c127d84777
add organization team-single page
2014-07-07 18:13:42 +08:00
Unknown
63cc14062a
Paging function for users and repositories
2014-07-07 04:15:08 -04:00
Unknown
7ffdabb28f
Move debug router location
2014-07-06 18:25:07 -04:00
Justin
10f932b952
Fix wrong method for profiling routes.
2014-07-05 17:24:44 +02:00
Unknown
be8ac7fb75
fix #273
2014-07-04 16:48:36 -04:00
Unknown
7f3015b32b
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-07-04 14:44:31 -04:00
Unknown
13b032f829
update name
2014-07-04 14:44:27 -04:00
Justin Nuß
a481672c5c
Add 'pprof' tag for enabling debugging
2014-07-04 11:41:43 +02:00
Unknown
465dc962b5
Finish create organization team
2014-07-02 16:42:16 -04:00
Unknown
e4ea5cf598
Finish Teams page
2014-06-29 16:30:41 -04:00
Unknown
99713e1180
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-06-28 15:43:28 -04:00
Unknown
5dbfe3c26c
Finish organization homepage
2014-06-28 15:43:25 -04:00
Lunny Xiao
4ce2fa520a
Merge branch 'master' into dev
2014-06-28 15:00:38 +08:00
Lunny Xiao
86e2627175
Merge branch 'master' of github.com:gogits/gogs
...
Conflicts:
models/update.go
routers/repo/http.go
2014-06-28 14:58:59 +08:00
Lunny Xiao
e5ae41e21f
bug fixed #261
2014-06-28 14:55:33 +08:00
Unknown
6e448b0714
Finish delete organization
2014-06-28 00:40:07 -04:00
Unknown
ee9b7f322f
Clean code
2014-06-27 23:14:33 -04:00
Unknown
57ac15aa20
Merge branch 'master' of github.com:gogits/gogs into dev
2014-06-27 23:12:55 -04:00
Lunny Xiao
7dbeee94e3
bug fixed #236
2014-06-28 11:06:07 +08:00
fuxiaohei
1d55ecd29c
add organization team-create page
2014-06-27 22:04:04 +08:00
fuxiaohei
b5ba2bd268
add organization team-create page
2014-06-27 21:33:49 +08:00
Unknown
19e9104289
Organization settings page
2014-06-27 03:37:01 -04:00
Unknown
32b09681b2
Migrate repository by organization
2014-06-25 05:35:23 -04:00
Unknown
43b33440b5
Work on create organization repo and #257
2014-06-25 05:14:36 -04:00
Unknown
4cf7a1fca5
Mirror update on create repo page
2014-06-25 03:55:59 -04:00
Unknown
e0f9c628c5
Add create organization
2014-06-25 00:44:48 -04:00
Unknown
b2801a2e98
Fix #165
2014-06-24 13:55:47 -04:00
Unknown
98f614a58e
Work on #249 issue1
2014-06-23 19:16:09 -04:00
Unknown
47d29a1ee0
Mirror fix on #248
2014-06-23 16:22:34 -04:00
fuxiaohei
fb53cc4fa8
add organization setting page
2014-06-23 19:11:20 +08:00
fuxiaohei
f393dc6520
add organization dashboard page
2014-06-23 12:08:53 +08:00
fuxiaohei
ea507e20d4
add organization create page
2014-06-23 11:40:49 +08:00
Unknown
314193029a
Use constants to name template file
2014-06-22 23:11:12 -04:00
Unknown
9c82073091
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-06-22 13:17:47 -04:00
Unknown
9924e65ca1
In progress of name template name constant
2014-06-22 13:14:03 -04:00
fuxiaohei
adda10f4a4
add organization teams page
2014-06-22 21:53:40 +08:00
fuxiaohei
514d7e1922
add organization memebers page
2014-06-22 16:53:46 +08:00
fuxiaohei
bf703ef617
add dashboard context switch button
2014-06-22 14:10:12 +08:00
Unknown
ad5ec45dd6
Fix #165
2014-06-21 00:51:41 -04:00
Unknown
8bfa7ae745
Remove qiniu/log
2014-06-20 01:14:54 -04:00
Unknown
f147ad619a
Basic process manager
2014-06-19 01:08:03 -04:00
Unknown
d952b4200c
Add corn rask monitor panel
2014-06-13 13:01:52 -04:00
Unknown
e07674bff1
Support edit release and save as draft
2014-06-12 17:47:23 -04:00
Unknown
fb0972afad
Fix #199
2014-06-12 09:35:51 -04:00
Unknown
9961f9a53c
Fix #197
2014-06-12 09:10:39 -04:00
Unknown
f160b4f33c
Add tar.gz download button and other mirror updates
2014-06-08 17:53:53 -04:00
Unknown
a80d8d96fa
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-06-08 04:45:38 -04:00
Unknown
302c863cda
Fix #242
2014-06-08 04:45:34 -04:00
FuXiaoHei
4fcbf553aa
organisation main page ui
2014-06-07 13:27:24 +08:00
Unknown
4f2f3c2857
Code convention
2014-06-05 22:07:35 -04:00
Unknown
9c3aa6936a
Fix #223
2014-06-03 12:16:44 -04:00
Jan Oliver Oelerich
6fe43eb8d4
Fixed directory permissions for the zip download router
...
If the archives/ directory is created with 0655, it results in a permission error.
2014-06-01 15:22:13 +02:00
Unknown
2657f88d9a
Fix #222
2014-05-31 17:15:04 -04:00
Unknown
ddb7f55035
Prepare for v0.4.0 release
2014-05-30 19:19:30 -04:00
Unknown
fbf274b751
Fix #220
2014-05-30 17:57:38 -04:00
Unknown
422043f422
Fix #219
2014-05-30 16:35:35 -04:00
Unknown
617bbe3fee
Fix #218
2014-05-30 06:34:24 -04:00
Unknown
9085dfa426
Working on #211
2014-05-29 22:09:50 -04:00
slene
e323604d78
display large file
2014-05-28 14:01:41 +08:00
slene
4ee6bc4fca
fix for new git api
2014-05-28 14:01:41 +08:00
Unknown
ab13a29cb5
Fix #209
2014-05-28 01:53:06 -04:00
Unknown
ff690fd976
Fix #200 , add VERSION to template files
2014-05-28 00:06:31 -04:00
Unknown
bf5fcfb49c
Add * to selected label
2014-05-25 23:46:45 -04:00
Unknown
ff48aeddef
Little bug fix
2014-05-25 20:57:01 -04:00
Unknown
688ec6ecbd
Fixed #209
2014-05-25 20:11:25 -04:00
Unknown
87854c95a9
Fixed #200
2014-05-24 15:34:02 -04:00
Unknown
80055bde86
Code convention
2014-05-24 15:28:31 -04:00
Unknown
dce17c86ac
Almost done issue label #200
2014-05-24 03:05:41 -04:00
Unknown
b1bdbd7f94
Almost done issue label #200
2014-05-24 02:31:58 -04:00
FuXiaoHei
1331134316
finish issue edit content preview
2014-05-21 20:49:47 +08:00
Sebastian Jackel
02fb088b80
Remove password from log message on failed login
2014-05-19 09:16:56 +02:00
Unknown
93f8f92523
Finish create new label
2014-05-18 18:07:04 -04:00
Unknown
04890904f9
fix #195
2014-05-16 16:24:26 -04:00
Unknown
956f011dd3
Fix #186
2014-05-16 13:41:08 -04:00
Unknown
4744996f9a
Make gmail auth work
2014-05-15 14:46:04 -04:00
Unknown
db6b71ad03
Update issue-user when change milestone
2014-05-15 12:08:53 -04:00
Lunny Xiao
f4486f3eec
bug fixed #193
2014-05-15 22:34:36 +08:00
Lunny Xiao
7869cfccb9
Merge pull request #192 from DerDackel/ldapssl
...
Add LDAP over SSL support
2014-05-15 20:52:05 +08:00
Sebastian Jackel
eb264a112b
Add LDAP over SSL support
2014-05-15 14:27:16 +02:00
Unknown
b70db61854
Fix #185
2014-05-14 13:04:57 -04:00
Unknown
16bddd593a
Finish change issue’s milestone
2014-05-14 11:14:51 -04:00
Unknown
46fc36c3a6
Finish change issue’s milestone
2014-05-14 10:55:36 -04:00
Unknown
9100786beb
Fix #185
2014-05-14 08:51:04 -04:00
Unknown
5ed5aa5228
Finish milestone
2014-05-13 19:46:48 -04:00
Unknown
33ec0632ff
Fix #183
2014-05-13 19:26:13 -04:00
Michael Litvak
cca2a53d6f
Fix issue link in issues page
...
The link assumes that the issue belongs to the signed in
user, which is not necessarily the case
I changed it to use repository owner name instead
2014-05-13 23:37:09 +03:00
Unknown
2eee1e9bc2
Finish edit a milestone
2014-05-13 13:28:21 -04:00
Unknown
c117f9e73f
Fix #166
2014-05-12 20:22:35 -04:00
Unknown
a913aff1d0
Show collaborative repositories in dashboard
2014-05-12 15:14:22 -04:00
Unknown
54e95fa367
Finish add new milestone
2014-05-12 14:06:42 -04:00
Unknown
f1130ce5e9
Fix edit auth page bug
2014-05-12 11:02:36 -04:00
FuXiaoHei
1769bb2f26
add milestone edit ui
2014-05-12 21:51:22 +08:00
Unknown
0970d6cc38
Log to different adapter according to level
2014-05-11 14:37:12 -04:00
Unknown
68fb62347f
Finish issue assignee
2014-05-11 13:46:36 -04:00
Unknown
2c73ced0db
Fix #173
2014-05-11 10:37:31 -04:00
Lunny Xiao
f68e279150
spell bug fixed
2014-05-11 20:18:57 +08:00
Unknown
c5dbc24ca4
UI fix
2014-05-11 07:43:57 -04:00
Lunny Xiao
bf58679390
add support for smtp authentication
2014-05-11 18:10:37 +08:00
Lunny Xiao
55019bfbc5
merge all login methods
2014-05-11 14:12:45 +08:00
slene
7d84cc96e8
update with git api
2014-05-10 11:14:24 +08:00
FuXiaoHei
2eabeba6b7
finish milestone add page
2014-05-09 22:33:07 +08:00
Unknown
4ef9494637
Fix panic when view issue without login
2014-05-09 06:37:32 -04:00
Unknown
25713ab209
Fix #167
2014-05-08 20:00:07 -04:00
Unknown
914ffa496f
Show private repository activities in dashboard if has access
2014-05-08 19:17:43 -04:00
Unknown
a742ee543e
Add change assignee back end
2014-05-08 17:17:45 -04:00
Unknown
e867283406
Assignee back end
2014-05-08 12:24:11 -04:00
Unknown
495d939ca5
Waiting for UI
2014-05-07 20:36:00 -04:00
Unknown
33d32585b1
Add mention, read/unread support of issue tracker
2014-05-07 16:51:14 -04:00
Unknown
6fb7229bea
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-05-07 12:09:35 -04:00
Unknown
7407f9caf3
Finish issue design
2014-05-07 12:09:30 -04:00
FuXiaoHei
d76772adb9
add milestone list page
2014-05-07 21:01:00 +08:00
Unknown
8ca14e2109
Improve delete SSH key
2014-05-06 16:28:52 -04:00
Unknown
7cb5a15c9b
Batch of mirror fixes
2014-05-06 13:47:47 -04:00
Unknown
e573855a4f
Fix #98 , support web hook
2014-05-06 11:50:31 -04:00
Unknown
94bccbb148
Finish edit and remove web hook
2014-05-05 21:36:08 -04:00
Unknown
24f614f6db
Finish add web hook
2014-05-05 20:52:25 -04:00
Unknown
6e3dba2cc5
Clean repo code
2014-05-05 19:58:13 -04:00
Unknown
bbdfe25769
User code clean and ui improve
2014-05-05 16:21:43 -04:00
Unknown
c1eb4d894a
Clean api code
2014-05-05 13:08:01 -04:00
FuXiaoHei
d34c3bb751
finish webhook ui,
...
some ui fix
2014-05-05 20:16:24 +08:00
Unknown
3b7465f817
fix code
2014-05-05 05:32:47 -04:00
Lunny Xiao
d8136c9c3c
Merge branch 'dev-ldap' into dev
2014-05-05 16:42:15 +08:00
Lunny Xiao
1652dd5068
basic authentications
2014-05-05 16:40:25 +08:00
Unknown
02687cbdf3
Add mail notify for new collaborator
2014-05-05 04:27:28 -04:00
Unknown
7b60756f2c
Fix Collaborators cannot commit
2014-05-03 01:37:49 -04:00
Lunny Xiao
79ea34e70e
ldap support
2014-05-03 10:48:14 +08:00
Unknown
e10096ee2e
Mirror fix on UI
2014-05-02 19:23:06 -04:00
Unknown
a9e6d49dc6
Fix #159
2014-05-02 17:30:59 -04:00
FuXiaoHei
3e856928a2
add webhooks page ui
2014-05-02 22:07:34 +08:00
Unknown
e7d8fadb08
Add disable gravatar option
2014-05-01 21:30:04 -04:00
Unknown
100cd181bc
Add router log config option
2014-05-01 18:53:41 -04:00
Unknown
f6c4fbeb37
Collaborator
2014-05-01 11:32:12 -04:00
FuXiaoHei
cc1eb5643e
Merge branch 'dev' of https://github.com/gogits/gogs into dev
2014-05-01 20:57:11 +08:00
Unknown
89c99167b2
Fix #149
2014-05-01 08:26:41 -04:00
Unknown
46af92c57e
Clean files
2014-05-01 06:55:39 -04:00
FuXiaoHei
52fbb9788a
add collaboration page ui
2014-05-01 17:44:22 +08:00
Unknown
49dc57e336
Add /api/v1/users/search
2014-04-30 23:48:01 -04:00
Unknown
2401e68d7e
Prepare for v0.3.1 hotfix
2014-04-28 21:53:40 -04:00
无闻
31805e2bbe
Merge pull request #135 from clee/show-parents
...
Show parents in commit diff page
2014-04-27 19:46:38 -04:00
Chris Lee
6700257558
Show parents in commit diff page
2014-04-27 23:43:14 +00:00
Unknown
41b0a7b97c
Mirror fix on public key
2014-04-27 17:01:39 -04:00
Unknown
62240b6bc1
Add login by email
2014-04-27 01:54:08 -06:00
Unknown
ce05a8d7b6
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
templates/repo/single_list.tmpl
2014-04-27 01:06:57 -06:00
Unknown
62d23e9154
HTTP no follow and offline mode
2014-04-27 01:05:13 -06:00
无闻
9fdf4bc277
Merge pull request #134 from clee/master
...
Use commit summaries instead of full messages
2014-04-27 00:56:06 -06:00
Chris Lee
8a8f84d245
Use commit summaries instead of full messages
2014-04-27 06:46:03 +00:00
Unknown
59d0e73c35
Batch mirror fix
2014-04-26 22:34:48 -06:00
无闻
37cbfc032a
Merge pull request #112 from juju2013/master
...
basic support for LDAP/Microsoft Active Directory authentication
2014-04-24 14:25:56 -06:00
James Anderson
e5af34a078
fixed some broken forms that were introduced in james-anderson@521c5f0e10
2014-04-24 14:50:24 -04:00
juju2013
efc05ea1de
initial support for LDAP authentication/MSAD
2014-04-23 23:07:54 +02:00
Unknown
8bc502a1ea
New err check style
2014-04-22 22:34:49 -04:00
Unknown
5435b259cc
Merge branch 'master' of github.com:gogits/gogs into dev
2014-04-22 05:30:53 -04:00
Unknown
2a9da4b8e5
Fix #92
2014-04-22 03:41:47 -04:00
Bryan Johnson
34d18a19a3
Minor grammatical fix for Disable Registration feature
2014-04-21 18:03:04 -04:00
Unknown
8bed017557
Add build tag enable prompt
2014-04-19 22:13:22 -04:00
Unknown
eda3f8b3b3
Mirror updates
2014-04-19 06:00:08 -04:00
Unknown
b32e223db5
Mirror fix
2014-04-18 21:17:43 -04:00
Unknown
8719c1b8c5
Mirror bug fix
2014-04-18 12:12:10 -04:00
Unknown
49c01c0b57
Fix import path
2014-04-18 09:35:09 -04:00
Unknown
1bfe4ee665
Merge branch 'master' of github.com:gogits/gogs
2014-04-16 07:13:20 -04:00
Unknown
2dc0329c5f
Fix auth issue on #80
2014-04-16 04:45:02 -04:00
Unknown
6277f8497c
Auth problem related #80
2014-04-16 04:37:07 -04:00
Christopher Brickley
4c5a6e4d87
swap \n for \000, update len check, when reading receive-pack input
2014-04-15 22:07:28 -04:00
Unknown
c3a52f7dd0
Mirror bug fix on downloading zip
2014-04-15 20:01:20 -04:00
slene
4fafc76052
zip archive download
2014-04-16 00:29:03 +08:00
Lunny Xiao
4210f56dbc
bug fixed for http clone
2014-04-14 23:22:00 +08:00
Unknown
c36e7d322e
Mirror updates
2014-04-14 04:11:33 -04:00
Unknown
f644cefa86
Finish release
2014-04-14 01:57:25 -04:00
Unknown
d2b53dd43b
Add weibo oauth
2014-04-13 21:00:12 -04:00
Unknown
4b9b8024ba
Clean oauth code
2014-04-13 18:12:07 -04:00
Unknown
4c1452574a
go get
2014-04-13 05:02:11 -04:00
Unknown
ea74be2f2e
go get
2014-04-13 04:27:29 -04:00
Unknown
5c2da610a2
Move binding as subrepo
2014-04-13 01:57:42 -04:00
Unknown
c9a1eb4789
Able to change mirror interval now
2014-04-12 22:30:00 -04:00
slene
52b4ab2aa5
update with new git
2014-04-13 09:35:36 +08:00
Unknown
9ffa8a4083
finish mirror fix #63
2014-04-12 21:30:09 -04:00
Unknown
90f6aa8cd1
Add repo mirror and import
2014-04-12 20:35:35 -04:00
skyblue
75d2affcbf
add oauth2 qq support
2014-04-13 01:15:19 +08:00
skyblue
f92851e347
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-12 23:19:22 +08:00
skyblue
2ce0c3befe
add google oauth2 support
2014-04-12 23:19:17 +08:00
Unknown
31d613c01d
Mirror fix
2014-04-12 01:45:43 -04:00
Unknown
d305448fa8
Mirror bug fix
2014-04-11 23:52:08 -04:00
zhsso
2e6d50addc
combine getCommit ById and ByBranch in routers/repo/commit.go
2014-04-11 22:57:25 -04:00
Unknown
4fc5dcc764
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-11 21:47:43 -04:00
Unknown
33aa4f7438
Support private repo
2014-04-11 21:47:39 -04:00
skyblue
f8e97b75fb
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-12 09:42:15 +08:00
skyblue
5c1312f38e
clean oauth2 code
2014-04-12 09:42:09 +08:00
Unknown
d6dac160df
Pages in commits list page
2014-04-11 20:23:34 -04:00
Unknown
47aa53bd36
Add search commits
2014-04-11 19:44:13 -04:00
skyblue
4c6e0e9499
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-12 01:01:40 +08:00
skyblue
dd815ae7b5
finish github oauth2 support
2014-04-12 01:01:30 +08:00
Unknown
11f54b1426
Mirror bug fix
2014-04-11 12:14:11 -04:00
Lunny Xiao
ee2d8d2469
remove trace
2014-04-11 10:44:09 +08:00
Lunny Xiao
8cfa2be433
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-11 10:28:23 +08:00
Lunny Xiao
db39e58a13
add actions for http push
2014-04-11 10:27:13 +08:00
Unknown
306aa5bffe
Add support default branch
2014-04-10 22:03:31 -04:00
Unknown
8980675a9f
Fix #69
2014-04-10 18:09:57 -04:00
Unknown
45462662e9
Add flash
2014-04-10 16:36:50 -04:00
Unknown
29e255422e
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-10 14:37:51 -04:00
Unknown
af552596cf
Work on form resubmit
2014-04-10 14:37:43 -04:00
zhsso
a4cbe79567
fix
2014-04-10 14:20:58 -04:00
zhsso
f3ed11d177
mistakes
2014-04-10 14:20:01 -04:00
Lunny Xiao
a24c0b92e4
bug fixed
2014-04-10 23:02:08 +08:00
Lunny Xiao
88d873c67f
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-10 22:22:18 +08:00
Lunny Xiao
94c7278194
Merge branch 'master' of github.com:gogits/gogs into dev
...
Conflicts:
web.go
2014-04-10 22:21:12 +08:00
Lunny Xiao
16b6e5d50b
bug fixed
2014-04-10 22:12:32 +08:00
Unknown
5d4025cb5a
Add go get meta support
2014-04-09 21:42:25 -04:00
Unknown
9f7bd5007b
Work on mirror repo
2014-04-09 14:20:02 -04:00
skyblue
8683d2f857
remove martini oauth2 depend
2014-04-10 00:07:57 +08:00
FuXiaoHei
c72e1b5c2a
repo-import page ui
2014-04-09 21:28:00 +08:00
Unknown
a991ebf5d0
Fix #54
2014-04-08 15:27:35 -04:00
Unknown
b506429803
Merge branch 'dev' of github.com:gogits/gogs into dev
2014-04-08 12:41:37 -04:00
Unknown
115a349131
Fix #67
2014-04-08 12:41:33 -04:00
skyblue
24d0ca4aa0
clean tail
2014-04-09 00:31:09 +08:00
skyblue
d4565483e6
add id for oauth2
2014-04-09 00:26:12 +08:00
Unknown
9ea9818d32
Fix issue with log in with GitHub but need more error handle after
2014-04-07 12:56:40 -04:00
skyblue
05fb34eacd
first works oauth2(github). need to login with /user/login/github
2014-04-07 18:01:25 +08:00
Unknown
8c9a0494ec
Add @ # commit link detect on all markdown render
2014-04-07 01:55:22 -04:00
Unknown
e7c8a3cb8d
Add salt for every single user
2014-04-06 16:10:57 -04:00
Unknown
2846ff7d31
Fix bug related to log
2014-04-06 13:00:20 -04:00
FuXiaoHei
98f918ed28
Merge branch 'dev' of https://github.com/gogits/gogs into dev
2014-04-06 14:54:39 +08:00
FuXiaoHei
3ede496383
add release-new route
2014-04-06 14:54:28 +08:00
Unknown
b7c3b0cc73
Add reset password, fix #58
2014-04-05 12:32:34 -04:00
Unknown
3ebc9b991a
Use gogits/session for oauth2
2014-04-05 11:22:14 -04:00
Lunny Xiao
9791e70da6
bug fixed
2014-04-05 22:24:10 +08:00
Lunny Xiao
a92826a8fe
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
routers/repo/repo.go
2014-04-05 15:30:49 +08:00
Lunny Xiao
493b0c5ac2
add ssl support for web
2014-04-05 15:17:57 +08:00
Unknown
eb803ec5eb
Add transfer repository
2014-04-04 18:31:09 -04:00
Unknown
4a4997a3c7
Merge branch 'master' of github.com:gogits/gogs into dev
2014-04-04 10:34:18 -04:00
Lunny Xiao
6b9f7fd758
basiclly http push
2014-04-04 17:26:46 +08:00
Unknown
e9c4156c87
Add: rename user
2014-04-03 16:33:27 -04:00
Unknown
79a610592e
Add: rename repository
2014-04-03 15:50:55 -04:00
Unknown
db66b8da72
Add release tmpl
2014-04-02 12:43:31 -04:00
Unknown
97b133bbee
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
routers/user/user.go
2014-04-02 10:45:01 -04:00
Unknown
d9005ee970
Improve issue mail content
2014-04-02 10:38:30 -04:00
skyblue
adf42a5b54
change oauth2 to modules
2014-04-02 22:27:54 +08:00
skyblue
93f6e98047
change oauth2 path
2014-04-02 22:23:45 +08:00
skyblue
5180506678
split into social.go
2014-04-02 10:39:04 +08:00
Unknown
13824af291
Merge branch 'master' of github.com:gogits/gogs into dev
2014-04-01 21:08:02 -04:00
skyblue
272c27c8f2
add github social login, first step
2014-04-02 08:14:56 +08:00
Unknown
91e6db1bae
Fix log bug
2014-04-01 00:07:25 -04:00
Unknown
e938863ae6
Mirror fix on UI
2014-03-30 16:34:23 -04:00
Unknown
2a0066420a
Fix bug work with sqlite3
2014-03-30 16:01:50 -04:00
Unknown
d0e6a4c25a
Change new martini impot path
2014-03-30 12:11:28 -04:00
Unknown
3698431fc1
Fix install bugs
2014-03-30 11:58:21 -04:00
Unknown
9f91dee53f
Bug fix #45
2014-03-30 11:09:59 -04:00
Unknown
a6e12aaef6
Fixing bug
2014-03-30 10:47:08 -04:00
Unknown
03cc39ea12
Mirror fix on #45
2014-03-30 09:39:44 -04:00
slene
d6c9e3413a
fix display bare repo
2014-03-30 13:30:17 +08:00
slene
578d981d7e
display bare repo page
2014-03-30 11:38:41 +08:00
slene
b27c34f39a
update git api. fix link... and so on
2014-03-30 10:13:02 +08:00
slene
41ca0ed302
remove ctx.Repo.IsValid
2014-03-30 10:12:42 +08:00
Unknown
107a1eadac
Finish close and reopen issue, install page, ready going to test stage of v0.2.0
2014-03-29 17:50:51 -04:00
Unknown
cad2ced394
Bug fix
2014-03-29 11:56:00 -04:00
Unknown
ffa59739b6
Add edit issue
2014-03-29 10:24:42 -04:00
Unknown
2c073afbec
Mirror fix and update
2014-03-29 10:01:52 -04:00
FuXiaoHei
ecce694d77
issue content ajax preview
2014-03-29 21:16:06 +08:00
Unknown
8282828820
Fix action email bug
2014-03-29 07:50:25 -04:00
Lunny Xiao
879ef8d81f
Merge branch 'master' of github.com:gogits/gogs
2014-03-29 19:30:11 +08:00
Lunny Xiao
a726c125b5
Add PushCommit
2014-03-29 19:29:52 +08:00
Unknown
beb1761d7c
Mirror fix
2014-03-29 06:55:51 -04:00
Unknown
6e376bb85c
Working on install page
2014-03-28 18:40:31 -04:00
Unknown
a55941ff83
Add auto-detect home directory
2014-03-28 17:34:07 -04:00
Unknown
63dae435f9
Bug fix
2014-03-28 09:16:12 -04:00
Unknown
76b8642348
Bug fix
2014-03-28 09:06:48 -04:00
Unknown
cb05b8325c
Update config option
2014-03-28 08:39:35 -04:00
Unknown
0fd754bbe0
Working on install page
2014-03-28 07:26:22 -04:00
Unknown
5344a03003
Bug fix
2014-03-27 21:15:53 -04:00
slene
8b700e825b
fix panic, add repo check, signed check
2014-03-28 08:38:49 +08:00
Unknown
eb6021f73f
Fix issue pages URL params
2014-03-27 19:42:10 -04:00
Unknown
34f4af9ebf
Working on issue and install page
2014-03-27 16:31:32 -04:00
slene
6b43067e1b
image display in diff page
2014-03-28 01:17:09 +08:00
slene
06d3c87b23
Merge branch 'master' of github.com:gogits/gogs
2014-03-28 00:51:49 +08:00
slene
10b412d237
commit raw file
2014-03-28 00:50:13 +08:00
Unknown
3144fac03c
IP: RC Code Review
2014-03-27 12:48:29 -04:00
slene
417d861be6
fix download
2014-03-28 00:38:44 +08:00
slene
bce8586bc6
Merge branch 'master' of github.com:gogits/gogs
2014-03-28 00:32:19 +08:00
slene
346db02d89
fix image display
2014-03-28 00:30:20 +08:00
slene
16cb1e974c
print err
2014-03-28 00:14:09 +08:00
slene
677643b812
fix read commit source
2014-03-28 00:07:22 +08:00
Unknown
f470c241d6
IP: RC Code Review
2014-03-27 11:37:33 -04:00
Unknown
dd6246877d
Almost done diff page
2014-03-26 16:41:16 -04:00
Unknown
4b9eef50c9
Add comment of issue
2014-03-26 12:31:01 -04:00
FuXiaoHei
08405a4fea
add issue view ui
2014-03-26 21:47:20 +08:00
FuXiaoHei
0b22d90b7c
Merge branch 'master' of https://github.com/gogits/gogs
2014-03-26 20:02:15 +08:00
FuXiaoHei
f5c9149dd5
add issue toolbar flag
2014-03-26 20:02:04 +08:00
Unknown
409e4cde7a
auth fix
2014-03-26 07:42:08 -04:00
Unknown
3cc860a46f
auth fix
2014-03-26 07:40:50 -04:00
Unknown
87de66561c
Start working on diff page
2014-03-25 23:53:01 -04:00
Unknown
c1a3d4fefb
Add mail notify for creating issue
2014-03-25 21:37:18 -04:00
Unknown
d3b8e9daa1
Add notify watcher action
2014-03-25 14:04:57 -04:00
Unknown
2fa8d0c8dd
Added create issue
2014-03-25 12:12:27 -04:00
FuXiaoHei
23d103c721
issue list in user
2014-03-25 23:00:26 +08:00
FuXiaoHei
124c4d72bf
issue list in repo
2014-03-25 22:42:45 +08:00
FuXiaoHei
6e33e54e71
add issue-create template file
2014-03-25 18:27:29 +08:00
FuXiaoHei
7f6126dd04
install sample page
2014-03-25 16:51:42 +08:00
Unknown
6ef3e8b3c9
Merge branch 'master' of github.com:gogits/gogs
...
Conflicts:
templates/repo/single_file.tmpl
2014-03-24 12:45:57 -04:00
Unknown
743fee6015
Fix
2014-03-24 12:43:51 -04:00
slene
123c7b44e8
fix
2014-03-25 00:42:57 +08:00
slene
ff36248419
raw download
2014-03-24 23:56:32 +08:00
FuXiaoHei
98ec6a4eaa
Merge branch 'master' of https://github.com/gogits/gogs
2014-03-24 21:27:28 +08:00
FuXiaoHei
5e22f1437a
diff page ui
2014-03-24 21:27:19 +08:00
Unknown
59bbddb318
Mirror fix
2014-03-24 07:36:38 -04:00
FuXiaoHei
137538e54b
refactor repo.go
2014-03-24 18:25:15 +08:00
Unknown
b9b82cfe47
Mirror updates
2014-03-23 19:09:11 -04:00
Unknown
f8cfb81fb0
Mirror updates
2014-03-23 12:16:17 -04:00
Unknown
6bc7ae971a
Mirror fix
2014-03-23 10:58:50 -04:00
Unknown
97debac185
SSL enable config option
2014-03-23 08:40:40 -04:00
Unknown
1eb078d0a8
Fix action
2014-03-23 06:27:01 -04:00
FuXiaoHei
bdd32f152d
add m.NotFound handler
2014-03-23 13:48:01 +08:00
FuXiaoHei
47493a0191
use ctx.Handle to handle 404 page
2014-03-23 13:12:55 +08:00
Unknown
7356153ba3
Batch updates
2014-03-22 17:59:22 -04:00
Unknown
cb52f6d07d
Add auto-login
2014-03-22 16:40:09 -04:00
Unknown
59ffdbf6f8
Add create, list, view issue
2014-03-22 16:00:46 -04:00
Unknown
b3cfd9fe0c
Fix SSH key bug in windows
2014-03-22 14:27:03 -04:00
Unknown
61e2922601
Working on issues
2014-03-22 13:50:50 -04:00
Unknown
e3f55ca0fb
Need a field to specify if repository is bare
2014-03-22 11:59:14 -04:00
Unknown
fd1831052c
Update session
2014-03-22 09:21:57 -04:00
slene
f9c07c4186
update session
2014-03-22 20:49:53 +08:00
Unknown
0d1872ebe3
Add admin memStatus panel
2014-03-22 07:42:24 -04:00
Unknown
7a1ff8636c
Add config option: Picture cache path
2014-03-22 06:42:19 -04:00
Unknown
76cd448e79
Add admin delete user
2014-03-22 06:20:00 -04:00
Lunny Xiao
17da2fd2e3
merged
2014-03-22 00:50:47 +08:00
Lunny Xiao
efdaf6ee15
add http protocol clone support
2014-03-22 00:48:26 +08:00
Unknown
f219ddcf4e
Add log config panel in admin
2014-03-21 12:13:13 -04:00
Unknown
d40499e7fa
Finsih mail resend limit
2014-03-21 10:09:57 -04:00
FuXiaoHei
ecc61ced41
update admin nav ui
2014-03-21 21:06:05 +08:00
Unknown
30618b271a
Add admin edit user
2014-03-21 06:15:58 -04:00
Unknown
e67653cf13
Bug fix
2014-03-21 04:13:32 -04:00
Unknown
c1576b4c40
Add admin add user
2014-03-21 03:27:59 -04:00
Unknown
f6596f11c4
All configuration reload-able
2014-03-21 01:48:10 -04:00
Unknown
369ddf76a8
Batch fix
2014-03-21 01:09:22 -04:00
Unknown
06631ab91f
Basic admin data table, models changes
2014-03-20 16:04:56 -04:00
Unknown
3b387336bf
Add Repository/user name filter
2014-03-20 11:41:24 -04:00
slene
b4a55434a4
wrong link should 404
2014-03-20 21:43:54 +08:00
slene
47234f1031
fix ext
2014-03-20 21:11:48 +08:00
slene
de956c4776
linenums
2014-03-20 21:10:37 +08:00
slene
c6bd723ce1
Merge branch 'master' of github.com:gogits/gogs
...
Conflicts:
public/js/app.js
2014-03-20 21:02:52 +08:00
FuXiaoHei
cb80111e89
guide page for bare repo
...
some ui fix
2014-03-20 20:12:31 +08:00
Unknown
4cf6cc63b0
Work on admin
2014-03-20 08:02:14 -04:00
Unknown
9f9cd6bfc6
Work on admin
2014-03-20 07:50:26 -04:00
slene
8ef71343df
fix link
2014-03-20 17:25:04 +08:00
Unknown
5cb2d3d2e2
Bug fix
2014-03-20 03:24:17 -04:00
slene
24678d73f5
read single file
2014-03-20 13:31:24 +08:00
Unknown
a922c3ff6a
Watch backend
2014-03-19 23:20:55 -04:00
slene
8b0f421eb5
Merge branch 'master' of github.com:gogits/gogs
2014-03-20 09:17:24 +08:00
slene
0e7a2d9d3c
directory redirect
2014-03-20 09:16:48 +08:00
Unknown
6f68620860
Pools limit concurrent nums
2014-03-19 21:05:48 -04:00
Unknown
601c10309d
Bug fix
2014-03-19 13:24:46 -04:00
Unknown
757f360949
Render data in commit list page
2014-03-19 13:14:56 -04:00
Unknown
35d473f04a
Finish verify email
2014-03-19 12:50:44 -04:00
slene
67f92c9d47
add parent folder link in file list
2014-03-20 00:08:20 +08:00
Gogs
c6e12d2568
add up url in file list
2014-03-19 23:23:30 +08:00
Unknown
a22c4ba71d
Merge branch 'master' of github.com:gogits/gogs
2014-03-19 10:46:53 -04:00
Unknown
ddbd2ce152
Add register mail tpl
2014-03-19 10:46:48 -04:00
FuXiaoHei
a63b5982b5
top nav arrow update
2014-03-19 22:25:27 +08:00
FuXiaoHei
9bc06dc716
Merge remote-tracking branch 'origin/master'
...
Conflicts:
routers/user/user.go
2014-03-19 22:23:46 +08:00
FuXiaoHei
f0993ae3c8
repo commit list ui
2014-03-19 22:22:27 +08:00
slene
199fdd0336
fork render
2014-03-19 22:21:03 +08:00
FuXiaoHei
c7660a81c6
Merge remote-tracking branch 'origin/master'
...
Conflicts:
routers/user/user.go
2014-03-19 22:19:17 +08:00
FuXiaoHei
a0e73e2b54
top nav arrow update
2014-03-19 22:15:28 +08:00
slene
483cc31369
Revert "fork render"
...
This reverts commit 56af7e99a8
.
2014-03-19 22:11:28 +08:00
Gogs
56af7e99a8
fork render
2014-03-19 21:58:51 +08:00
Unknown
a2fbb24615
Add active page
2014-03-19 09:24:02 -04:00
Unknown
de087c7b4a
Add send register confirm mail
2014-03-19 08:27:27 -04:00
Unknown
fbbae2b721
Working on register mail confirmation
2014-03-19 07:21:23 -04:00
Unknown
bd9d90d8c4
Add some log
2014-03-19 04:48:45 -04:00
Unknown
fbd252c1cf
Mirror fix
2014-03-18 18:31:54 -04:00
shengxiang[skyblue]
ccd43b09b2
add some comment
2014-03-18 21:58:58 +08:00
Unknown
d886f4df97
Merge branch 'master' of github.com:gogits/gogs
...
Conflicts:
models/repo.go
routers/repo/single.go
templates/repo/single.tmpl
2014-03-18 00:19:15 -04:00
Unknown
e44d9ffd89
Delete commit and update getlastcommit
2014-03-18 00:14:05 -04:00
Lunny Xiao
3ceb008e1f
add commit view
2014-03-18 11:22:19 +08:00
Unknown
e656609b0d
Bug fix
2014-03-17 17:00:35 -04:00
Unknown
9eabbe68a6
Bug fix
2014-03-17 15:32:33 -04:00
Unknown
b3dc159c45
Finding bug
2014-03-17 14:31:11 -04:00
Unknown
b51a9d109f
Mirror change
2014-03-17 14:21:38 -04:00
Unknown
9d3b003add
Merge branch 'master' of github.com:gogits/gogs
2014-03-17 11:56:55 -04:00
Unknown
757e4f658c
Completely rule out the cgo
2014-03-17 11:56:50 -04:00
slene
d6f3333e48
small fix
2014-03-17 23:41:29 +08:00
slene
4249cec68c
resolve relative path in markdown file
2014-03-17 23:22:27 +08:00
Lunny Xiao
45a6444b1e
add commits
2014-03-17 23:04:49 +08:00
slene
f90e37ade0
fixed
2014-03-17 19:56:33 +08:00
Unknown
ee93186f72
Mirror change
2014-03-17 06:58:34 -04:00
slene
5bc2a1a6f9
show readme.md
2014-03-17 18:46:54 +08:00
FuXiaoHei
df1985e1e8
Merge remote-tracking branch 'origin/master'
2014-03-17 17:15:02 +08:00
FuXiaoHei
3a3ac1f0f3
repo branch page ui
2014-03-17 17:14:31 +08:00
Unknown
5c3054c3b7
Merge branch 'master' of github.com:gogits/gogs
2014-03-17 04:33:59 -04:00
Unknown
cf9fa06eae
Mirror change
2014-03-17 04:33:53 -04:00
slene
3a2eee0827
fix repo setting and delete repo
2014-03-17 14:36:28 +08:00
Unknown
1043ab506e
Merge branch 'master' of github.com:gogits/gogs
2014-03-17 01:14:10 -04:00
Unknown
95cb7cb2ad
Nothing
2014-03-17 01:14:05 -04:00
FuXiaoHei
d64a8e8d3a
Merge remote-tracking branch 'origin/master'
2014-03-17 13:12:57 +08:00
FuXiaoHei
c101471bdf
ui update, repo-assignment panic bug fix
2014-03-17 13:12:28 +08:00