Commit Graph
1531 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3a602c8432 Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors
Complete transition to using color_field for selecting colors
2015-03-24 15:27:58 -07:00
Andrew Tomaka 83b5a9ae2b Update help texts and default value setting 2015-03-24 12:27:26 -04:00
Dmitriy Zaporozhets 2bb4ea8542 Merge branch 'notes-count-without-system' into 'master'
Don't include system notes in issue/MR comment count.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163.

See merge request !430
2015-03-24 00:10:25 +00:00
Dmitriy Zaporozhets 2cd6cc7fed Merge branch 'improve-diff-header' into 'master'
Fix file mode going to next line in diff header

See merge request !432
2015-03-24 00:09:40 +00:00
Dmitriy Zaporozhets 54326f490e Merge branch 'no-comment-bubble' into 'master'
Don't show commit comment button when user is not signed in.

Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167.

See merge request !429
2015-03-23 16:47:16 +00:00
Dmitriy Zaporozhets 61700f619c Fix file mode going to next line in diff header 2015-03-23 09:38:52 -07:00
Douwe Maan 6b92236eeb Don't include system notes in issue/MR comment count. 2015-03-23 16:43:08 +01:00
Douwe Maan a30645c68f Don't show commit comment button when user is not signed in. 2015-03-23 16:17:10 +01:00
Dmitriy Zaporozhets 9e554a5223 Update views to single form of address. Change "my" to "your" 2015-03-22 20:10:12 -07:00
Stan Hu 90cbb73ed6 Fix "Import projects from" button to show the correct instructions
Closes #1267
2015-03-22 08:47:22 -07:00
Dmitriy Zaporozhets 085e5084a8 Make issue and merge request sidebar more compact
* move votes block to participants
* make smaller font in sidebar
2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets 915c7b9455 Merge branch 'update_ui' into 'master'
Remove mention of branch to commit to when new file is added through UI

See merge request !1731
2015-03-20 01:28:47 +00:00
Dmitriy Zaporozhets 479020ec6b Fix project issues and merge requests pages 2015-03-19 18:27:26 -07:00
Dmitriy Zaporozhets ad2720aea8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-19 17:53:48 -07:00
Marin Jankovski a879d93378 Remove mention of branch to commit to. 2015-03-19 17:43:21 -07:00
Dmitriy Zaporozhets 00c042ea7c Merge pull request #8772 from awiddersheim/fix/grammar_projects_show
Fix small grammar issue on projects show page
2015-03-19 16:17:37 -07:00
Dmitriy Zaporozhets df8b4ab459 Merge pull request #8662 from yglukhov/mr-and-issue-links
Make MR and issue numbers clickable links in MR and issue lists.
2015-03-19 15:17:07 -07:00
Dmitriy Zaporozhets 82d4760d0d Merge branch 'import-button' into 'master'
Move "Import existing repository by URL" option to button.

The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons.

@dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well.

Before:

![Screen_Shot_2015-03-19_at_15.08.04](https://dev.gitlab.org/gitlab/gitlabhq/uploads/6ac26467ede65a4f31d004c227fdbc3e/Screen_Shot_2015-03-19_at_15.08.04.png)

After:

![Screen_Shot_2015-03-19_at_15.42.56](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a73bd7d09b7a33f58067a3bd0d7f604a/Screen_Shot_2015-03-19_at_15.42.56.png)

("publically" typo has been fixed to "publicly")

See merge request !1728
2015-03-19 19:03:43 +00:00
Valery Sizov 19032c0319 add canceled CI status 2015-03-19 18:27:24 +02:00
Douwe Maan e23a1e448b Clear up import help. 2015-03-19 16:14:37 +01:00
Douwe Maan b298758b44 Move "Import existing repository by URL" option to button. 2015-03-19 15:06:05 +01:00
Dmitriy Zaporozhets 4595d5bf4a Merge branch 'show_test_settings_button' into 'master'
Show test settings as disabled when service cannot be tested.

See merge request !1725
2015-03-19 05:24:40 +00:00
Marin Jankovski 5aa97ce91b Show test settings as disabled when service cannot be tested. 2015-03-18 21:47:17 -07:00
Dmitriy Zaporozhets f3d5046196 Return compare code button to top of sidebar 2015-03-18 21:32:23 -07:00
Dmitriy Zaporozhets 3ab7933cc8 Merge branch 'improve-ui' into 'master'
Improve UI

* Improve group rename warning
* Refactor select css. Make selects same width

See merge request !400
2015-03-19 04:16:28 +00:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets 1cf138170c Add tooltip for comment toggle in diff. Add changelog item and fix tests 2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets e07d32eb41 Add some space aroung diff stats block 2015-03-18 19:21:24 -07:00
Dmitriy Zaporozhets 22038106b4 Replace show diff button with link 2015-03-18 19:11:27 -07:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Dmitriy Zaporozhets e7e329d364 Fix link to project from fork 2015-03-18 16:17:30 -07:00
Dmitriy Zaporozhets d03d636304 Merge branch 'changelog-link' into 'master'
Add changelog, license and contribution guide links to project sidebar.

If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown.

![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png)

See merge request !1708
2015-03-18 18:02:39 +00:00
Douwe Maan b1b8261f56 Add license and contribution guide links to project sidebar. 2015-03-18 16:17:43 +01:00
Douwe Maan 5adb1128dc Show changelog link even if no version is known. 2015-03-18 14:08:26 +01:00
Douwe Maan 6581aea3bf Link project version to changelog if there is one. 2015-03-18 14:08:26 +01:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Valery Sizov 847bd0d0e5 fix public issue 2015-03-18 02:16:10 -04:00
Douwe Maan 745aad4196 Merge branch 'fix_service_trigger_ui' into 'master'
Fix service UI

There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported.

Before:
![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png)

I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time.

See merge request !395
2015-03-17 17:32:57 +00:00
Drew Blessing 6a269450e6 Fix UI bug regarding services 2015-03-17 12:09:26 -05:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master'
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
2015-03-17 16:45:04 +00:00
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Valery Sizov 410d25c8ca rename table subscribe; make it polymorfic 2015-03-16 15:22:50 +02:00
Dmitriy Zaporozhets bacb05c554 Small improvements to group/project member rows 2015-03-15 23:50:55 -07:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan e88d06c892 Update button class. 2015-03-15 13:56:32 +01:00
Douwe Maan 5ad35bbe02 Use same layout and interactivity for project members as group members. 2015-03-15 13:55:57 +01:00
Douwe Maan 75aff0f79c Move project members index from /team to /project_members 2015-03-15 13:51:11 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Dmitriy Zaporozhets 19e0dafbef Merge branch 'more-flatly' 2015-03-14 01:48:13 -07:00