peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,683 Commits 12 Branches 32 Tags 139 MiB
05ad1bb4a8
Commit Graph

5683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kolaente
05ad1bb4a8 Merge pull request #1 from kolaente/resolved-conflicts 
Resolved conflicts
 2017-09-17 21:19:16 +02:00
Jonas Franz
6898e46bcb Merge branch 'master' into resolved-conflicts 2017-09-17 21:18:47 +02:00
Konrad Langenberg
00aea1ad6f Fixed conflict with timetracking 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:14:02 +02:00
kolaente
d59aee92e3 Resolved Conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:14:02 +02:00
Konrad Langenberg
1710ea49a0 Moved languagestrings to ini 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:14:01 +02:00
Konrad Langenberg
6e5c686457 Fully implemented Repo setting to enable/disable Issue Dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:59 +02:00
Konrad Langenberg
c0d03825d1 Fixed showing correct index in issue comment 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:59 +02:00
Konrad Langenberg
743d0cfd49 Beautify @JonasFranzDEV 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:59 +02:00
kolaente
c6087b8a3d Implemented Basic Setting of Issue Dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:56 +02:00
kolaente
96f5d6b292 Started implementation of setting 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:56 +02:00
Konrad Langenberg
916d7f01e0 Improved Comments 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:54 +02:00
Konrad Langenberg
ab17606372 Added delete Dependency function 
+ Improved Event Comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:54 +02:00
Konrad Langenberg
b89a9e9d2e Added basic functionality: 
* Add new dependecy
* Show dependencies

Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:51 +02:00
Konrad Langenberg
f3c40e8aea Added create new issue method 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:13:47 +02:00
Konrad Langenberg
8bd99fe32e Init: 
* Added models
* Added UI
* Added Routes

Signed-off-by: kolaente <k@knt.li>
 2017-09-17 21:13:43 +02:00
Konrad Langenberg
8d1f9fe0df Fixed conflict with timetracking 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:07:07 +02:00
kolaente
0eafc956ac Resolved Conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:06:54 +02:00
Konrad Langenberg
c7696b17db Moved languagestrings to ini 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:04:03 +02:00
Konrad Langenberg
14b5d369c9 Implemented repo settings check on autoclose 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:04:03 +02:00
Konrad Langenberg
2dbeb63a75 Fully implemented Repo setting to enable/disable Issue Dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:04:03 +02:00
Konrad Langenberg
4e295d60cd Fixed showing correct index in issue comment 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:48 +02:00
Konrad Langenberg
49309a33d2 Fixed issue comment title bug 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:30 +02:00
Konrad Langenberg
538c3f04f3 Beautify @JonasFranzDEV 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:30 +02:00
Konrad Langenberg
2f9a4cc9e4 Fixed comments 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:08 +02:00
Konrad Langenberg
2c95447bdf Started implementation of comments 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:08 +02:00
kolaente
ca3b4e388a Implemented Basic Setting of Issue Dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:03:08 +02:00
kolaente
88855dd991 Started implementation of setting 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:01:40 +02:00
Konrad Langenberg
88025f8d7f Implemented Dependencies for pull requests. 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:54 +02:00
Konrad Langenberg
21f36f99c6 Implemented not closing an issue via commit message if it has blocking dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:54 +02:00
Konrad Langenberg
c3a0581243 Implemented not closing an issue if it has blocking dependencies 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:54 +02:00
Konrad Langenberg
475c539fee Improved Comments 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:54 +02:00
Konrad Langenberg
39f7f92b84 Added method to prevent making an issue dependent on itself 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:05 +02:00
Konrad Langenberg
6859c47397 Added delete Dependency function 
+ Improved Event Comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 21:00:05 +02:00
Konrad Langenberg
78e755c812 Added UI to delete a dependency 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:58:16 +02:00
Konrad Langenberg
7cc3ff0110 UI improvements 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:58:16 +02:00
Konrad Langenberg
0661b57134 Fixed creating a new dependency when the other issue didn't exists 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:58:16 +02:00
Konrad Langenberg
b6ecf50342 Added basic functionality: 
* Add new dependecy
* Show dependencies

Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:58:16 +02:00
Konrad Langenberg
9ec41580c0 Added create new issue method 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:51:29 +02:00
Konrad Langenberg
0588536447 Init: 
* Added models
* Added UI
* Added Routes

Signed-off-by: kolaente <k@knt.li>
 2017-09-17 20:48:29 +02:00
Jonas Franz
af8594364c Merge branch 'master' of https://github.com/go-gitea/gitea 2017-09-17 20:46:23 +02:00
Konrad Langenberg
74a0df7a3b Merged with upstream/master, resolved conflicts 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-09-17 20:38:30 +02:00
Ethan Koenig
b0f7457d9e Improve issue search (#2387) 
* Improve issue indexer

* Fix new issue sqlite bug

* Different test indexer paths for each db

* Add integration indexer paths to make clean
 2017-09-16 23:16:21 +03:00
Lunny Xiao
52e11b24bf Restructure markup & markdown to prepare for multiple markup language… (#2411) 
* restructure markup & markdown to prepare for multiple markup languages support

* adjust some functions between markdown and markup

* fix tests

* improve the comments
 2017-09-16 20:17:57 +03:00
Ethan Koenig
911ca02153 Convert spaces to tabs in footer.tmpl (#2520) 2017-09-16 17:04:27 +08:00
David Schneiderbauer
d766d0c4e0 Prevent sending emails and notifications to inactive users (#2384) 
* Filter inactive users before sending emails or creating browser notifications

Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>

* fix formatting issues

Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>

* included requested changes

Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>

* optimized database queries

* rebasing new master and add tablenames for clarification in xorm queries

* remove escaped quotationmarks using backticks

Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
 2017-09-16 08:18:25 +08:00
Ethan Koenig
b496e3e1cc Fix unit test race condition (#2516) 2017-09-15 10:54:25 +03:00
Thomas Boerger
cbe50587ba Added bucket name to s3 drone plugin (#2505) 2017-09-15 14:45:38 +08:00
bradder555
ad24a3134d Fixes 500 error on dashboard when using MSSQL (#2504) 
MSSQL rejects the query:
  SELECT "repository"."id" FROM "repository"
  INNER JOIN "team_repo" ON "team_repo".repo_id="repository".id AND
  "repository".is_mirror=1
  WHERE (
    ("repository".owner_id=2 AND "repository".is_private=0)
        OR team_repo.team_id IN (1)
        )
        GROUP BY "repository".id ORDER BY updated_unix DESC

when the order by term (updated_unix) is not included in the group by
term.
 2017-09-15 09:14:06 +03:00
Lunny Xiao
0f9e20b3d7 fix updated update on public key (#2514) 
* fix updated update on public key

* update vendor.json

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* fix root path

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2017-09-15 11:23:48 +08:00
Rémy Boulanouar
e5d80b7090 Implementation of all repositories of a user from user->settings (#1740) 
* Implementation of all repositories of a user from user->settings

* Update message when no repository found

* Update according to comments

* Change UI to have a better look

* improved user repositories UI
 2017-09-14 14:46:14 +03:00