Commit Graph

835 Commits

Author SHA1 Message Date
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
kolaente
33c5033c8b
Started implementing settign for dependencies 2017-11-27 22:36:26 +01: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
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
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
Konrad Langenberg
c0bc5e8321
Fixed indetion 2017-11-01 20:38:55 +01:00
Konrad
f188031b44
Rebased sidebar template to remove unrelated changes 2017-11-01 11:03:59 +01: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
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
Lauris BH
6a107e57f6 Add checks for commits with missing author and time (#2771)
* Add checks for commits with missing author and time

* Fix validate commits with emails if it has no Author
2017-10-26 15:45:14 +08:00
Bwko
3ab580c8d6 Add branch overiew page (#2108)
* Add branch overiew page

* fix changed method name on sub menu

* remove unused code
2017-10-26 08:49:16 +08:00
Lunny Xiao
219ca5cadb
some fixes 2017-10-25 13:26:14 +08:00
Lauris BH
0e9e48bd5c Fix activity css conflit with semantic ui (#2758) 2017-10-21 18:07:06 -02:00
Lauris BH
af4a094e5d Fix semantic-ui style conflict with v-cloak (#2722) 2017-10-17 02:24:43 -05:00
Jonas Franz
f4190f8df8 Render plain text README.txt monospaced (#2721)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-10-17 02:17:22 +03:00
Lauris BH
c1b0c9e7c4 Fix PR, milestone and label functionality if issue unit is disabled (#2710)
* Fix PR, milestone and label functionality if issue unit is disabled or not assigned to user

* Fix multi-actions in PR page

* Change error message

* Fix comment update and delete functionality in PR
2017-10-16 10:55:43 +03:00
Lunny Xiao
a75d5c72bb Fix plain readme didn't render correctly on repo home page (#2705)
* fix plain readme didn't render correctly on repo home page

* fix missing render

* remove unused template variables
2017-10-16 09:04:34 +02:00
Lauris BH
f3833b7ce4 Create new branch from branch selection dropdown (#2130)
* Create new branch from branch selection dropdown and rewrite it to VueJS

* Make updateLocalCopyToCommit as not exported

* Move branch name validation to model

* Fix possible race condition
2017-10-15 22:59:24 +03:00
Lauris BH
1ec4dc6c1d Fix so that user can still fork his own repository to owned organizations (#2699)
* Fix so that user can still fork his own repository to his organizations

* Fix to only use owned organizations

* Add integration test for forking own repository to owned organization
2017-10-15 18:06:07 +03:00
Lauris BH
f42dbdbae5 Add Activity page to repository (#2674)
* Add Activity page to repository

* Add request data for activity

* Add issue data for activity

* Add user unit right checks

* Add releases to activity

* Log repository unit loading error
2017-10-15 02:17:39 +03:00
Konrad Langenberg
c5e35e93ef Fixed indention
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-10 23:10:13 +02:00
Konrad Langenberg
752406c40c Reimplemented usage of Comment Depenendent Issue (in struct) in comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-04 23:37:39 +02:00
Konrad Langenberg
d7a2ffcc69 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/v44.go
2017-10-04 23:15:30 +02:00
Konrad Langenberg
62efeba087 Simplified UI
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-04 22:54:40 +02:00
Konrad Langenberg
5e22614248 Optimized Issue Dependency Routes
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-03 15:03:57 +02:00
harry
b3cfa5a77e Use Semantic UI's Search component for user and repo search (#2636)
* Use search component on org invitation user input.

* Search component for collaboration and members.

* Search component for repo search.

* minCharacters for search input

* Display full_name for user search.

* Fixed missing uid query parameter for repo search.

* Removed unused comment.
2017-10-03 06:27:48 +03:00
Konrad Langenberg
43caa93454 Moved add dependency input to the sidebar
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-27 17:26:58 +02:00
Konrad Langenberg
107b0cbe6e Implemented searchable issue list for new dependency selection
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-27 14:36:43 +02:00
Konrad Langenberg
29aafb3ef8 Implemented custom type DependencyType
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-24 17:31:47 +02:00