summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* updatepr-page-fix1Andriy Dyadyura2016-01-1439-958/+179
|\
| * Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-149-82/+60
| |\
| | * Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-149-82/+60
| * | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
| |\ \
| | * | fixes bug with commenting on merge requestsclosing-mr-bug-fixJacob Schatz2016-01-132-6/+11
| * | | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-1429-284/+113
| |\ \ \ | | | |/ | | |/|
| | * | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-146-11/+20
| | * | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-143-2/+12
| | * | Use closest instead of parent()Dmitriy Zaporozhets2016-01-131-1/+1
| | * | Dont use nav-pills. Instead use nav-listsDmitriy Zaporozhets2016-01-132-12/+2
| | * | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-135-72/+2
| | * | Add top margin for page titleDmitriy Zaporozhets2016-01-131-1/+1
| | * | Apply new layout to user pageDmitriy Zaporozhets2016-01-131-0/+1
| | * | Allign md header componentsDmitriy Zaporozhets2016-01-132-8/+1
| | * | Increase detail-page-header padding to match height with nav-linkDmitriy Zaporozhets2016-01-131-1/+1
| | * | Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-139-20/+21
| | * | Start moving all navigation to one classDmitriy Zaporozhets2016-01-136-135/+39
| | * | New layout without background colorDmitriy Zaporozhets2016-01-1313-33/+24
| | |/
| * | Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-146-2/+17
| |\ \
| | * | Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weightRémy Coutable2016-01-146-2/+17
| | |/
| * | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-0/+6
| |\ \
| | * | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-141-0/+3
| | * | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-0/+3
* | | | buttons updatepr-page-fixAndriy Dyadyura2016-01-141-2/+9
* | | | buttons updateproject-button-fixAndriy Dyadyura2016-01-141-1/+1
|/ / /
* | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
* | | Move broadcast message form to a partialRobert Speicher2016-01-131-2/+1
* | | Style the broadcast message formRobert Speicher2016-01-131-0/+4
| |/ |/|
* | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-133-1/+11
|\ \
| * | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| * | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-121-1/+5
| * | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-122-0/+6
* | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-133-15/+33
|\ \ \ | |/ / |/| |
| * | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-122-2/+22
| * | adds back in discussion.haml.html for issues commenting and closing/reopening...Jacob Schatz2016-01-121-0/+2
| * | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-121-3/+2
| * | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| * | fixes conflictsJacob Schatz2016-01-1158-234/+449
| |\ \
| * | | initial json requests instead of HTMLJacob Schatz2016-01-072-2/+9
| * | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-051-0/+43
| * | | removes commented out code.Jacob Schatz2015-12-301-2/+0
| * | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-292-15/+13
* | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \ \
| * | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
| | |/ / | |/| |
* | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / /
* | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
|\ \ \
| * | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
* | | | Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-112-102/+101
|\ \ \ \
| * | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-082-102/+101
| |/ / /
* | | | Only load autocomplete data when actually neededYorick Peterse2016-01-111-9/+10
View Lorry Controller Status