Git Merge Request #138: Improve design of merge requests filter and add confirmation to accept reject merge requests (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Rohan Verma wants to merge 58 commits from /u/rhnvrm/allura/ to master, 2016-07-26

Improve design of merge requests listing filter

Before:
Before
After:
After

Commit Date  
[34a54f] (rhnvrm/design/merge-list-filter) by Rohan Verma Rohan Verma

undo removing nested-grid-container

2016-07-26 09:20:28 Tree
[0fafab] by Rohan Verma Rohan Verma

Added confirmation before accepting or rejecting merge request

2016-07-18 20:19:26 Tree
[da5abd] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#6409] clean up some unused CSS

2016-07-15 16:27:22 Tree
[bf1715] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#6409] minor tweak to make user perms look better too

2016-07-15 16:19:15 Tree
[4045bc] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#6409] add missing style rules, now empty repo and commit headers look good

2016-07-15 16:03:09 Tree
[54216c] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#6409] merge allura.css into site_style.css

There's no need to have them separate. Back in the very beginning,
site_style.css was going to be a common base, and allura.css a "theme"
but that doesn't apply any more, so make things simpler.

2016-07-15 15:32:12 Tree
[ffdd75] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

Limit twemoji parsing to main body content, so ™© etc in header & footer areas don't get styled differently

2016-07-14 16:13:48 Tree
[645a05] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] fix CSS background image url, when debug=false, by setting compress=false; also JS can be later in page

2016-07-14 16:00:07 Tree
[65c8a4] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] update test for changes in [8f5f6eb]

2016-07-13 21:21:04 Tree
[9b6eec] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] further deprecate Tools link in admin menu

2016-07-06 22:41:22 Tree
[b149cb] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] insert pre-step

2016-07-11 21:15:25 Tree
[b996de] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] add tour to Admin Welcome page

2016-07-06 22:40:31 Tree
[be6b86] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] add hopscotch files (with CSS tweak to slightly different images path)

2016-07-06 22:39:50 Tree
[d73d96] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] no delayed flash message about brand new repos, its weird especially when starting a new project

2016-07-06 19:19:54 Tree
[f16b9e] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#3593] make Welcome admin page easy to get to; nicer notifications

2016-07-06 18:47:59 Tree
[f93afd] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

Fix how far lists inside comments can go; a proper fix for [#6248]

2016-07-11 20:40:49 Tree
[500754] by Rohan Verma Rohan Verma

[#8088] Fixed design issue in codemirror while editing ticket

2016-07-12 18:47:21 Tree
[7e66bf] by Rohan Verma Rohan Verma

[#8088] Fixed Test failiures due to new css meta_post class for discussions

2016-07-03 20:03:12 Tree
[e398c2] by Rohan Verma Rohan Verma

[#8088] Fixed design changes on editor

2016-07-01 07:40:22 Tree
[2c6c4f] by Rohan Verma Rohan Verma

[#8088] Update test to match new HTML

2016-06-24 15:23:57 Tree
[ef72a4] by Rohan Verma Rohan Verma

[#8088] Updated edit button style to match new design changes. minor design changes

2016-06-24 15:10:58 Tree
[02d90f] by Rohan Verma Rohan Verma

[#8088] Rebased to remove bad commit, Added tooltips to buttons

2016-06-24 14:35:37 Tree
[38fa36] by Rohan Verma Rohan Verma

[#8088] Updated style for meta_posts

2016-06-23 17:28:41 Tree
[0e4038] by Rohan Verma Rohan Verma

[#8088] Fix for images exceeding bubble

2016-06-23 14:04:38 Tree
[a72edf] by Rohan Verma Rohan Verma

[#8088] Fix failing tests due to missing closing form tag. Update a test to match new html

2016-06-21 16:58:00 Tree
[8f00f3] by Rohan Verma Rohan Verma

[#8088] test_anonymous_post updated

2016-06-16 15:52:32 Tree
[c018c5] by Rohan Verma Rohan Verma

[#8088] Added check to see if user has permission to reply

2016-06-09 18:23:54 Tree
[02dad2] by Rohan Verma Rohan Verma

[#8088] Fixed margins

2016-06-09 16:39:54 Tree
[724f82] by Rohan Verma Rohan Verma

[#8088] Fix buttons getting cut-off

2016-06-07 21:37:55 Tree
[6bd4c3] by Rohan Verma Rohan Verma

[#8088] Sleek button design

2016-06-07 21:13:22 Tree
[828aec] by Rohan Verma Rohan Verma

[#8088] fix error when deleting comments

2016-06-04 02:02:44 Tree
[d45816] by Rohan Verma Rohan Verma

[#8088] fix error on firefox

2016-06-04 01:32:16 Tree
[c0d9bb] by Rohan Verma Rohan Verma

[#8088] Visual changes to discussion tool. added a header toolbar design

2016-06-04 01:29:47 Tree
[2644d8] by Rohan Verma Rohan Verma

Added test to see if user api is working

2016-06-30 18:42:32 Tree
[4c4dd4] by Rohan Verma Rohan Verma

[#8092] Fixed rest api failing for users

2016-06-21 17:22:02 Tree
[0fd93a] by Rohan Verma Rohan Verma

Changed usage permission to read instead of write for refresh button

2016-06-30 09:02:21 Tree
[121067] by Rohan Verma Rohan Verma

Updated tests

2016-06-24 14:06:13 Tree
[b796cb] by Rohan Verma Rohan Verma

Added fontawesome fonts

2016-06-24 13:31:37 Tree
[69446b] by Rohan Verma Rohan Verma

Added refresh commits button. Changed template to show buttons in merge request buttons one row

2016-06-24 13:18:25 Tree
[6117b5] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

Speed up checking of newly forked repo (patterned after tarball, merge request pages)

2016-06-30 21:46:08 Tree
[ec5e04] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#8078] add a "meta" post when changing the status via the one-click merge button

2016-06-30 21:38:37 Tree
[372d77] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#8094] use same space for URL and error msg, to avoid page content shifting around

2016-07-01 20:19:14 Tree
[15f424] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#8094] use a login overlay on project creation form

2016-07-01 19:38:00 Tree
[726a2d] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#8094] reduce delays for suggesting and validating project names

2016-07-01 15:35:09 Tree
[8ad089] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

Add twemoji.min.js to rat-exludes.txt since it is specifically mentioned in LICENSE

2016-06-29 20:14:56 Tree
[751fbc] by Rohan Verma Rohan Verma

Update twemoji size to 36x36 for hi res screens

2016-06-24 11:49:04 Tree
[7280c0] by Rohan Verma Rohan Verma

Removed CDN for code. Updated license. Moved code to proper places

2016-06-23 16:37:44 Tree
[5dfad3] by Rohan Verma Rohan Verma

Fix emoji size according to neighbor text

2016-06-21 19:44:12 Tree
[9cf113] by rhnvrm rhnvrm

added twemoji cdn and added changes in master template

2016-03-22 17:14:44 Tree
[94fd13] by Rohan Verma Rohan Verma

[#8090] fixed formatting

2016-06-23 16:45:22 Tree
[3a7f05] by Rohan Verma Rohan Verma

[#8090] Display merge requests button in sidebar even if there are none for all forkable repos

2016-06-20 08:01:32 Tree
[478aa7] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#4644] remove all form/input tags from the list of allowed tags

2016-06-21 14:30:50 Tree
[bc9145] by Rohan Verma Rohan Verma

Fix for using authored date instead of committed date in merge requests

2016-06-10 03:31:22 Tree
[304a96] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

[#7858] change category and skill lookup to use unique id numbers rather than "shortname" which might not be unique

2016-06-02 14:53:59 Tree
[ef14c5] by Philipp Kloke Philipp Kloke , pushed by Rohan Verma Rohan Verma

Compressed PNG images losslessly using OptiPNG (-o6 -zm1-9)

2016-06-08 19:58:11 Tree
[33f00e] by Dave Brondsema Dave Brondsema , pushed by Rohan Verma Rohan Verma

Specify title for /nf/admin/new_projects page

2016-06-08 13:15:45 Tree
[1fa4a2] by Rohan Verma Rohan Verma

Updated design inline with suggestions and removed widget from codebase

2016-07-18 16:03:32 Tree
[efa2c8] by Rohan Verma Rohan Verma

Fri Jul 8 13:32:11 IST 2016

Improve design of merge requests listing filter

2016-07-12 20:20:21 Tree

Discussion

  • Rohan Verma - 2016-07-12
    • Summary: Improve --> Improve design of merge requests listing filter
     
  • Rohan Verma - 2016-07-12
    • Description:

    Diff:

    --- old
    +++ new
    @@ -1 +1,6 @@
     Improve design of merge requests listing filter
    +
    +**Before:**
    +![Before](http://i.imgur.com/ZHFxZWn.png)
    +**After:**
    +![After](http://i.imgur.com/wHXUOWF.png)
    
     
  • Dave Brondsema

    Dave Brondsema - 2016-07-15

    Since mr_filter is no longer used, it should be deleted, including the SCMMergeRequestFilterWidget class, etc. (I don't think we need it in the @validate line any more either)

    How about an option to view all?

    It'd be nice if the currently selected one was displayed differently. You can do this if you use btn-set on a div or span around them all and then each one has class btn instead of btn-set. Then add active class to the current one. vote.html has an example of this.

     
  • Rohan Verma - 2016-07-18
    • Status: open --> rejected
     
  • Rohan Verma - 2016-07-18
    • Status: rejected --> open
     
  • Rohan Verma - 2016-07-18
    • Summary: Improve design of merge requests listing filter --> Improve design of merge requests filter and add confirmation to accept reject merge requests
     
  • Rohan Verma - 2016-07-18

    Updated Look

    Also added a confirmation before accepting/rejecting merge requests.

     

    Last edit: Rohan Verma 2016-07-18
  • Dave Brondsema

    Dave Brondsema - 2016-07-19

    The CSS changes renames .nested-grid-container to .filter-container but the wiki browse page still uses nested-grid-container and needs those rules.

     
    • Rohan Verma - 2016-07-26

      I don't know why but this branch got ruined so created patches and made a new MR https://forge-allura.apache.org/p/allura/git/merge-requests/148/

       
  • Rohan Verma - 2016-07-26
    • Status: open --> rejected
     

Log in to post a comment.