home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,210 Commits 48 Branches 340 Tags
c9bf35817bb3d3f367bdd4eb68df2f830a54da55
Commit Graph
5655 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c9054319c8 nicer block for oauth signin links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 18:21:54 +03:00
Dmitriy Zaporozhets d4d723caee Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr 
Fixed parralel diff button on 'merge_requests/new' page
 2014-08-27 17:31:38 +03:00
Dmitriy Zaporozhets f12fdf16e3 Merge branch 'improve-search-page' into 'master' 
Improve search page

Fixes #1270

* added pagination support
* filter results by type
* when switch between context - search params stays
* redesign comment search results
* search Issues and MR by description too

## Screenshots:

![Screenshot 2014-08-27 09.56.18](https://dev.gitlab.org/uploads/gitlab/gitlabhq/2053220cd4/Screenshot_2014-08-27_09.56.18.png)

![Screenshot 2014-08-27 09.56.00](https://dev.gitlab.org/uploads/gitlab/gitlabhq/726c764da4/Screenshot_2014-08-27_09.56.00.png)

See merge request !1043
 2014-08-27 14:22:58 +00:00
Dmitriy Zaporozhets 67d96b0f36 Merge pull request #7611 from yglukhov/sticky-diff-headers 
Diff headers made sticky.
 2014-08-27 17:22:17 +03:00
uran f44a68a004 Fixed parralel diff button on 'merge_requests/new' page 2014-08-27 17:00:15 +03:00
Dmitriy Zaporozhets 7f4b993793 Forgot to save file :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:54:18 +03:00
Dmitriy Zaporozhets 043f275900 Skip description if not exist 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:49:45 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 7e59a8fee8 Improve comment search results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:37:31 +03:00
Dmitriy Zaporozhets 13f6dc1a94 Save search options when switch between filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 11:55:42 +03:00
Yuriy Glukhovanduran 0bf45aece3 Added a checkbox to toggle line wrapping in diff. 2014-08-27 11:21:58 +03:00
Dmitriy Zaporozhets c3ad51a0e4 Improve search tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 10:48:51 +03:00
Dmitriy Zaporozhets ede08dbdd7 Implement search page with filtering of results and pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 09:57:50 +03:00
uran 6eb85b1a30 Diff headers made sticky. 2014-08-27 00:24:49 +03:00
Dmitriy Zaporozhets 5d9a5c02d8 Add search method to Note class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:39:37 +03:00
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 207d798dc4 Basic UI implememntation of comments in timeline style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 5087f36d23 Merge branch 'annotate' into 'master' 
Annotate

See merge request !1040
 2014-08-25 10:33:53 +00:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets 2e497d8438 Prevent project stars duplication when fork project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:19:52 +03:00
Ben Bodenmiller c1eee5968f Monthly active users -> Active users last 30 days 
Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
 2014-08-24 22:42:46 -07:00
Sytse Sijbrandij 8b1fe5f4ff Merge pull request #7569 from offlinehoster/patch-2 
Added AsciiDoc support and changed to singlequotes
 2014-08-24 11:57:54 +02:00
Dmitriy Zaporozhets 0cfa8aaf79 Merge pull request #7518 from jvanbaarsen/snippet-charset-fix 
Set charset encoding to UTF-8 for snippets
 2014-08-23 23:51:13 +03:00
Dmitriy Zaporozhets b0c96ec5a3 Merge branch 'cleaner-login' into 'master' 
Cleaner UI for login and signup pages

![Screenshot 2014-08-15 17.51.52](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/fc8bf3c4a4/Screenshot_2014-08-15_17.51.52.png)
![Screenshot 2014-08-15 17.52.39](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/72706f55b0/Screenshot_2014-08-15_17.52.39.png)
![Screenshot 2014-08-15 17.51.33](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/c46f972944/Screenshot_2014-08-15_17.51.33.png)

See merge request !1022
 2014-08-23 20:44:07 +00:00
Christian Sarazin 4a14b5900b Added AsciiDoc support and changed to singlequotes 
extension to https://github.com/gitlabhq/gitlabhq/pull/7568
 2014-08-22 12:33:58 +02:00
Jacob Vosmaer f2942ffee0 Merge pull request #7555 from erikjwaxx/master 
Fix spelling error in merge request performance issue warning.
 2014-08-21 11:20:43 +02:00
Erik Weatherwax 1ff781c3c9 Fix spelling error in merge request performance issue warning. 2014-08-20 12:53:19 -04:00
Robert Schilling 64102476dc Call updateColorPreview in Labels constructor 2014-08-20 18:11:51 +02:00
Jacob Vosmaer 3946485765 Merge pull request #7526 from jubianchi/api/issue-api-validate-labels 
API: Labels validation in issues API
 2014-08-20 15:09:31 +02:00
Jacob Vosmaer 1eaa8e18be Merge pull request #7553 from Razer6/fix_project_description 
Fix project description on explore page, fixes #7458
 2014-08-20 14:30:58 +02:00
Jacob Vosmaer 16500a2027 Merge pull request #7552 from Razer6/fix_star_button 
use default white-space for sidebar buttons, fixes #7549
 2014-08-20 14:29:22 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Robert Schilling 5e7f5ee8b8 Restyle explore projects to fix #7548 2014-08-20 02:38:52 +02:00
Robert Schilling 6f67923650 use default white-space for sidebar buttons, fixes #7549 2014-08-19 19:01:11 +02:00
Martin Bastien 8eff8bcebf Fix color toggle for labels in edit view 2014-08-18 12:23:45 -04:00
Jacob Vosmaer a2ee746758 Merge pull request #7524 from Razer6/repo_settings_spelling_error 
Fix minor spelling error in repo settings page
 2014-08-18 17:44:32 +02:00
Robert Schilling 2ca928d49a Fix minor spelling error 2014-08-17 19:58:57 +02:00
Jeroen van Baarsen 1b14864549 Set charset encoding to UTF-8 for snippets 
Fixes #2678

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-08-16 14:58:53 +02:00
Dmitriy Zaporozhets d28a27f7c4 Cleaner UI for login/signup pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 17:52:20 +03:00
Robert Schilling 938eed1ef8 Consistency: Capitalize hex values of sugested colors 2014-08-15 11:02:05 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 014eff5d8f Merge pull request #7499 from skv-headless/fix-commit-msg 
Fix commit msg
 2014-08-15 10:23:45 +03:00
Dmitriy Zaporozhets 0602c5d027 Change default label color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 10:20:12 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
skv fe46500448 gfm and preserve commit message 
for commits#show
 2014-08-14 15:20:34 +04:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00