mirror of
1
Fork 0
Commit Graph

5285 Commits

Author SHA1 Message Date
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
Ethan Koenig bafd778c25 Fix invalid reference in feeds template (#1820)
* Fix invalid reference in feeds template

* Comment for GetActAvatar

* Add integration test
2017-05-27 11:34:11 +08:00
Patrick G 97f7f88bed Improve clarity between is_activated and prohibit_login (#1788)
It used to be unclear what the difference between the two are.
2017-05-27 09:14:13 +08:00
Lunny Xiao 3b51da9dae resign drone and fix #1816 (#1819) 2017-05-26 23:08:38 +08:00
Ethan Koenig 7e6ff69c00 Fix 500 for GET /teams/:id endpoints (#1811)
* Fix 500 for GET /teams/:id endpoints

* Integration test for GET /team/:id

* Clean up integration test
2017-05-26 08:15:45 -05:00
Lunny Xiao 3611a3e552 fix bug to deny to add orgnization as a member of an orgnization or team (#1815) 2017-05-26 08:12:02 -05:00
Ethan Koenig 39348cd27e Give all units to owner team (#1812) 2017-05-26 16:03:37 +08:00
Ethan Koenig 9c66d1d9ea Fix deadlock in updateRepository (#1813) 2017-05-26 13:08:13 +08:00
Ethan Koenig 0c332f0480 Fix activity feed (#1779)
* Fix activity feed

Preserve actions after user/repo name change

* Add missing comment

* Fix migration, and remove fields completely

* Tests
2017-05-26 09:38:18 +08:00
Jonas Franz 03912ce014 Adding #issuecomment to the URL in E-Mail notifications (#1674)
* Added comment's hashtag to url for mail notifications.

Signed-off-by: Jonas <info@jonasfranz.software>

* Added comment's hashtag to url for mail notifications.
Added explanation to return statement.

Signed-off-by: Jonas <info@jonasfranz.software>

* Added comment's hashtag to url for mail notifications.
Added explanation to return statement + documentation.

Signed-off-by: Jonas <info@jonasfranz.software>

* Added comment's hashtag to url for mail notifications.

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Replacing in-line link generation with HTMLURL. (+gofmt)

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Replaced action-based model with nil-based model. (+gofmt)

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants.

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Updating comment for mailIssueCommentToParticipants

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-05-25 10:38:56 +08:00
Ethan Koenig cb74f1b84d Remove stale rule from Makefile (#1782) 2017-05-25 08:53:03 +08:00
Ethan Koenig ff96bda138 Only run coverage on merges/pushes to master (#1783) 2017-05-25 00:13:18 +08:00
Lunny Xiao 19d889daa2 fix bug not to trim space of login username (#1796) 2017-05-25 00:12:00 +08:00
Ethan Koenig ff2464c87d Fix renaming bug (#1786) 2017-05-24 14:01:02 +08: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
Jonas Östanbäck 7b907ed348 Rename RepoCreationNum -> MaxCreationLimit (#1766) 2017-05-24 08:27:08 +08:00
Patrick G de39d09caa Improve grammar (#1775) 2017-05-23 16:01:27 +08:00
Ethan Koenig bdc90aeaee Delete repo redirects on repo deletion (#1776) 2017-05-23 16:00:10 +08:00
Patrick G cc2071c3fd Make side nav on dashboard stackable (#1778) 2017-05-23 15:58:43 +08:00
Bo-Yi Wu 1e40c2e579 fix: #1757 fix set MAX_CREATION_LIMIT as zero. (#1762)
* fix: #1757 fix set MAX_CREATION_LIMIT as zero.

* fix: missing default value
2017-05-21 22:48:35 +08:00
Ethan Koenig b0308d86dc Fix unloaded owner (#1770) 2017-05-21 14:35:45 +08:00
Ethan Koenig cf02cd7ba0 Fix and test for delete user (#1713)
* Fix and test for delete user

* Run updates in batches

* Unit test
2017-05-20 16:48:22 +08:00
Jonas Östanbäck 85a7396525 Add error direclty when user tries to create new repo and limit already hit (#1767) 2017-05-20 16:47:48 +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 80cea8747f Admin should always be allowed to create repos even if hit limit (#1765) 2017-05-20 11:51:19 +08:00
Kim "BKC" Carlbäcker 977dcf96e0 fixes wrong after field in webhook payload (#1746) 2017-05-19 12:12:27 +02:00
Kim "BKC" Carlbäcker 281a0389c1 fix admin lost permission caused by #947 (#1753) 2017-05-19 12:10:17 +02:00
Lunny Xiao 6362462da8
fix admin lost permission caused by #947 2017-05-19 08:59:26 +08:00
Rémy Boulanouar 25d6e2a660 Add button to admin ui (#1738)
* Add button to admin ui

* Update according to review

* Update locale_fr-FR.ini

* Rollback to locale french file
2017-05-19 08:20:41 +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
Andrey Nering 8906b2891b Fix test
There was a panic when there's no logged in user
2017-05-18 14:35:06 -03:00
Lunny Xiao fd6034aaf2 Add units to team (#947)
* add units to team

* fix lint

* finish team setting backend

* finished permission controll on routes

* fix import blank line

* add unit check on ssh/http pull and push and fix test failed

* fix fixtures data

* remove unused code
2017-05-18 22:54:24 +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
Andrey Nering c746875fcf Remove colaborative repo panel 2017-05-18 11:16:04 -03:00
Andrey Nering 8917f47347 Fix org repos not showing on dashboard search 2017-05-18 11:15:32 -03:00
Diep Pham 407fbfa6ce fixes wrong after field in webhook payload
when merge pull request
2017-05-18 12:16:36 +07:00
Patrick G c4b5b121a5 Fix bad grammar and wordiness (#1741)
* Fix bad grammar and wordiness

* Update locale_en-US.ini

* Update locale_en-US.ini

* Update locale_en-US.ini

* Update locale_en-US.ini

* Update locale_en-US.ini

* Update locale_en-US.ini

* Update locale_en-US.ini
2017-05-18 09:03:43 +08:00
Patrick G 03d6bab643 Change two factor code entry box from text to number (#1733) 2017-05-16 15:30:20 +08:00
Lunny Xiao bc299b8317 fix avatar update bug (#1729) 2017-05-16 08:36:09 +08: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
Jonas Östanbäck e214728725 Add new text for reset password flash (#1718)
* Forgot password should use ResetPwdCodeLives, not ActiveCodeLives
 * Improve documentation for different send mail functions related to password reset
 * Improve documentation in conf/app.ini regarding xxx_CODE_LIVE_MINUTES settings
2017-05-14 10:38:30 +08:00
Ethan Koenig 9e627af9a4 gofmt (#1710) 2017-05-12 16:09:53 +08:00
Ethan Koenig 5ca3046da6 Fix rendering of issue checkboxes (#1709) 2017-05-12 15:52:45 +08:00
Jun Hsieh ♞ 2cf80f4b18 Hide the create organization button (in dashboard/organization section) (#1705)
when the user has no such permission.
2017-05-12 15:10:25 +08:00
guyzmo 397474ecb1 Added Parent property to the repo API (#1687)
Signed-off-by: Guyzmo <guyzmo+github+pub@m0g.net>
2017-05-12 11:09:26 +08:00
Ethan Koenig 251fb935ff Don't recreate database in integration tests (#1697) 2017-05-11 23:32:43 +08:00
Jonas Östanbäck ddb63a7897 Correct spelling mistakes (#1703)
* Nitpicking
2017-05-11 09:03:34 +08:00
Lauris BH 524885dd65 LDAP user synchronization (#1478) 2017-05-10 15:10:18 +02:00