Commit Graph

6337 Commits

Author SHA1 Message Date
Jonas Franz
e5bde1405f
Resolve conflicts
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-19 18:15:09 +02:00
Jonas Franz
05df5a7f22
Update comparison
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-19 12:16:31 +02:00
Jonas Franz
6e55557228
Add support for new webhooks
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-17 14:04:43 +02:00
Jonas Franz
0f64dad74b
Merge branch 'master' into feat/approval-new 2018-05-17 14:00:21 +02:00
Jonas Franz
5c2171e0b8
Update code.gitea.io/git
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-17 13:58:35 +02:00
David Schneiderbauer
2aabfc1afa Splitted the user settings code into several files to be more maintainable (#3968)
* refactor setting router code

splitted up one huge router settings file into the smaller files
representing the actual page structure

* move code to subfolder

* rename functions

* renamed files

* add copyright information
2018-05-17 12:05:00 +08:00
GiteaBot
8f4d11af0b [skip ci] Updated translations via Crowdin 2018-05-17 01:36:23 +00:00
techknowlogick
8176345c0e Add cli commands to regen hooks & keys (#3979)
* Add cli commands to regen hooks & keys

* make fmt

* Allow passing path to config as an option

* add docs
2018-05-17 09:35:07 +08:00
techknowlogick
ecfc401eaa Allow Gitea to run as different USER in Docker (#3961)
* If using a different $USER then rename git user

* Chown based on $USER env

* Target only one part of passwd

* su-exec based on $USER

not a hardcoded value
2018-05-16 23:58:44 +08:00
GiteaBot
4ceb92f311 [skip ci] Updated translations via Crowdin 2018-05-16 14:26:58 +00:00
David Schneiderbauer
80d1998981 add missing token validation and fix missing alert on application settings page (#3976) 2018-05-16 22:18:13 +08:00
GiteaBot
d79829fc47 [skip ci] Updated translations via Crowdin 2018-05-16 14:03:37 +00:00
Lunny Xiao
24941a1046
Add more webhooks support and refactor webhook templates directory (#3929)
* add more webhook support

* move hooks templates to standalone dir and add more webhooks ui

* fix tests

* update vendor checksum

* add more webhook support

* move hooks templates to standalone dir and add more webhooks ui

* fix tests

* update vendor checksum

* update vendor

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

* load attributes when created release

* update comparsion doc
2018-05-16 22:01:55 +08:00
Jonas Franz
8bb51135b6
Add support for "Show/Hide outdated"
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-15 16:34:19 +02:00
GiteaBot
188fe6c301 [skip ci] Updated translations via Crowdin 2018-05-15 14:16:11 +00:00
David Schneiderbauer
e45331d6d2 add user language value to hidden input to enable saving of profile without changing language (#3967) 2018-05-15 17:14:40 +03:00
Jonas Franz
7c1edf93ff
Merge branch 'master' into feat/approval 2018-05-15 12:58:46 +02:00
Jonas Franz
4ea74e5327
Add support for showing code comments of reviews in conversation
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-15 12:52:28 +02:00
GiteaBot
d3dce01cf7 [skip ci] Updated translations via Crowdin 2018-05-15 10:08:59 +00:00
David Schneiderbauer
099372d76c Refactor User Settings (#3900)
* moved avatar to profile page

* combined password change, email and account deletion into account settings page

* combined totp, access tokens, linked accounts and openid into security settings page

* move access tokens to applications settings page

* small change to restart drone build

* fix change avatar url on profile page

* redirect old settings urls to new ones

* enforce only one autofocus attribute on settings pages

* set correct redirect status code

* fmt fix
2018-05-15 13:07:32 +03:00
Jonas Franz
6ae32b27e3
Fix problems caused by files in subdirectories
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-14 19:04:45 +02:00
Jonas Franz
7c4bf56649
Add support for deleting CodeComments
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-14 14:15:06 +02:00
Jonas Franz
de7081c2ab
Comments will be shown at the right place now
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-14 14:05:38 +02:00
Jonas Franz
ed695c1bf9
Fix unit tests by updating fixtures and updating outdated test
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-14 10:55:50 +02:00
Jonas Franz
d2b43471c7
Improve translations
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 22:50:37 +02:00
Jonas Franz
5f55edea84
gofmt
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 22:43:02 +02:00
Jonas Franz
90d9ddacf7
Rebuild css
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 22:19:36 +02:00
Jonas Franz
7723e15e64
Moved review migration from v64 to v65
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 22:15:16 +02:00
Jonas Franz
6d00c1a7ce
Merge branch 'master' into feat/approval-new
# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
#	models/models.go
#	public/css/index.css
2018-05-13 22:14:34 +02:00
Lauris BH
2f466132cc
Merge pull request #2 from JonasFranzDEV/feat/approval
Reviews and Pull Request comments
2018-05-13 23:09:00 +03:00
Jonas Franz
cbdd8c9da7
Switched back to code.gitea.io/git
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 16:14:22 +02:00
Jonas Franz
7986d6ed22
Add support for invalidating comments
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-13 13:24:19 +02:00
FabioFortini
1546458f7d issue-2768: added new option allow_only_external_registration (#3910) 2018-05-13 15:51:16 +08:00
Lauris BH
e74055878f Update xormstore dependency to fix OAuth2 support for MySQL (#3955) 2018-05-13 13:10:50 +08:00
GiteaBot
2c34ef5d97 [skip ci] Updated translations via Crowdin 2018-05-13 01:51:56 +00:00
techknowlogick
f6828e0b66 Fix blank topic on explore repo list (#3956) 2018-05-13 09:50:39 +08:00
Jonas Franz
066086c390
Improved comment rendering in "Files" view by adding Comments to DiffLine
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-12 19:09:42 +02:00
Jonas Franz
58fb672d0d
gofmt
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-12 10:53:38 +02:00
Jonas Franz
bc9359222a
Fetch all review ids at once
Add unit tests

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 20:28:44 +02:00
Jonas Franz
9c6bb4b1e9
Add unit tests for Review
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 14:36:08 +02:00
Jonas Franz
36d6631957
Add pending tag to pending review comments
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 14:02:40 +02:00
Jonas Franz
61cc13499a
Add support for single comments
Showing buttons in context

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 13:40:17 +02:00
Jonas Franz
3e5f3c349e
Implement Review form
Show Review comments on comment stream

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 12:50:44 +02:00
Jonas Franz
e252d3bdb5
Move new comment form to its own file
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 11:05:09 +02:00
Jonas Franz
75b7d9b86a
Preview for listing comments
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-11 10:59:20 +02:00
Lunny Xiao
c14870c5ac
fix blank topic (#3948) 2018-05-11 16:15:18 +08:00
GiteaBot
bc8400747a [skip ci] Updated translations via Crowdin 2018-05-11 07:56:33 +00:00
Lauris BH
ff3971b830 Add LDAP integration tests (#3897)
* Add LDAP service for tests

* Add LDAP login source and test user sign-in

* Add checks to test if user data is correct

* Add LDAP user sync test

* Add failed user sign-in test
2018-05-11 15:55:32 +08:00
jess
aafb0ea1c6 Activating Open Collective (#3821)
* Added backers and sponsors on the README

* Added call to donate after npm install (optional)

* Remove npm changes

* Update readme to leave only needed sections
2018-05-11 13:53:23 +08:00
techknowlogick
20acbdfe03 Remove another mention of matrix (#3947) 2018-05-11 13:18:34 +08:00