Commit Graph

1921 Commits

Author SHA1 Message Date
Konrad
9af3aae2f3
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-03 17:45:55 +01:00
Ethan Koenig
ab62da283a Fix avatar URLs (#3069)
* Fix avatar URLs

* import order
2017-12-03 19:55:13 +08:00
techknowlogick
b0971ae37c Reduce overhead of upgrades for users with custom stylesheets/JS (#3051) 2017-12-03 02:26:06 +02:00
silverwind
4947cfb7b0 Remove box-shadow from UI, fix dashboard issue (#3065) 2017-12-03 01:16:35 +02:00
Lunny Xiao
ef5364950b fix issue list branch link broken (#3061) 2017-12-02 21:57:47 +02:00
silverwind
f9db60e3bd Adjust branch button size (#3063) 2017-12-02 19:57:51 +02:00
kolaente
1fded52044
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	public/js/index.js
2017-12-02 18:29:32 +01:00
Lunny Xiao
9a8805d785 remove duplicated sanitize (#3037) 2017-11-30 21:38:33 +02:00
Sondre Nilsen
86ee41ec03 Expandable commit bodies (#2980)
* Initial working state of expandable commit bodies

* Fix all commits having showing button for multiline commits

* Refactor checking multiline messages method

* Force newlines with <br> in commit body

* Show multiple lines in the list view of repositories

* Fixed proper newlines and minor refactor

Use <pre> instead of <p>, this is so we can use \n instead of having to manually place <br> into the HTML. Makes it easier to display commit bodies.

* Fix commit list messages jumping around

* Fix indentation in view_list.tmpl

* Use vertical-align: baseline instead of top

* Refactor commit button toggle function

* Remove RenderCommitBodyLink function

* Add comments

* Add newline at the end of _repository.less

* Fix long commit bodies not properly wrapping inside <pre>

* Don't split on double newlines

* Show the commit body in commit view

* Update stylesheets

* Add/fix comments and run make fmt

* Fix spaces not being tabs
2017-11-30 13:08:40 +08:00
Ethan Koenig
013db70fce Removed unused field in form (#3023) 2017-11-29 22:52:34 +02:00
kolaente
6eea6c686f
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v49.go
#	models/models.go
2017-11-29 20:55:20 +01:00
Ethan Koenig
b7ebaf6d20 Various wiki bug fixes (#2996)
* Update macaron

* Various wiki bug fixes
2017-11-28 17:43:51 +08:00
kolaente
db4f578e04
Finished implementing setting for dependencies 2017-11-28 00:33:51 +01:00
Konrad
c81041f80d
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-27 22:36:38 +01:00
kolaente
33c5033c8b
Started implementing settign for dependencies 2017-11-27 22:36:26 +01:00
Duncan Ogilvie
8ee08fe8bc Remove duplicate "Max Diff Lines" from config view (#2987)
Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
2017-11-27 06:56:50 +02:00
Konrad
fc35252f68
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-26 18:41:38 +01:00
Ethan Koenig
2cb6c51158 Fix over-escaped characters (#2956) 2017-11-22 15:09:48 +08:00
Ethan Koenig
ea78a6db57 Spaces to tabs in templates (#2953) 2017-11-21 13:43:00 +08:00
Lunny Xiao
10b54df2b2 Add dingtalk webhook (#2777)
* add dingtalk webhook type

* add vendor

* some fixes

* fix name check

* fix name check & improvment
2017-11-21 06:26:43 +02:00
Michael Kuhn
420fc8efc2 Disable add key button if SSH is disabled (#2873) 2017-11-21 11:49:33 +08:00
Lauris BH
a6f337046f Update go-ini dependency and remove semicolon hack in translations (#2913) 2017-11-15 11:34:42 +08:00
Ethan Koenig
bd23e36bec Add owner to delete repo message (#2886) 2017-11-15 09:37:16 +08:00
Konrad Langenberg
6109fcf49a
Simplified check for open dependencies 2017-11-14 21:41:49 +01:00
Konrad
f38b3b4ce5
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-13 18:12:06 +01:00
Lauris BH
134958fd9f
Fix localization texts that contain semicolon (#2900) 2017-11-13 09:56:10 +02:00
Shaun
4725f91543 Fix inconsistencies in user settings ui (#2901) 2017-11-13 09:21:41 +02:00
Ethan Koenig
5481be0ac5 Fix issue link rendering in commit messages (#2897)
* Fix issue link rendering in commit messages

* Update page.tmpl

* No links for parens

* remove comment
2017-11-13 09:35:55 +08:00
Lauris BH
0a9fd454da Fix new branch creation to new url scheme (#2884) 2017-11-10 19:32:46 -06:00
kolaente
c4ba8d681f
Merge branch 'master' into master 2017-11-06 17:42:41 +01:00
Lunny Xiao
ff9daa3e9b fix click create pull request button 404 (#2859) 2017-11-05 21:11:35 +02:00
harry
93f726352c Link members and repositories count to each page on org home. (#2787) 2017-11-04 13:46:34 +08:00
Morlinest
122a66f6e0 Fix commits page url (#2823)
* Fix commits page url

* Check all view types
2017-11-02 08:30:19 +08:00
Konrad Langenberg
993a3c0b86
Fixed indention 2017-11-01 20:42:24 +01:00
Morlinest
25acd6c822 Use custom search for each filter type in dashboard (#2343)
* Do custom search for each filter in repo-search

* Fix search url

* Simplify code

* Remove loader and reset counts when changing filter
2017-11-01 21:39:05 +02:00
Konrad Langenberg
c0bc5e8321
Fixed indetion 2017-11-01 20:38:55 +01:00
Konrad
a2b652e14c
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-01 11:31:54 +01:00
Konrad
f188031b44
Rebased sidebar template to remove unrelated changes 2017-11-01 11:03:59 +01:00
Mulia Nasution
e22549747c Fix dropdown menu position on explore repo (#2808)
Signed-off-by: Mulia Arifandi Nasution <mul14.net@gmail.com>
2017-10-31 21:16:07 +02:00
Konrad Langenberg
0bbc695915
Fixed a bug where a border in the issue dependency list was on the wrong place
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:17:23 +01:00
Konrad Langenberg
14aa1d2052
When adding a dependency, the current issue is not shown in the list anymore.
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:02:36 +01:00
Konrad Langenberg
30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v46.go
#	models/repo.go
#	public/js/index.js
2017-10-30 21:17:36 +01:00
Ethan Koenig
513375c429 Make URL scheme unambiguous (#2408)
* Make URL scheme unambiguous

Redirect old routes to new routes

* Fix redirects to new URL scheme, and update template

* Fix branches/_new endpoints, and update integration test
2017-10-30 10:04:25 +08:00
Arif
6e98812ecf Fix copy in email templates (#2801) 2017-10-29 23:57:05 +02:00
Bastian Rinsche
638509b217 Add Safari pinned tab icon (#2799)
Closes #2753

Signed-off-by: Bastian Rinsche <bastian.rinsche@gmail.com>
2017-10-28 20:01:42 -05:00
Konrad Langenberg
c5992f51c3 Fixed translation issue
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:13:44 +02:00
Konrad Langenberg
2a02c097c5 Added check to only show dependencies if the user is logged in
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:10:51 +02:00
Ethan Koenig
5866eb2321 Code/repo search (#2582)
Indexed search of repository contents (for default branch only)
2017-10-27 09:10:54 +03:00
Lauris BH
762f1d7237 Add wrapping to long diff lines (#2789)
* Add wrapping to long diff lines to fix #1827

* Fix  css class and make changes to source (less) files

* Fix wrong space indentation

* Fix indentation inconsistencies and remove very old WebKit workaround
2017-10-27 12:30:54 +08:00
Jonas Bröms
4d01ecaef3 Show Sendmail settings on admin config page (#2782)
* Show Sendmail settings on admin config page

* Remove unecessary if statement
2017-10-26 16:47:16 +08:00