summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-155-87/+5
* Merge branch 'filter-bug-fix' into 'master' Dmitriy Zaporozhets2016-03-151-4/+8
|\
| * Fix bug with JS error from dropdowns in filter areafilter-bug-fixJacob Schatz2016-03-141-4/+8
* | Merge branch 'group-projects-page' into 'master' Dmitriy Zaporozhets2016-03-151-0/+4
|\ \ | |/ |/|
| * Redesign project tabs on group pagegroup-projects-pageDmitriy Zaporozhets2016-03-141-0/+4
* | Fixes issue with unassigned not working in dropdownzero-dropdown-idPhil Hughes2016-03-141-1/+1
* | Merge branch 'nav-over-content-mobile' into 'master' Jacob Schatz2016-03-145-43/+66
|\ \ | |/ |/|
| * Removed call to setup from breakpoint size methodnav-over-content-mobilePhil Hughes2016-03-141-5/+5
| * Changed breakpoint sizePhil Hughes2016-03-145-28/+34
| * removed un-used function callPhil Hughes2016-03-141-3/+3
| * Created bootstrap breakpoint classPhil Hughes2016-03-145-37/+41
| * changed jquery document readyPhil Hughes2016-03-141-1/+1
| * Removed deprecated bootstrap variablesPhil Hughes2016-03-141-2/+2
| * Left sidebar overlaps the content on mobile devicesPhil Hughes2016-03-143-11/+24
* | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-0/+2
|\ \
| * | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+2
* | | Fixed tests for MR & issue filtersissue-filter-testsPhil Hughes2016-03-141-1/+3
| |/ |/|
* | Merge branch 'fix_responsive_layout_bug' into 'master' Jacob Schatz2016-03-111-1/+1
|\ \
| * | Fix responsive bug top navigationDennis van de Hoef2016-03-111-1/+1
* | | Merge branch 'group-activity-separate-tab' into 'master' Robert Speicher2016-03-111-1/+2
|\ \ \
| * | | Move group activity feed to separate page for consistency with dashboard and ...Dmitriy Zaporozhets2016-03-101-1/+2
* | | | Merge branch 'search-results-filter-dropdown' into 'master' Jacob Schatz2016-03-111-1/+1
|\ \ \ \
| * | | | Increased dropdown max heightPhil Hughes2016-03-111-1/+1
| | |/ / | |/| |
* | | | Merge branch 'award-emoji-design-update' into 'master' Jacob Schatz2016-03-114-126/+172
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added 'surprise' animationaward-emoji-design-updatePhil Hughes2016-03-112-9/+34
| * | | Fixed bug with emoji search stylingPhil Hughes2016-03-111-2/+2
| * | | CoffeeScript style improv.Phil Hughes2016-03-111-2/+3
| * | | Award emoji button paddingPhil Hughes2016-03-111-0/+2
| * | | Renamed variables & removed some for award emojiPhil Hughes2016-03-112-10/+6
| * | | Moved method calls to separate linesPhil Hughes2016-03-111-6/+11
| * | | Moved SCSS values into variablesPhil Hughes2016-03-113-11/+28
| * | | Updated award emoji testsPhil Hughes2016-03-111-1/+1
| * | | Updated UI of award emojiPhil Hughes2016-03-113-115/+115
| |/ /
* | | Merge branch 'fix-issue-toggle-button-mobile' into 'master' Jacob Schatz2016-03-112-6/+5
|\ \ \
| * | | Fixes issue with issue sidebar toggle button not workingPhil Hughes2016-03-102-6/+5
* | | | Merge branch 'account-settings' into 'master' Jacob Schatz2016-03-114-13/+58
|\ \ \ \
| * | | | Used standard variable coloursaccount-settingsPhil Hughes2016-03-112-14/+4
| * | | | Fixed heading weight issuePhil Hughes2016-03-112-5/+17
| * | | | Account settingsPhil Hughes2016-03-114-10/+53
| | |/ / | |/| |
* | | | Merge branch 'comment-discard-button' into 'master' Jacob Schatz2016-03-111-11/+55
|\ \ \ \
| * | | | Correctly uses a variable with the textcomment-discard-buttonPhil Hughes2016-03-111-1/+1
| * | | | Fixed tests for comment formsPhil Hughes2016-03-041-0/+5
| * | | | Added discard button to comment formPhil Hughes2016-03-041-11/+50
* | | | | Merge branch 'comment-error' into 'master' Dmitriy Zaporozhets2016-03-111-0/+7
|\ \ \ \ \
| * | | | | Add error for ajax:error when submitting commentsJacob Schatz2016-03-101-0/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'build-scroll-controls-position' into 'master' Jacob Schatz2016-03-112-4/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed missing variablesPhil Hughes2016-03-111-2/+2
| * | | | Changed variable namesbuild-scroll-controls-positionPhil Hughes2016-03-101-3/+3
| * | | | Removed CiBuild in favour of already available CiBuild classPhil Hughes2016-03-103-16/+13
| * | | | Affix the build scroll controlsPhil Hughes2016-03-073-4/+35
View Lorry Controller Status