Commit Graph
137 Commits
Author SHA1 Message Date
Robert Speicher bf2a86b73c Revert "Merge branch 'issue_3946' into 'master' "
This reverts commit 68155ee73b, reversing
changes made to 7ebd011ed1.
2016-07-07 18:25:05 -04:00
Alfredo Sumaran 338072cc4b Layout for Users Groups and Projects on admin area 2016-07-07 13:25:58 -05:00
Felipe Artur 36d48120f6 merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
Felipe Artur 2674b54860 merge master into issue_3359_3 2016-06-22 10:47:48 -03:00
Felipe Artur 8447c6b180 Insert notification settings dropdown into groups 2016-06-22 10:44:20 -03:00
Felipe Artur 92e183542f Insert notification settings dropdown into groups 2016-06-22 10:38:42 -03:00
Felipe Artur e5aa902860 Merge master into issue_12758 2016-06-17 14:29:11 -03:00
Felipe Artur f82ab42d05 Re-use notifications dropdown on user profile 2016-06-16 23:34:21 -03:00
Jacob Schatz f0c58c72a9 Merge branch 'milestone-date-clear' into 'master'
Due date can be removed from milestones

## What does this MR do?

Adds a button to milestone form to allow user to remove due date 

## What are the relevant issue numbers?

Closes #15063 

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png)

See merge request !4428
2016-06-15 20:52:09 +00:00
Jacob Schatz be37ff7acb Merge branch 'add-shortcut-to-copy-file-content-hash-link' into 'master'
Add shortcut to copy file content hash link

## What does this MR do?

* Allows for multiple shortcut handlers to be initialised
* Adds `y` shortcut to file pages to copy permalink URL.

## Are there points in the code the reviewer needs to double check?

Ney.

## Why was this MR needed?

UX

## What are the relevant issue numbers?

Closes #14470.

## Screenshots (if relevant)

![y-shortcut](/uploads/b81feb26d8e0d7d4996c4afa29f385d7/y-shortcut.gif)

See merge request !4496
2016-06-15 20:51:30 +00:00
Jacob Schatz 995a59314e Merge branch '17929-issue-shortcut-doesnt-work-on-some-pages' into 'master'
New issue shortcut doesnt work on some pages

## What does this MR do?

1. Slightly tidies dispatcher switch case by utilising 'fall through' cases.
2. Adds shortcuts to project pipelines, milestones, builds and forks pages

## Are there points in the code the reviewer needs to double check?

I have a feeling that these may have been missed out of the case statements on purpose?

## Why was this MR needed?

Possible UX issue highlighted in #17929.

## What are the relevant issue numbers?

Closes #17929.

Closes #12616. (dup)

Closes #18123. (dup)

Closes #13688. (dup)

## Screenshots (if relevant)

See merge request !4393
2016-06-15 20:30:40 +00:00
Felipe Artur 220708fa6e Remove schema from branch history 2016-06-13 16:51:35 -03:00
Phil Hughes 22e97dd702 Fixed issue with MR buttons being in a group
Also removed some inline code
2016-06-13 11:46:53 +01:00
Luke "Jared" BennettandLuke "Jared" Bennett 479ecbab9b Tidied dispatcher switch and added shortcuts to project pipelines, milestones and forks pages
Updated CHANGELOG

Moved CHANGELOG entry
2016-06-10 17:50:12 +01:00
Luke "Jared" Bennett 20a6111d2b Added ability to skip the Mousetrap binding reset
Added 'y' shortcut for copying a files immutable content hash link

Updated CHANGELOG

changed ! to not

Moved CHANGELOG entry
2016-06-10 17:41:02 +01:00
Phil Hughes 9d09bd08e5 Due date can be removed from milestones
Closes #15063
2016-06-10 11:38:25 +01:00
Fatih Acet 091e030070 Instantiate awardsHandler in application main script. 2016-06-09 02:57:53 +03:00
Alfredo Sumaran a966e6e451 Initialize LabelManager only when necessary 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 0e2f26dd2a Prioritize labels functionality 2016-06-06 11:59:49 -05:00
Fatih AcetandZ.J. van de Weg 8dc1fa0d8d Updated MR notes. 2016-06-06 16:02:11 +02:00
Alfredo Sumaran f1291b1b9f Bulk assignment implementation 2016-06-03 17:14:23 -05:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master'
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
2016-05-25 19:44:06 +00:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
ZJ van de Weg 6d19d6a2fd minor js fixes 2016-05-20 20:17:49 -05:00
Phil HughesandFatih Acet 0b45cf55dd Uses the same emoji-menu and just moves it around depending where it should be viewed
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
2016-05-19 14:07:27 -05:00
Dmitriy Zaporozhets 5ba5269383 Fix dashboard shortcuts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-17 00:35:16 -05:00
Phil Hughes 832d7fa3ce Issuable filtering improvements
This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both.
2016-05-16 10:29:47 +01:00
Zeger-Jan van de Weg 2bbe781d8b revert front end changes 2016-05-11 22:58:01 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Arinde EniolaandZeger-Jan van de Weg 4eb16290e4 move frontend logic from previous MR to new MR 2016-05-06 10:47:12 +02:00
Phil Hughes be521d7d76 icons on search bar 2016-04-26 09:03:04 +01:00
Phil Hughes b3af3930c6 Started updating search UI 2016-04-26 09:03:04 +01:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-20 19:18:32 +00:00
Phil Hughes 75626d5f01 Label text color comes from JSON
Created issuable singleton to house the filtering
2016-04-20 17:00:12 +01:00
Arinde Eniola a845252983 get the multi filter labels feature to work on merge request, also escape characters in the templates to prevent xss attack 2016-04-20 13:55:19 +01:00
Phil Hughes 3de09d1475 Updated all GFM forms to use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes d67c3e35c9 Milestones use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes c45ca936c7 merge request form uses new GLForm 2016-04-14 10:28:05 +01:00
Phil Hughes ff7fb09ea8 Updated issue form to use new GLForm 2016-04-14 10:28:05 +01:00
Alfredo Sumaran b169046e57 Initialize autocomplete only when search form is present 2016-03-26 17:56:51 -05:00
Alfredo SumaranandJacob Schatz c9e202c1d7 Working version of autocomplete with categorized results 2016-03-18 14:06:51 -04:00
Jacob SchatzandPhil Hughes fa570525db Adds small AJAX optimistic functionality to todos.
Fixes #13656
A good first step and boring solution.
2016-03-17 12:20:14 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Dmitriy Zaporozhets 746ac56b6f Add functionality to setup share of project with group via project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:37:46 +01:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Dmitriy Zaporozhets 7455d950bc Refactor projects list
1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-03 13:09:58 +01:00
Alfredo Sumaran ef9b78c1e3 Initialize User class on the view 2016-03-01 11:19:05 -05:00
Alfredo Sumaran 4c4d742431 Activities will load when the according tab is opened 2016-02-29 19:09:16 -05:00