MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-09 19:42:09 +01:00
Code Issues Releases Wiki Activity
17339 commits 17 branches 214 tags 749 MiB
Commit graph

1189 commits

Author SHA1 Message Date
Lauris BH
f33e6ae09e Remove unit types commits and settings (#2161) 
* Remove unit types commits and settings

* Can not limit units in administrator teams

* Limit changing units only to teams with read and write access mode

* Small code optimization
 2017-07-17 10:04:43 +08:00
Lauris BH
047a67a90b Refactor vue delimeters to use es6 template delimeters (#2171) 2017-07-15 22:22:26 +08:00
Aaron Walker
6a3c03762a API: support '/orgs/:org/repos' (#2047) 
* API: support '/orgs/:org/repos'
 2017-07-13 13:14:15 +02:00
Lauris BH
a739991b36 Fix repository settings collobration list display (#2151) 2017-07-12 22:32:28 -05:00
Bo-Yi Wu
2b05b104ef Add verify changed less-file step to Makefile (#1861) 2017-07-12 04:28:57 +02:00
Guillermo Bonvehí
858197b453 Fix #1271: Call location.reload after XHR finishes (#2071) 
location.reload was being called when the related dropdown
was hidden, even if a request initiated before to update this
value hadn't finished. This caused troubles on Firefox.
 2017-06-28 16:55:28 +08:00
silverwind
0168b7073d Use monospace font in githook editor (#1958) 2017-06-13 10:48:49 +08:00
Jonas Östanbäck
ad70af1248 Add repo fork swagger (#1941) 2017-06-12 08:59:51 +08:00
silverwind
f2fcd9dcd8 Support CRLF when splitting code lines for display (#1862) 
* Support CRLF when splitting code lines for display

* refactor, fix mixed match

* fmt

* split on both LF and CRLF, use raw literals in regexes

* simplify
 2017-06-10 23:20:25 +08:00
silverwind
ae922afa2d Prevent accidential selection of line numbers in code view (#1860) 2017-06-05 02:52:35 -05:00
Antoine GIRARD
a97d6bf24b Use production version of vuejs. (#1869) 2017-06-04 11:04:42 +08:00
Hussain Khalil
009a073990 Remove annoying difference in button heights. (#1853) 
* Remove annoying difference in button heights.

Why was that even there?

See before & after: http://imgur.com/a/yKdUR

* (2/2) Remove annoying difference in button heights
 2017-06-03 16:58:43 +08:00
Antoine GIRARD
976c2a05fa Fix change introduce by update of go-swagger. (#1727) 2017-06-01 23:35:31 -05:00
Sondre Nilsen
24859fe5b6 Fix FOUC on Firefox (#1728) 
Firefox users will experience a flash of unstyled content on loading
various pages, this patch will fix this issue using Filament Groups
loadCSS library to asynchronously load the CSS responsible for the FOUC.

Will fix #1698.

Signed-off-by: Sondre Nilsen <nilsen.sondre@gmail.com>
 2017-05-31 09:05:49 +08:00
Rémy Boulanouar
e0c6ab2d44 Add Gitea Webhook (#1755) 
* Replace Gogs by Gitea

* Fix missing changes

* Create Gitea webhook and put Gogs webhook apart.
 2017-05-29 02:17:15 -05:00
Andrey Nering
e67ece26f0 Merge pull request #1750 from andreynering/dashboard-search-org-repos 
More fixes for dashboard search
 2017-05-27 17:40:09 -03:00
Andrey Nering
12dbdaac76 Fix private repo icon 2017-05-27 13:40:54 -03:00
Patrick G
98ae013e90 Make navbar scroll on overflow (#1777) 
* Scrollbars on overflow of horizontal nav

* Update _base.less

* Add fade out on right side of overflowing nav

* Update _base.less
 2017-05-24 14:00:40 +08:00
Andrey Nering
be5323a05f Update HighlightJS and fix YAML files highlighting (#1764) 
* Update HighlightJS to 9.11.0

* Fix YAML files highlighting
 2017-05-20 11:52:35 +08:00
Jonas Östanbäck
0161e46b5a Add swagger comment for MirrorSync (#1747) 
* Add swagger comment for MirrorSync

* Generate swagger.v1.json
 2017-05-19 08:20:06 +08:00
Jonas Östanbäck
5db5e16ab6 Correct grammar in APIEmpty documentation (#1748) 
* Correct grammar in APIEmpty doc

* Generate swagger.v1.json
 2017-05-18 22:39:42 +08:00
Andrey Nering
dc2b28ed76 Show repos acording to user/organization 2017-05-18 11:28:29 -03:00
Antoine GIRARD
91417e9715 re-Generate swagger.json (#1722) 
changes introduced to repo format by : go-gitea/gitea#1687 go-gitea/go-sdk#58  go-gitea/gitea#1668 go-gitea/go-sdk#56
 2017-05-14 17:37:15 +08:00
Andrey Nering
ab79069dc7 Improve dashboard repo search (#1652) 
* Add VueJS

* Improve dashboard search

* Fix tab switching

* Fix input autofocus
 2017-05-09 08:31:30 +08:00
Lauris BH
51d0becb42 Add configuration option for default permission to create Organizations (#1686) 2017-05-08 21:51:53 +02:00
Lauris BH
2e17dda8bb Remove sha1 hash display in repository table and add latest commit GPG check (#1678) 2017-05-05 15:15:36 +08:00
Peter Dave Hello
b6206e4788 Fix static files permission under public/ (#1675) 2017-05-05 08:42:28 +08:00
Jonas Östanbäck
59f5bbab0d Fix CSS for wiki markdown (#1660) 2017-05-03 20:22:14 +08:00
Antoine GIRARD
3edb0c5894 Generate swagger json (#1402) 
- Generate swagger.json into public/
- Add swagger-ui auto-installation
- Add footer link to local swagger-ui
- Add /swagger url for using app url.
- Fix Swagger-UI version via git tag
 2017-05-02 15:35:59 +02:00
Willem van Dreumel
950f2e2074 Additional OAuth2 providers (#1010) 
* add google+

* sort signin oauth2 providers based on the name so order is always the same

* update auth tip for google+

* add gitlab provider

* add bitbucket provider (and some go fmt)

* add twitter provider

* add facebook provider

* add dropbox provider

* add openid connect provider incl. new format of tips section in "Add New Source"

* lower the amount of disk storage for each session to prevent issues while building cross platform (and disk overflow)

* imports according to goimport and code style

* make it possible to set custom urls to gitlab and github provider (only these could have a different host)

* split up oauth2 into multiple files

* small typo in comment

* fix indention

* fix indentation

* fix new line before external import

* fix layout of signin part

* update "broken" dependency
 2017-05-01 21:26:53 +08:00
Peter Dave Hello
2368bbb672 Optimize png images via Google zopflipng [ci skip] (#1639) 2017-04-30 20:04:36 +08:00
Antoine GIRARD
8371f94d06 Rework SSH key management UI to add GPG (#1293) 
* Rework SSH key management UI to add GPG

* Add more detail to gpg key display

* Update CHANGELOG.md

* Implement deletion UI

* Implement adding gpg UI

* Various fixes

- Fix duplicate entry in locale
- Re-generate hash before verification since they are consumed

* Add missing translation

* Split template

* Catch not found/verified email error
 2017-04-26 21:10:43 +08:00
Michael de Wit
21290d4e80 Optimize and fix autolink function (#1442) (#1444) 
* Optimize and fix autolink function (#1442)

* Fix bug in autolink recursive fallback function
 2017-04-12 16:01:08 +08:00
Antoine GIRARD
d9db188274 Fix #1418 (#1456) 2017-04-07 22:50:40 +08:00
Antoine GIRARD
912b340d0d Simplify settings pages with item list (#1389) 
* Remove point column on ssh key setting page

* Remove un-used css

* Some cleaning

* Use octicon-key
 2017-03-30 09:02:37 +08:00
Antoine GIRARD
14fe9010ae GPG commit validation (#1150) 
* GPG commit validation

* Add translation

+ some little fix

* Move hash calc after retrieving of potential key + missing translation

* Add some little test
 2017-03-22 18:43:54 +08:00
Sandro Santilli
a9de85d31d Improve style of user OpenID setting page (#1324) 
* Improve user openid list CSS and regenerate CSS
 2017-03-20 08:51:33 +01:00
Sandro Santilli
71d16f69ff Login via OpenID-2.0 (#618) 2017-03-17 15:16:08 +01:00
Antoine GIRARD
925b252927 Fix missing less sources for oauth (#1288) 2017-03-17 08:49:24 +08:00
Patrick G
efbb895ebe Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270) 2017-03-15 23:39:38 +01:00
Patrick G
03d79983ee Cleaner UI for explore page (#1253) (#1255) 
* Take navbar out of column
* Add styles to navbar
* Changed navbar classes
* Remove unneeded !important from index.css
* Remove unneeded !important from _explore.less
 2017-03-15 19:55:12 +01:00
Ethan Koenig
09fe4a2ae9 Batch updates for issues (#926) 2017-03-15 02:10:35 +01:00
Sandro Santilli
f0efb615c5 Add LibreJS support (#1201) 
See See https://www.gnu.org/software/librejs/

Closes #1200
 2017-03-12 22:50:20 +08:00
Patrick G
64214a9426 Search bar fixes for #1187 and #1205 (#1207) 2017-03-11 16:45:15 +08:00
Patrick G
5463640fe6 Fix double borders on edit page (#1152) (#1153) 
* Fix double borders on edit page (#1152)

* Add border modifications to less file
 2017-03-10 09:33:35 +08:00
Andrew Boyarshin
817710dd47
Fix span wrapping all the things 
Signed-off-by: Andrew Boyarshin <andrew.boyarshin@gmail.com>
 2017-02-24 18:49:04 +07:00
Willem van Dreumel
01d957677f Oauth2 consumer (#679) 
* initial stuff for oauth2 login, fails on:
* login button on the signIn page to start the OAuth2 flow and a callback for each provider
Only GitHub is implemented for now
* show login button only when the OAuth2 consumer is configured (and activated)
* create macaron group for oauth2 urls
* prevent net/http in modules (other then oauth2)
* use a new data sessions oauth2 folder for storing the oauth2 session data
* add missing 2FA when this is enabled on the user
* add password option for OAuth2 user , for use with git over http and login to the GUI
* add tip for registering a GitHub OAuth application
* at startup of Gitea register all configured providers and also on adding/deleting of new providers
* custom handling of errors in oauth2 request init + show better tip
* add ExternalLoginUser model and migration script to add it to database
* link a external account to an existing account (still need to handle wrong login and signup) and remove if user is removed
* remove the linked external account from the user his settings
* if user is unknown we allow him to register a new account or link it to some existing account
* sign up with button on signin page (als change OAuth2Provider structure so we can store basic stuff about providers)

* from gorilla/sessions docs:
"Important Note: If you aren't using gorilla/mux, you need to wrap your handlers with context.ClearHandler as or else you will leak memory!"
(we're using gorilla/sessions for storing oauth2 sessions)

* use updated goth lib that now supports getting the OAuth2 user if the AccessToken is still valid instead of re-authenticating (prevent flooding the OAuth2 provider)
 2017-02-22 08:14:37 +01:00
Denis Denisov
fd941db246 Protected branches system (#339) 
* Protected branches system

* Moved default branch to branches section (`:org/:reponame/settings/branches`).
* Initial support Protected Branch.
  - Admin does not restrict
  - Owner not to limit
  - To write permission restrictions

* reformat tmpl

* finished the UI and add/delete protected branch response

* remove unused comment

* indent all the template files and remove ru translations since we use crowdin

* fix the push bug
 2017-02-21 23:02:10 +08:00
Andrew Boyarshin
d4b752def9 Fix table headers (#980) 
Signed-off-by: Andrew Boyarshin <andrew.boyarshin@gmail.com>
 2017-02-20 11:13:20 +08:00
Bo-Yi Wu
4c12e2a4b9 fix: fill in ssh key title on setting of repo (#950) 
* fix: fill in ssh key title on setting of repo

* fix: Don't overwrite ssh key title if exist.
 2017-02-16 05:16:42 +01:00
Andrew Boyarshin
dc8248f8a4 Markdown rendering overhaul (#186) 
* Markdown rendering overhaul

Cleaned up and squashed commits into single one.

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

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

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

* add missing head comment & sort & fix refresh
 2017-01-30 20:46:45 +08:00
Bo-Yi Wu
d078aa30d6 feat: add search repository on dashboard. (#773) 2017-01-30 13:57:47 +08:00
Andrey Nering
5348e8b71a Fix color: closed PR was showing as purple instead of red 2017-01-28 14:01:07 -02:00
Bwko
4faf097fb9 Added webkit-font-smoothing (#763) 2017-01-27 14:10:21 +08:00
Ethan Koenig
833f8b94c2 Search bar for issues/pulls (#530) 2017-01-25 10:43:02 +08:00
unclejack
8bc431952f public/img: reduce the size of PNG images (#734) 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-01-24 22:37:11 +08:00
Kjell Kvinge
f9a3aa8737 add scroolbars to wide graphs. (#608) 
* Add scrollbars to graph and revlist if needed.

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

* Improvements on notification page layout

* Notification count badge fixes

* Make table <tr> clickable

* Fix octicon aligment

* Fix use of AppSubUrl
 2017-01-18 09:18:55 +08:00
Shyim
88f45ce38c Fix #646 (#669) 2017-01-14 21:07:43 +08:00
Andrey Nering
769e0a3ea6 Notifications: mark as read/unread and pin (#629) 
* Use relative URLs

* Notifications - Mark as read/unread

* Feature of pinning a notification

* On view issue, do not mark as read a pinned notification
 2017-01-12 12:27:09 +08:00
Kazuki Sawada
e5620f07a4 Fix: Issues cannot be created with labels (#622) 
Signed-off-by: Kazuki Sawada <kazuki@6715.jp>
 2017-01-10 21:57:03 +08:00
vz
19570f2d43 Fix install.tmpl input default value (#611) 
* Fix install.tmpl input default value

* Update db_user to gitea

* Add when INSTALL_LOCK = false
 2017-01-09 17:16:10 +08:00
Andrey Nering
79d527195d Merge pull request #539 from andreynering/notifications-step-2 
Notifications - Step 2
 2017-01-05 11:53:01 -02:00
Manuel Kuhlmann
eb9ce39bb7 Fix unified diff view styling (#585) 
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
 2017-01-05 10:04:41 +08:00
Manuel Kuhlmann
a5e07da8be Fix diff split view coloring (#553) (#584) 
Signed-off-by: Manuel Kuhlmann <manuel@mkuhlmann.org>
 2017-01-05 09:07:43 +08:00
Andrey Nering
f59672a18d More fine graned colors 2017-01-02 16:40:50 -02:00
Bwko
9ccc3698d5 Fix wrong anchors for non-latin headings (#3981) (#512) 
Change Javascript regular expression to match non-latin characters
The regex comes from here: http://stackoverflow.com/questions/150033/regular-expression-to-match-non-english-characters#comment22322603_150078

And this patch should fixed these two issues: #3919 #3843
 2016-12-31 18:06:09 +08:00
Andrey Nering
6069abe5fd Notifications - Step 2 2016-12-30 16:51:24 -02:00
Kjell Kvinge
22e1bd31c6 commithgraph / timeline (#428) 
* Add model and tests for graph

* Add route and router for graph

* Add assets for graph

* Add template for graph
 2016-12-29 07:44:32 +08:00
Sl@ny
c22f9114c7 Implementation of Folder Jumping 2016-12-28 18:09:52 +01:00
btrepp
25b5ffb6af Enables mssql support (#383) 
* Enables mssql support

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

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

* Vendors in denisenkom/go-mssqldb

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

Signed-off-by: Beau Trepp <beautrepp@gmail.com>
 2016-12-24 09:37:35 +08:00
Bwko
39d0db52de Fix for #361, renamed username to login 2016-12-07 15:56:43 +01:00
Thomas Boerger
b6a95a8cb3 Integrate public as bindata optionally (#293) 
* Dropped unused codekit config

* Integrated dynamic and static bindata for public

* Ignore public bindata

* Add a general generate make task

* Integrated flexible public assets into web command

* Updated vendoring, added all missiong govendor deps

* Made the linter happy with the bindata and dynamic code

* Moved public bindata definition to modules directory

* Ignoring the new bindata path now

* Updated to the new public modules import path

* Updated public bindata command and drop the new prefix
 2016-11-30 00:26:36 +08:00
Andrey Nering
96c9fef35f Update home page to Gitea (#138) 2016-11-11 08:50:31 +08:00
Rachid Zarouali
c040f2fbb1 first batch of Readme updates (#65) 2016-11-10 11:52:39 +01:00
Sandro Santilli
864d1b1f9f Fix type in unused constant name (#111) 
* Write LDAP, SMTP, PAM, DLDAP back to all uppercase

* Fix type in unused constant name

* Other MixCased fixes

* Complete MixerCasing of template constants

* Re uppercase LTS and LDAPS suffixes

* Uppercase JSON suffix in constant names

* Proper case LoginNoType

* Prefix unexported template path constants with "tpl"
 2016-11-07 18:58:22 -02:00
Joubert RedRat
28bee28102 Replace Gogs to Gitea in installation options 2016-11-07 13:26:19 -02:00
Andrey Nering
ef5fc3c959 CSS: Stronger colors for diffs 2016-11-06 17:57:45 -02:00
Joubert RedRat
ff54e4d929 Set default less and css to new default name 2016-11-04 08:53:18 -02:00
Joubert RedRat
f3321d920d Small UI fixes on full width form titles 2016-10-19 11:21:10 -02:00
Daniel Oaks
4efaf8e882 Fix repo list display on Safari (#3569) 2016-09-01 08:04:25 -04:00
Unknwon
8ee14db51e Update locales 2016-09-01 00:35:04 -04:00
无闻
cd9b926af7 Support Editorconfig on web editor (#3512) 2016-08-30 16:47:22 -07:00
Andrey Nering
9ac46fb983 Support Editorconfig on web editor 2016-08-30 20:30:47 -03:00
Unknwon
c0c1a4b01b js: fix comment issue status button title change 2016-08-30 14:37:46 -07:00
Unknwon
48a0b5b026 UI: fix block selection on code for empty line are not highlighted 2016-08-30 06:03:38 -07:00
Unknwon
643142acab Web editor: support upload files 2016-08-30 05:23:59 -07:00
Unknwon
62b0dc4853 Web editor: fix cannot create new file in subdirectory 2016-08-29 00:10:21 -07:00
Unknwon
7115e3a4d5 css: remove profile avatar height 2016-08-28 03:19:27 -07:00
Unknwon
0114fdcba4 Web editor: improve delete file process 2016-08-28 01:41:44 -07:00
Unknwon
bbca2916f7 Update highlightjs 2016-08-27 11:56:20 -07:00
Unknwon
f8a48ffaad Web editor: improve code quality 2016-08-24 21:35:03 -07:00
Unknwon
7f7216be6e Code quality improvement on JS 2016-08-17 22:44:07 -07:00
Unknwon
ec332cf903 Minor naming improvement 2016-08-17 16:10:07 -07:00
Unknwon
a00c932bbc General code quality improvement 2016-08-16 23:06:38 -07:00
Unknwon
4a19fd6441 Web editor: temporarily disable upload and quick fix for edit and new 
Try to merge into develop branch ASAP, then continue minor fixes afterwards.
 2016-08-15 01:42:20 -07:00
Unknwon
15845cb287 Code clean up for new config options 2016-08-14 23:52:24 -07:00
Richard Mahn
d0a0239bac Squashed commit of the following: 
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

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

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

    Fix for CodeMirror mode

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

    Made tabbing in editor use spaces

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

    Fix for data-url

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

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

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

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

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

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

    Code cleanup

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

    Code cleanup

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

    Code cleanup and fixes

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

    Fixes per Unknwon's requests

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

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

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

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

    Fix in gogs.js

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

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

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

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

    Update for using CodeMirror mode addon

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

    Update for Edit

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

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

    Conflicts:
    	modules/bindata/bindata.go

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

    Feature for editing, creating, uploading and deleting files
 2016-08-14 23:52:24 -07:00
Unknwon
3f7f4852ef #2246 fully support of webhooks for pull request 2016-08-14 03:32:24 -07:00
Unknwon
fd3b9ca3aa CSS: remove font “Meiryo Ui” 2016-08-12 22:05:20 -07:00
Unknwon
7551141dbe Minor fix on top menu dropdown icon position 2016-08-11 23:12:06 -07:00
Andrey Nering
dbed39ba05 On showing diff/file, use the tab_width specified on .editorconfig, if any (#3241) 
Closes #3182
 2016-08-11 17:07:09 -07:00
Andrey Nering
25b23c4bc9 Do not show non-image attachment in a <img> tag. Fixes #3215 (#3311) 2016-08-11 16:16:36 -07:00
Rory McNamara
c8b45ecc27 Render the Code view on the server (minus syntax highlighting) (#2942) 
* render code view server side

* remove debug print

* fix multiline selection bug

* change string concatenation to bytes.Buffer for efficiency

* Fix newlines added by previous for hljs

* fix selection highlighting

* make css changes in .less
 2016-08-09 12:35:20 -07:00
Unknwon
99385db0c4 #3320 code cleanup 2016-08-07 11:01:47 -07:00
Unknwon
72dd299ca0 Update .gitattributes 2016-08-06 10:36:40 -07:00
silverwind
b1133c9934 Lighter icon colors for repo files (#3351) 
* Lighter icon colors for repo files

* also color submodule icon
 2016-08-03 08:53:28 -07:00
Unknwon
991ce42c48 #2162 improve repository advance options UI display 
Enable/disable input based on user chosen options for wiki and issue tracker.
 2016-07-31 01:26:43 +08:00
Unknwon
4d8b905541 models/ssh_key: code cleaning 2016-07-26 10:47:25 +08:00
Unknwon
452aefd025 Fix issue event octicon CSS 2016-07-26 02:56:07 +08:00
Unknwon
899e799459 #1601 support delete issue comment 2016-07-26 02:48:17 +08:00
Unknwon
e74630ae3b #1384 add pagination for repositories 2016-07-24 14:32:46 +08:00
Unknwon
c912494609 #3076 detect invalid tag name git error 2016-07-23 15:59:19 +08:00
Richard Mahn
69dae1ec1c Added coding style modes to SimpleMDE (#3286) 
* Added coding style modes to SimpleMDE

* Moved the CodeMirror addon from simplemd to codemirror directory
 2016-07-23 13:29:20 +08:00
Unknwon
c2fb01a257 #3299 don’t pop up confirm box when leave on signin page 2016-07-21 14:36:26 +08:00
Unknwon
971e2c3bd6 Upgrade octicon to 4.3.0 2016-07-16 12:45:13 +08:00
Unknwon
089bacd54e Update bindata and CSS 2016-07-15 14:13:30 +08:00
Laica Lunasys
528ec9bffd Apply font for Japanese / Chinese (more) (#3266) 2016-07-15 13:52:37 +08:00
Unknwon
fdcca9292e #2458 fix emoji been rendered inside raw content area 2016-07-11 05:28:56 +08:00
Unknwon
401bf944ef Use SecurityProtocol to replace UseSSL in LDAP config 
Initially proposed by #2376 and fixes #3068 as well.
 2016-07-08 07:25:09 +08:00
Unknwon
326c982660 Upgrade frontend assets 2016-07-07 06:04:55 +08:00
Sandro Santilli
8a248696e9 Use a gopher as default avatar (rather than the gravatar logo) (#3208) 
Also changes the avatar from a jpeg to a png, to allow for
transparent background. The indexed png is also smaller in size.

Note that at the moment the default avatar is only used when
the user requested a custom avatar and the custom avatar file
is not found (should never happen).

In the future the default avatar could be used as a default
return when by-mail avatar lookups fail too (both gravatar
and libravatar support passing a default)
 2016-06-27 18:12:30 +08:00
chriswatt
24caccccdd Fix empty space surrounding hidden issue labels (#3200) 2016-06-24 23:38:25 +08:00
Unknwon
0a78d99a4d models/release: filter input to prevent command line argument vulnerability 2016-05-06 15:40:41 -04:00
Kim Carlbäcker
3df8eb60e3 PDF-Previews in file-lists now working (#3000) 2016-04-26 21:48:44 -04:00
Unknwon
7049cb9d97 Add new language support 
- Update language choose dropdown to fit more languages
 2016-04-25 13:40:23 -04:00
Kim Carlbäcker
b3c05026df [Feature/WIP] Confirm on editing forms (fixes #2881) (#2980) 
* Add and start jQuery AreYouSure

* Update SimpleMDE to 1.10.1 for `forceSync` support

* Forgot to remove old version SimpleMDE 1.10.0

* formatting -.-
 2016-04-19 16:45:28 -04:00
Kim Carlbäcker
ce36fd7a49 Fixed #2909 (#2979) 2016-04-19 16:35:36 -04:00
PsychoMario
b35157f4ff reduce line number creation to one DOM manipulation 2016-03-30 20:28:40 +01:00
Matthias Niess
3decc0b3d6 use monospace font for wiki and issue textareas (fix #2869) 2016-03-23 13:55:07 +01:00
Unknwon
9a5a27ea8d Improve repository lable style 
- add border-radius to filter list items
- use color as background of label for issue/pull view page
 2016-03-15 19:52:40 -04:00
Unknwon
db4da7beec Add APIContext 2016-03-13 17:37:44 -04:00
Unknwon
985a0f3450 Generate css for #2816 2016-03-11 18:59:26 -05:00
MATTENN
13e1fa6789 Add Japanese Fonts 
By adding a Japanese font in the less file, easier to see the display in
Japanese.
 2016-03-12 08:49:24 +09:00
Unknwon
2bf8494332 #13 finish user and repository search 
Both are possible on explore and admin panel
 2016-03-11 15:33:12 -05:00
Unknwon
0c9a616326 Update frontend resources 2016-03-07 00:11:12 -05:00
Unknwon
c2ca103d30 #2623 fix wrong font for webhook history 2016-03-05 23:09:16 -05:00
Unknwon
045f14fbd0 #1146 finsih UI work for access mode of collaborators 
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
 2016-03-05 18:08:42 -05:00
Unknwon
a2f13eae55 #1157 some avatar setting changes 
- Allow to delete current avatar
 2016-03-05 00:51:51 -05:00
Andrey Nering
13e71acadf Render emojis in more places. 2016-03-02 21:54:05 -03:00
Unknwon
d320915ad2 Minor fix for #2710 2016-02-27 11:31:24 -05:00
ChubbyNinja
ab4bc653ab Image attachments keep aspect ratio 2016-02-26 14:09:37 +00:00
Unknwon
baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
Unknwon
f38d5e57dd Remove border-bottom for tabs header divider 2016-02-19 17:49:48 -05:00
Florian Kaiser
eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00:00
chriswatt
c47866b34a Add grey bg to tabs on repo page 2016-02-14 23:09:33 +00:00
Florian Kaiser
662482d366 Make issue title smaller 2016-02-07 19:23:26 +00:00
Unknwon
f15a2f9b25 Merge pull request #2528 from andreynering/diff-sintax-highlight-733 
Enable syntax highlighting on diff view
 2016-02-07 11:49:11 -05:00
chriswatt
133397ee0d Rename #avatararrow to #avatar-arrow 2016-02-07 16:41:11 +00:00
chriswatt
16270ee9a4 Add avatar arrow to pull request form 2016-02-07 06:10:57 +00:00
chriswatt
1dfead1eef Add avatar arrows to new both new issue comment forms 2016-02-07 04:20:11 +00:00
Unknwon
e797a225b6 Fix #2564 file ignored by git 2016-02-05 17:19:32 -05:00
Unknwon
6d5c986d4f Merge pull request #2562 from Eriner/master 
optipng
 2016-02-05 16:18:52 -05:00
Matt Hamilton
45659d0fd2 optipng 2016-02-05 16:04:11 -05:00
Unknwon
acfc942ad7 Generate CSS for #2561 2016-02-05 14:53:45 -05:00
chriswatt
9fe9cd8b5c Add small user arrows on issue comments pointing to users avatar 2016-02-05 19:24:23 +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
Florian Kaiser
0d41827f23 Fix syntax highlighting for markdown code blocks on issue description/comment save 2016-02-01 22:50:22 +00:00
Unknwon
66d2ba1b4e Merge pull request #2537 from fnkr/remember-clone-protocol 
Remember last selected clone protocol
 2016-02-01 15:58:01 -05:00
Florian Kaiser
84749736a8 Select HTTPS if remembered clone protocol is SSH but SSH is disabled now 2016-02-01 20:42:10 +00:00
Florian Kaiser
3e0a27157c Make highlighted markdown code blocks work on issue pages 2016-02-01 19:53:58 +00:00
Florian Kaiser
d568019306 Remember last selected clone protocol, and establish uniform order (https, ssh) 2016-02-01 17:04:58 +00:00
Unknwon
8436d69eaf Update and reorganize front-end resources 2016-01-30 22:10:20 -05:00
Kim "BKC" Carlbäcker
96dee1c354 Split view fixed 2016-01-27 23:52:42 +01:00
Unknwon
e33ddac9bf Minor fix for #2396 2016-01-25 14:04:46 -05:00
Unknwon
c631a4a9b9 URL fix for #2287 2016-01-15 18:00:39 +08:00
Unknwon
f43cc90841 #2287 Truncate repository name if too long 2016-01-11 20:41:43 +08:00
l2dy
efa0e7b27a Minor fix 2016-01-10 17:29:33 +08:00
Unknwon
86bce4a2ae minor fix to #2335 2016-01-09 14:51:17 +08:00
Andrey Nering
73474c043b Highlighting differences of lines in the diff view. 2016-01-06 17:46:56 -02:00
Unknwon
2481fe2f56 Merge pull request #2296 from bkcsoft/feature/split-diff 
Implement Split Diff-View
 2016-01-06 13:31:36 +08:00
Kim "BKC" Carlbäcker
8fe5d887ae Changed name from inline to unified 2016-01-05 19:21:50 +01:00
Kim "BKC" Carlbäcker
0df39b33eb Implement Split Diff-View 
- Unified/Inline Diff-View Selectable
 2016-01-05 19:21:41 +01:00
Andrey Nering
cb8134da52 Making scroll always visible. 2016-01-04 16:38:10 -02:00
Unknwon
93f03707a7 #2283 set text/plain for non-binary files in raw mode 2015-12-25 05:45:07 -05:00
Unknwon
13fe733037 #2264 use monospaced font for commit IDs in news feeds 2015-12-24 20:43:45 -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
7436ce6403 emojify.js: ignore_emoticons 2015-12-14 06:04:24 -05:00
Unknwon
ed001d70e4 #2171 fix wiki preview does not work on Firefox 2015-12-13 17:55:13 -05:00
Unknwon
71123c816d update hightlight.js 2015-12-13 00:58:30 -05:00
Unknwon
168c69273f fix #1720 2015-12-13 00:46:28 -05:00
Unknwon
4df378b892 fix markdown header margin-top 2015-12-12 22:04:52 -05:00
Unknwon
351dfc95a9 prepare release 2015-12-12 21:58:54 -05:00
Unknwon
837155577a #2159 use icon+tooltip to replace text 2015-12-12 16:53:16 -05:00
Unknwon
59c965a5ec #2156 admin able to edit organization max repo creation 2015-12-11 19:24:57 -05:00
Unknwon
477b4d3b50 #2154 fix form submit error 2015-12-11 18:52:28 -05:00
Unknwon
7a3eccc709 Drop 0.5.x support 2015-12-10 19:52:06 -05:00
Unknwon
ddcc8d998c fix markdown table header CSS 2015-12-10 16:45:16 -05:00
Angus Gibson
9bd3ebe207 Dropdown on commits page to choose branch #1846 
I've mostly duplicated the dropdown code from repo/home.tmpl, which
basically only required a change to the URL. This could probably be
broken out into something more modular.
 2015-12-09 16:37:04 +11:00
Adam Strzelecki
dd8a06a397 LESS: Use tabs for indent in all files 
This does not change any content and generated gogs.css is still the same.
 2015-12-07 21:20:54 +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
f41360d864 #2052 advanced select ops for system notices 2015-12-05 01:09:14 -05:00
Unknwon
e538ff2770 fix #1829 and fix #890 2015-12-04 21:30:33 -05:00
Unknwon
98e989d52c minor JS and UI fix 2015-12-03 15:01:15 -05:00
Unknwon
1802d52362 Merge pull request #2094 from nanoant/patch/less-pronounced-sha-labels 
UI: Use more subtle grey SHA1 labels
 2015-12-03 14:28:30 -05:00
Adam Strzelecki
cab2911f23 UI: More subtle strips on commits list 
With grey SHA1 labels, we should consider having also more subtle strips on
commits list. As current strips blend too much with grey SHA1 labels and top
bar, making hard to distinguish headers from content.
 2015-12-03 20:26:06 +01:00
Adam Strzelecki
c5e249c0be UI: Remove CSS rule making last-commit SHA bold 
This removes remains from old design, that was not cleaned by previous #2068 PR.
 2015-12-03 13:30:16 +01:00
Unknwon
4a6016f5af fix #2087 2015-12-03 01:03:06 -05: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
0068b8106b CSS: Octicons 16px fix outside of _octicons.less 
Otherwise the fix will be overwritten by next _octicons.less update.

This is follow-up for 22b0dfbb35.
 2015-12-03 02:18:38 +01:00
Unknwon
29375059e1 minor CSS fix 2015-12-02 20:10:00 -05:00
Unknwon
85449b2f11 minor CSS fix for #2068 2015-12-02 19:53:39 -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
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
4813665d0a CSS: Reduce .sha.label font size to 13px 2015-12-02 21:43:30 +01:00
Adam Strzelecki
640dce12a8 CSS: .repository .sha.label -> .ui .sha.label 
This is because SHA1 label is used in many other places, not only inside
.repository container.
 2015-12-02 21:42:31 +01:00
Adam Strzelecki
22b0dfbb35 CSS: Ensure Octicons are used with 16px font size 
Semantic UI .icon 1em font-size has priority over .octicon 16px, resulting
octicons rendered at 14px font-size, which is not okay since Octicons are meant
to be shown sizes that are multiples of 16px.
 2015-12-02 21:33:32 +01:00
Unknwon
830d000667 finish wiki 2015-11-30 20:45:55 -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
2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Andrey Nering
880849a283 Fixing Dropzone should accept all files when config is "*/*". 2015-11-23 13:46:58 -02:00
Unknwon
e6b2a01e5d minor JS fix 2015-11-22 02:29:20 -05:00
Unknwon
52c8f69163 fix #650 2015-11-22 01:32:09 -05:00
Unknwon
b80e848d02 upgrade libs 2015-11-21 21:09:18 -05:00
Unknwon
9bcc3c1ea3 fix minor dashboard CSS issue 2015-11-19 23:52:23 -05:00
Unknwon
f04d773f4f UI: long organization name in create repository owner list 2015-11-18 17:42:20 -05:00
Unknwon
7a9777ae36 fix #1990 2015-11-18 14:12:10 -05:00
Unknwon
dc7e74ebb1 Merge pull request #1769 from sapk/fix-admin-dashboard-new-ui 
Fix admin dashboard new ui
 2015-11-18 10:24:35 -05:00
Unknwon
9a27e1b90c minor css fix 2015-11-17 02:20:49 -05:00
Unknwon
ff5f14431e fix #1448 2015-11-17 02:18:05 -05:00
Unknwon
114e6790f8 fix CSS width 2015-11-16 23:31:35 -05:00
Unknwon
ec5f881384 fix CSS 2015-11-16 23:30:05 -05:00
Unknwon
9ab96172fc new watchers, stars and forks UI 2015-11-16 23:28:46 -05:00
Unknwon
5dc3dd1704 fix #1960 2015-11-16 11:11:59 -05:00
Unknwon
7046df6028 UI fix 2015-11-16 00:16:03 -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
9c12ed3b6e clean up 2015-11-14 04:54:27 -05:00
Unknwon
7b1c10ea7e new repo ui 
- copy link button: #1396, #1168, #1668,
- synxtax highlight: #1712, #1549, #1315, #670
- z-index: #1942
 2015-11-14 04:34:01 -05:00
Unknwon
6a664e88c7 #1854 show issue content 2015-11-13 12:11:45 -05:00
Unknwon
0f438ef0b3 new dashboard ui 2015-11-13 12:05:48 -05:00
Unknwon
020fb43b77 space bar as click 2015-11-11 18:44:39 -05:00
Unknwon
908f2924ce fix #1824 and fix #1917 2015-11-11 16:19:28 -05:00
Unknwon
603c7389b8 #1459 Dashboard issues lacks sorting 2015-11-04 12:50:02 -05:00
Unknwon
0af035c37e #1078 not show bin when rename a file 2015-11-03 09:52:17 -05:00
Unknwon
92535c9df0 update some libs 2015-11-02 02:00:12 -05:00
Unknwon
7d72c8333e work on #470 and fix miror JS issue when choose targets on compare and pull 2015-10-29 21:09:48 -04:00
Unknwon
0fbb8c8826 New push to head repo of head branch: regenerate patch and retest apply 2015-10-24 03:36:47 -04:00
Unknwon
f17b746a01 update locale 2015-10-21 06:40:44 -04:00
Antoine GIRARD
4dd731cb53 Fix indent .less 2015-10-14 01:05:32 +02:00
Antoine GIRARD
2717ada14c Little fix 2015-10-13 02:04:04 +02:00
Antoine GIRARD
e1c04f043b Implement new ui to dashboard 2015-10-13 01:40:35 +02:00
Unknwon
19c3745488 fix quick guide style 2015-10-07 23:11:32 -04:00
Unknwon
4465c58f4b new quick start page 2015-10-02 19:58:36 -04:00
Steven
c8aa9c6cb1 implemented #1721: see users who forked/starred/watched a repository 2015-10-01 15:51:46 +02:00
Unknwon
d9c5b3bcee #1659 fix change label title resets color 2015-09-18 06:18:31 -04:00
Unknwon
9d36fc6986 finish new auth e-mails 2015-09-17 14:57:24 -04:00
Unknwon
373731f5e8 user gomail and new activate account email tpl 
- #1496: fallback plain text
- #1002: add date header
- #913: fix encoding of header
 2015-09-17 01:54:12 -04:00
Unknwon
2729eb998c #1646 and other minor fixes 2015-09-16 15:34:46 -04:00
Unknwon
e4ecbcdf4a new sign in page 2015-09-14 22:50:44 -04:00
Unknwon
5f1183cecf #697 add install option 2015-09-13 12:14:32 -04:00
Unknwon
83e747bfda #697 and #1606 and new admin edit user UI 2015-09-13 11:07:21 -04:00
Unknwon
8e0a69f86a #697 disable captcha and new admin create user UI 2015-09-13 09:51:51 -04:00
Unknwon
f4e54aafa5 typo in logo 2015-09-12 17:01:10 -04:00
Unknwon
d185f601d3 #1622 comment with whitespace 2015-09-12 16:58:18 -04:00
Unknwon
c7ac237b57 fix css 2015-09-11 20:49:28 -04:00
Unknwon
0617448282 finish new add auth UI 2015-09-10 17:11:41 -04:00
Unknwon
fa728d8dff more minor fix on 1581 2015-09-10 15:45:03 -04:00
Unknwon
cbd6276200 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop 
# Conflicts:
#	modules/bindata/bindata.go
 2015-09-10 14:55:29 -04:00
Unknwon
52ec80fa18 finish all new user settings UI 2015-09-10 11:40:34 -04:00
Sergio Benitez
964d0262ff Merged conflicts. 2015-09-09 13:44:51 -07:00
Unknwon
af324a6165 adjust icon css 2015-09-07 16:12:58 -04:00
Unknwon
7b0ae27549 #1599 org dashboard icon css 2015-09-07 15:37:34 -04:00
Unknwon
31e7b0f588 #1599 status button mrigin-right 2015-09-07 15:22:52 -04:00
Unknwon
03ea29eb36 minor fix on icon 2015-09-07 15:03:31 -04:00
Unknwon
85f34ba538 new user profile settings UI 
Signed-off-by: Unknwon <u@gogs.io>
 2015-09-06 16:31:22 -04:00
Unknwon
edc99bc8a4 new org options UI 2015-09-06 10:56:31 -04:00
Unknwon
80701d45bb #1193 Make organization emails non-mandatory 2015-09-06 10:08:14 -04:00
Unknwon
aa67de910a fix #1558 2015-09-06 08:54:08 -04:00
Unknwon
24658fcbdd #633 dix suburl 2015-09-06 06:57:25 -04:00
Unknwon
705224353b minor fix 2015-09-05 19:58:44 -04:00
Unknwon
46dce2d653 fix emoji edit not rendered 2015-09-05 14:18:02 -04:00
Unknwon
d48cde6ec8 #633 emoji 2015-09-05 14:14:03 -04:00
Unknwon
3b0c2cb480 #633 Add Emoji support 2015-09-05 14:11:05 -04:00
Sergio Benitez
aa9c36514f Merged conflicts. 2015-09-04 20:49:07 -07:00
Sergio Benitez
2d1db4bf05 Added LDAP simple auth support. 2015-09-04 20:48:34 -07:00
Unknwon
d023e81a8f #1577 explore paginator problem 2015-09-04 05:54:22 -04:00
Unknwon
2a2a8cd619 ui and pulls index fix 2015-09-03 03:49:50 -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
768c78d143 update semantic 2015-09-02 17:53:11 -04:00
Unknwon
953bb06857 basic PR feature 2015-09-02 09:26:56 -04:00
Unknwon
37e0cee877 finish PR UI 2015-09-02 04:08:05 -04:00
Unknwon
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
398569f6f8 #1021 Forked repo unavailable after deleting original repo 2015-09-01 11:43:53 -04:00
Unknwon
dde9ace91b fix rename repo JS 2015-09-01 09:37:41 -04:00
Unknwon
7714e792a4 minor fixes on #1551 2015-09-01 07:04:35 -04:00
无闻
67f07e21f5 Merge pull request #1551 from peppage/explore-ui 
Update Explore UI
 2015-09-01 06:37:46 -04:00
Unknwon
6c7a93a3ac fix #1553 2015-09-01 05:44:36 -04:00
Michael Peppler
d1c5a5ed68 new explore UI 2015-08-31 18:23:43 -04:00
Unknwon
ee3e0c3c49 fix dropdown search 2015-08-31 17:10:28 +09:00
Unknwon
cb381078ff finish new repo options page 2015-08-31 13:36:31 +08:00
Unknwon
c6b039c6f9 new repo options UI 2015-08-30 03:21:59 +08:00
Unknwon
d01f688257 fix repository count of user is messed up 2015-08-30 01:13:24 +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
302938e646 #1333 Disable Gravatar option when install 2015-08-30 00:22:26 +08:00
Unknwon
f509c59ac1 new create webhook event 2015-08-28 23:36:13 +08:00
Unknwon
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
a7686e8749 #1203 bundle jquery with gogs 2015-08-28 14:24:05 +08:00
Unknwon
70e0153b93 add highlight js 2015-08-27 23:58:50 +08:00
Unknwon
23f42d92c9 add webhook recent deliveries 2015-08-27 23:06:14 +08:00
Unknwon
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
b3a45693c3 minor update 2015-08-26 12:26:01 +08:00
Unknwon
27f7abdd77 fix small screen fit 2015-08-26 02:05:08 +08:00
Unknwon
4d75db4811 fix org dashboard menu color 2015-08-26 01:47:05 +08:00
Unknwon
4330c1f0d8 update locale and org dashboard navbar 2015-08-26 00:01:06 +08:00
Unknwon
f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon
be90ea583a #1521 reduce Docker image size 2015-08-25 12:41:01 +08:00
Patrick Geneva
e2bea06313 Updated - Lang Selection Width 2015-08-24 17:39:57 -04:00
Unknwon
461f715ae4 fix css 2015-08-21 00:37:56 +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
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
bd1d7d1509 Able to set SSH port when install, update Docker docs 2015-08-19 20:36:19 +08:00
Unknwon
928d9fc1d4 fix access token style 2015-08-19 03:40:23 +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
6d3e5a36a1 update octicons to 3.1 2015-08-16 02:09:37 +08:00
Unknwon
77ade6855d fix style and locale name 2015-08-16 00:05:15 +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
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
cec38f2a8c able edit issue labels/milestone/assignee 2015-08-15 00:42:43 +08:00
Unknwon
0efe80d60d fix issue list assignee position 2015-08-14 02:48:58 +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
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
f57235085a minor fix on #1469 2015-08-12 03:27:53 +08:00
Mikko Hellsing
c3c638e596 fix dashboard padding 2015-08-11 21:22:01 +02: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
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
Unknwon
2aea247208 minor fix on #1460 2015-08-10 22:59:12 +08:00
Fernando San Julián
4cc198179c new top menu 2015-08-10 16:38:21 +02:00
Unknwon
75aff60c90 finish create issue with milestone and assignee 2015-08-10 21:47:23 +08:00
Unknwon
09a1b2a1f5 finish create issue with milestone 2015-08-10 18:57:57 +08:00
Unknwon
922f3f3062 finish create issue with labels 2015-08-10 16:52:08 +08:00
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
Unknwon
7372042441 list view: issue, label, milestone 2015-08-09 22:45:38 +08:00
Unknwon
590c464c56 UI: create issue with title and content 2015-08-09 15:23:02 +08:00
Unknwon
43a87b0caf auto-redirect when finish filter branch 2015-08-08 23:12:23 +08:00
Unknwon
dea3a8c6a4 WIP: create PR - choose branch 2015-08-08 22:43:14 +08:00
Unknwon
d015d951bd fix css rule 2015-08-08 17:53:38 +08:00
Unknwon
9db4acc62e improve fork process 2015-08-08 17:10:34 +08:00
Unknwon
39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon
2c507667bf Merge branch 'develop' of github.com:gogits/gogs into feature/milestone 
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
 2015-08-05 20:26:00 +08:00
Unknwon
0705f55ce0 finish new milestone page 2015-08-05 20:23:08 +08:00
Unknwon
74bd6b939c milestone: edit 2015-08-05 18:26:18 +08:00
Unknwon
b9527cd1bf #1299 force downcase e-mail 2015-08-05 17:36:22 +08:00
Unknwon
3e4cdccf6b milestone: create page 2015-08-05 15:24:26 +08:00
Unknwon
9311a9858a milestone: pagination 2015-08-04 22:24:04 +08:00
Fernando San Julián
eebcbf9d34 add clipboard API support 2015-08-03 21:27:15 +02:00
Unknwon
04458d49a0 milestone: list view 2015-08-03 17:42:09 +08:00
无闻
7241598c19 Merge pull request #1426 from manfer/issues-new-edit-forms-autofocus 
autofocus for new and edit issue forms
 2015-08-01 10:05:11 +08:00
Fernando San Julián
c5be40decb new markdown styles 2015-08-01 02:26:14 +02:00
Fernando San Julián
b92bb77b54 autofocus for new and edit issue forms 2015-07-31 22:12:33 +02:00
Fernando San Julián
27244174df nested unordered list inside order list issue 2015-07-31 11:13:37 +02:00
Unknwon
589618c8a5 better paging 2015-07-28 03:14:37 +08:00
Unknwon
1ba837a055 new issue and label page 2015-07-25 02:52:25 +08:00
Unknwon
dc4aab9925 UI: CURD labels 
- fix update lable break connection with repository
 2015-07-24 23:13:42 +08:00
Unknwon
3426ae42b3 fix css compression 2015-07-24 21:04:21 +08:00
Unknwon
ac95f6d50f UI: basic label list 
- create new label
 2015-07-24 21:02:49 +08:00
Unknwon
86dbda0b42 UI: basci issue list without filters 
- fix isRead check
- fix paging
 2015-07-24 16:42:47 +08:00
Unknwon
4447a20f87 UI: issues - finish basic frame 2015-07-24 04:50:05 +08:00
Unknwon
b9dc2147b4 UI: install - done 2015-07-09 13:17:48 +08:00
Unknwon
5cf3732339 UI: install - new version 2015-07-08 19:47:56 +08:00
Unknwon
5dd3dd71a0 UI: install - database settings 2015-07-08 01:09:03 +08:00
Unknwon
ffd17924fd update UI framework 2015-07-07 13:51:28 +08:00
Lunny Xiao
f92bdf875b Merge pull request #1226 from nice-software/wip/pam 
Add PAM authentication
 2015-04-24 16:43:58 +08:00
Paolo Borelli
182003aa41 Add PAM authentication 2015-04-24 10:13:01 +02:00
Andrew Patton
b579800e50 💄 Style checkbox label in sign in form 2015-04-15 21:49:10 -04:00
Unknwon
9fb2d49b93 #1073 #1162 issue ID constraint failed 2015-03-27 06:47:02 -04:00
David Martel
93ff2e31e8 Fix "Plus" icon size in dashboard (part 2) 2015-03-26 19:32:08 -04:00
David Martel
44ea3d9065 Fix "Plus" icon size in dashboard 2015-03-25 22:21:21 -04:00
Unknwon
d4c04a65c7 fix menu css 2015-03-21 10:49:17 -04:00
Unknwon
b6f8b486c7 add sr-only class, change to new tag line 2015-03-20 03:20:05 -04:00
Unknwon
62e436e6b7 Merge branch 'develop' of github.com:gogits/gogs into release/0.6.1 2015-03-20 01:58:28 -04: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
Antoine GIRARD
ea9cf5ec8c Fix the little default in the navbar of the dashboard 2015-03-19 01:16:55 +01:00
Antoine GIRARD
96a71aaed8 Apply ng to issue dashboard 2015-03-19 00:35:17 +01:00
Unknwon
4b9fb43a70 home: new UI 2015-03-07 15:12:13 -05:00
Alexey Makhov
3efe3f42e8 js fix R1-L1 highlight 2015-02-19 11:08:47 +03:00
Alexey Makhov
563e8b4ea9 gitlab-like hash naming 2015-02-19 00:52:22 +03:00
Stefan-Code
1628ef4ba5 changed repo-clone-url behaviour for bare repo 2015-02-18 08:22:13 +01:00
Stefan-Code
e5d6f4ce56 Changes to repo-header-download-drop, different repo-clone-url input behaviour 2015-02-11 07:28:51 +01:00
Unknwon
9420eecb87 public/ng/css: code generation for #919 2015-02-08 13:00:22 -05:00
Stefan
85f384f271 Updated gogs.css - monospace font for hash 
Updated gogs.css to use monospaced font for sha hash label in repository view to make it look nicer because of equal label width.
 2015-02-08 17:38:10 +01:00
Unknwon
0669897226 modules/base: fix markdown mention regex for #826 
- conf/locale: add mew translator profile
 2015-02-06 19:15:58 -05:00
无闻
ddddad9792 Merge pull request #826 from deringer/dev 
Fix user mention bug when parsing markdown documents
 2015-02-06 19:03:35 -05:00
Unknwon
16018e8323 public/ng/css: code generate for #907 2015-02-05 08:22:59 -05:00
Alexey Makhov
04adc94b26 fix css for same code 2015-02-05 16:02:37 +03:00
Alexey Makhov
2f40f614b5 fix css for del code 2015-02-05 15:56:48 +03:00
Alexey Makhov
01cef678a3 new lines highlighting format 2015-02-05 10:49:04 +03:00
Unknwon
7140f50637 public/ng/js: script fix on #901 2015-02-04 19:52:31 -05:00
Alexey Makhov
7f71fe9dae fix diff lines highlighting 2015-02-04 12:41:35 +03:00
Unknwon
8e238058b2 public/ng/css: code fix on #895 
- templates/user/settings: fix email panel nav highlight
 2015-02-03 06:54:29 -05:00
Alexey Makhov
32fb5ea5d0 fix settings/email html&css in less 2015-02-03 11:05:13 +03:00
Alexey Makhov
e43bd15b96 fix settings/email html&css 2015-02-03 10:32:55 +03:00
Unknwon
3d9cda2d98 public/ng: fix auto-completion #832 2015-02-01 08:46:53 -05:00
Tony Tsang
9f4e584122 Add max-width to commit message of repo-files-table 2015-01-05 12:22:20 +08:00
Michael Dyrynda
04d698bfbc add some padding to markdown paragraphs 2015-01-03 22:43:02 +10:30
fuxiaohei
c0cfd62b90 add label-edit and label-delete logic 2014-12-22 21:26:05 +08:00
Unknwon
97b39ae2e4 fix invite bug(shouldn't include full name to search box) 2014-12-22 03:44:49 -05:00
Unknwon
cf7ebfbdc8 mirror fix on release JS 2014-12-10 16:41:49 -05:00
Unknwon
bc8721fb6c Finish new UI for release page 2014-12-10 16:37:54 -05:00
Unknwon
01ba771783 fix #703 2014-12-10 07:00:11 -05:00
fuxiaohei
0daef29053 add label-create ui elements 2014-12-07 21:29:37 +08:00
Tony Tsang
d4a1d9f82a Display multi-line commit message on commit diff page. 2014-12-05 10:53:37 +08:00
fuxiaohei
0af3a5b603 add issue list filter ui 2014-12-04 23:22:16 +08:00
无闻
cb6be94358 Merge pull request #696 from deiwin/update/user-api-to-include-full-name 
add full name to found users' list on the UI
 2014-12-02 10:27:24 -05:00
Deiwin Sarjas
54ef1cee1d add full name to found users' list 2014-12-02 16:55:52 +02:00
Florian Hülsmann
d06d58e461 fixed code view line height for firefox 2014-12-02 11:31:57 +01:00
fuxiaohei
23d53561d1 update milestone page design 2014-11-24 23:13:42 +08:00
fuxiaohei
79dae254cf add milestone page design 2014-11-24 22:33:04 +08:00
Unknwon
ef275ebf62 more on change avatar 2014-11-21 12:51:36 -05:00
Unknwon
5d9ef2bb12 lock gopmfile 2014-11-17 16:25:39 -05:00
fuxiaohei
d1a60e3643 add pull-request and labels page design 2014-11-17 23:07:34 +08: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
dfa4b38081 work on #616 2014-11-10 06:26:07 -05:00
Unknwon
e0de6cb5ad work on #616 and update locales 2014-11-10 05:30:07 -05:00
Unknwon
23eec25274 Fix #605, fix #255, fix #101 2014-11-06 22:06:41 -05:00
fuxiaohei
b866dc92d7 finish issue list ui draft 2014-11-04 21:58:28 +08:00
omeid
80c6cc6321 Fix x padding for #repo-content for width < 1170px 
This pull request fixes the issue when resizing the window smaller than 1170 px, right now there is no padding/margin on sides and it looks broken.
 2014-11-04 14:14:23 +11:00
Unknwon
c7f56d7483 Fix #584 2014-10-27 11:18:00 -04:00
Unknwon
d88ebd9a4b Fix #554 2014-10-19 02:22:38 -04:00
Unknwon
a342d58d7e Able to fork repo to individuals 2014-10-19 01:35:24 -04:00
fuxiaohei
9e3a1bc11a add nav bar in issue list 2014-10-18 22:52:34 +08:00
fuxiaohei
cb2da7bf2c some ui details fix 2014-10-18 22:15:05 +08:00
Unknwon
1aa12c7452 Fix #572 2014-10-15 16:28:38 -04:00
Unknwon
ecf3eb4307 Fix #570 2014-10-15 07:55:20 -04:00
Unknwon
9ae92459a5 Fix repo css and rel path img in md 2014-10-14 23:44:34 -04:00
Unknwon
451f328a4c Fix #457 and fix #557 2014-10-13 03:07:47 -04:00
Unknwon
b93ae452fe Fix #555 2014-10-12 23:22:16 -04:00
Unknwon
0d7b9065c6 Fix #540 2014-10-12 02:06:46 -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
7b03b1df0e Allow custom locale 2014-10-09 18:35:09 -04:00
Unknwon
64c68220d2 Fix #264 2014-10-06 17:50:00 -04: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
Unknwon
e6e6aaeacb Delete verbose 2014-09-28 01:45:03 -04:00
Unknwon
e3b78c47e2 Merge branch 'master' of github.com:gogits/gogs 
Conflicts:
	public/ng/less/gogs/repository.less
	templates/repo/home.tmpl
 2014-09-28 01:44:09 -04:00
Unknwon
49193bebd2 UI: Confirmation box 2014-09-28 01:38:25 -04:00
fuxiaohei
e3a27aeb25 template and ui fix 2014-09-27 17:31:44 +08:00
fuxiaohei
dccc50e9d4 template and ui fix 2014-09-27 17:08:57 +08:00
Unknwon
ad2ab6d214 Add modal to change username 
Signed-off-by: Unknwon <joe2010xtmf@163.com>
 2014-09-26 22:33:30 -04:00
fundon
09c3c4e70c bugfix, suburl defaults to empty string when suburl is undefined 2014-09-26 10:29:57 +08:00
Unknwon
71e4689d11 Page: User profile 2014-09-25 19:33:39 -04:00
fuxiaohei
7c30ae7002 is utils improvement 2014-09-25 21:52:58 +08:00
Unknwon
5bbeeb0f1b Page: Commits and fix #249 2014-09-23 15:30:04 -04:00
Unknwon
93ee0838eb Page: Repository home page 2014-09-23 13:51:10 -04:00
Unknwon
a1109e6fbc Page: Repository home page 2014-09-23 13:47:54 -04:00
Unknwon
ebb05475ed Fix #495 and cannot view repository by tag 2014-09-23 13:06:25 -04:00
fuxiaohei
a11ed51bbb resize star font size 2014-09-24 00:01:48 +08:00
fuxiaohei
e0493259a6 resize star font size 2014-09-23 23:59:44 +08:00
fuxiaohei
b3f0d25ce5 pull request ui review, change sidebar 2014-09-23 23:48:28 +08:00
fuxiaohei
d750d53422 Merge remote-tracking branch 'origin/dev' into dev 2014-09-23 23:36:25 +08:00
fuxiaohei
8d5a4cc9eb pull request ui review, change sidebar 2014-09-23 23:36:09 +08:00
Unknwon
1476a1a729 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-23 10:29:52 -04:00
Unknwon
e3eea745f4 UI fix 2014-09-23 10:29:48 -04:00
fuxiaohei
60c65415dd pull request page ui review, upgrade octicon icons 2014-09-23 22:28:03 +08:00
fuxiaohei
904f799c1a improve ui details 2014-09-23 21:43:45 +08:00
Unknwon
063aacd436 UI: Use tooltip not alert when copy clone URL 2014-09-22 14:47:47 -04:00
Unknwon
196efecaaa Fix #491 2014-09-22 11:04:46 -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