home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
1793 Commits
Author SHA1 Message Date
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view 
Factor zen mode.
 2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Dmitriy Zaporozhets eb764b1b7b Fix star/fork button UI issue if count > 100 2014-09-19 12:33:09 +00:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes 
Close Zen mode by ESC, foward/backward
 2014-09-11 19:24:51 +02:00
Marin Jankovski 4e6d0daf1a Wrap text that overflows the description field. 2014-09-10 17:30:29 +02:00
Dmitriy Zaporozhets 29e7647a08 Merge branch 'close_button_after_added_comment' into 'master' 
Close button after added comment

Fixes #1549

See merge request !1070
 2014-09-09 11:02:10 +00:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +02:00
Dmitriy Zaporozhets 69d149e0d0 Fix ugly project access icons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 16:34:07 +03:00
Dmitriy Zaporozhets d5c569118c Small color refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 11:00:29 +03:00
Dmitriy Zaporozhets d62e89ba05 Enable link underline on hover for better UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-04 10:25:48 +03:00
Dmitriy Zaporozhets 5f6eb09cdf Improve issue filtering. Make tests pass 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 19:18:23 +03:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 94e7138bdb Merge pull request #7406 from robbytaylor/feature/group-row-padding 
Moved padding from li to a in dashboard groups / projects listing
 2014-09-01 14:04:12 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Dmitriy Zaporozhets ad98c8c9ef Merge branch 'improve-issue-ui' into 'master' 
Improve issue ui

Fix code overflow for description block

See merge request !1051
 2014-08-29 12:45:54 +00:00
Dmitriy Zaporozhets 49313946da Remove unnecessary color styling for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:26:24 +03:00
Dmitriy Zaporozhets fc76267288 Pre-wrap code blocks in issue description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 14:55:54 +03:00
Dmitriy Zaporozhets c8514bece9 Merge pull request #7621 from dreis2211/overflow-my-projects-list 
Fix overflow in 'my projects' list
 2014-08-28 16:51:56 +03:00
Dmitriy Zaporozhets 22a7fcab8c Merge pull request #7620 from zzet/patch-11 
Add search in textarea
 2014-08-28 16:49:42 +03:00
Dmitriy Zaporozhets 48f8c5a873 Improve project sidebutton colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:10:47 +03:00
Dmitriy Zaporozhets 8289308933 Restyle project home 
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 14:19:11 +03:00
dreis 7b9a1819f7 Fix overflow in 'my projects' list 2014-08-28 10:54:21 +02:00
Andrew Kumanyaev f9c7f41476 Add missing ext for searchbox 2014-08-28 12:08:02 +04:00
Dmitriy Zaporozhets 1056d91c67 Improve search results output. Fixes some markup issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 11:06:19 +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
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
uran 6eb85b1a30 Diff headers made sticky. 2014-08-27 00:24:49 +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
Marin Jankovski 1cfe341589 Advise to refine search when no match is returned. 2014-08-25 12:39:45 +02: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
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Robert Schilling 64102476dc Call updateColorPreview in Labels constructor 2014-08-20 18:11:51 +02:00
Jacob Vosmaer d155b3e72c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-08-20 14:36:07 +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