summaryrefslogtreecommitdiff
path: root/app/views/users
Commit message (Collapse)AuthorAgeFilesLines
* Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'shrink-profile-info' into 'master' Fatih Acet2016-09-211-47/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shrink profile info ## What does this MR do? Updates design of profile page to match comps ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_11.34.21_AM](/uploads/5c2f510e6cc64bf466309db8ec02b9e0/Screen_Shot_2016-09-16_at_11.34.21_AM.png) ![Screen_Shot_2016-09-16_at_11.35.20_AM](/uploads/ebd3471965340fce5a897dcfc1a5385c/Screen_Shot_2016-09-16_at_11.35.20_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18071 See merge request !6394
| * clean up profileshrink-profile-infotauriedavis2016-09-161-47/+45
| |
| * shrink profile infotauriedavis2016-09-161-32/+34
| |
* | Replace contributions calendar timezone payload with datesClement Ho2016-09-161-2/+2
|/
* turned ES5 users.js to ES6 users.js.es6 for babelRegis2016-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | added semicolons remove users.js rename users to user in filename removed uneeded semi-colons and returning null in constructor class is wrapped - a lot of builds will fail formatting replaced 'new User' with 'new gl.User' in app/users/show.html.haml window.gl || window.gl = {} - seeing if rspec9/spinach6/spinach9 will pass putting window logic before IIFE Fixed typo in users show view - extracted jquery calls in constructor to prototype methods fixed window declaration in IIFE argument adding new line
* Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-1/+1
|
* Removed unnecessary `id` from links and corrected tests to use the proper ↵9127-link-report-to-profilePatricio Cano2016-07-071-1/+1
| | | | matcher.
* Added specs to check for the correct links.Patricio Cano2016-07-061-1/+1
|
* Link to the user's profile in the abuse reports and add a link to the admin ↵Patricio Cano2016-07-061-0/+5
| | | | area view if the user viewing the profile is an admin
* Changes calendar activities to use target referencecal-activities-target-referencePhil Hughes2016-06-291-1/+1
|
* Trying to make this work with sprockets in production.Connor Shea2016-06-231-2/+2
|
* Reorganize the lib directory.Connor Shea2016-06-231-1/+1
|
* Re-implement page-specific JS in a better way.Connor Shea2016-06-231-1/+3
| | | | This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
* Add tests for dates on tooltipsAlfredo Sumaran2016-06-091-2/+2
|
* Attempt to fix the user page.Connor Shea2016-06-011-0/+1
|
* Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-253-33/+35
|\ | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| * Fixed issue with selected date not loading correctlyPhil Hughes2016-05-161-19/+23
| | | | | | | | Added loading icon to selected date box
| * Group the contributing calendar by dayPhil Hughes2016-05-162-12/+12
| | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar
| * Updated contrib map away from cal heat mapPhil Hughes2016-05-161-2/+0
| |
* | Remove `event_to_atom` helperRobert Speicher2016-05-231-3/+1
|/
* Routing refactoringLong Nguyen2016-05-082-7/+7
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-081-1/+1
|\ | | | | | | issue_15572_snippets_tab_under_user_profile
| * Start builds redesignAnnabel Dunstone2016-05-041-1/+1
| |
* | user routings refactorLong Nguyen2016-05-082-7/+7
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-051-4/+4
|\ \ | |/ | | | | issue_15572_snippets_tab_under_user_profile
| * Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
| | * Remove unused .contributed-projects classKarlo Soriano2016-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
| * | Add JS prefix to user tab classesKarlo Soriano2016-04-261-3/+3
| |/ | | | | | | | | | | I'm not entirely sure if this project uses the `js-` prefix for classes that are for js purposes only. But as I was working on a feature, I noticed that these classes were those kind of classes.
* | Add snippet tab under user profileLong Nguyen2016-05-021-0/+6
|/
* Removed aside toggle on profile pagesprofile-aside-togglePhil Hughes2016-04-181-2/+0
| | | | Closes #13943
* Add a missing Oxford comma in some text on the Activity graph.connorshea2016-04-081-1/+1
| | | | Resolves #14668. [ci skip]
* hide user profile activity graph on mobile and enable horizontal scroll for ↵hide_profile_activity_on_mobileArinde Eniola2016-04-011-1/+1
| | | | medium screens
* Provide defaults and make sure we everything is container into a parent elementAlfredo Sumaran2016-03-021-96/+97
|
* Add required classname for specAlfredo Sumaran2016-03-011-1/+1
|
* Rename attribute from url to href for consistencyAlfredo Sumaran2016-03-011-1/+1
|
* Specify path to be used for @Page to load user activityAlfredo Sumaran2016-03-011-2/+2
|
* Make url and actions to be the same nameAlfredo Sumaran2016-03-011-3/+3
|
* Activate tab according URLAlfredo Sumaran2016-03-011-7/+7
|
* Initialize User class on the viewAlfredo Sumaran2016-03-011-0/+7
|
* Let User class handle resource loadingAlfredo Sumaran2016-02-291-4/+1
|
* Tidy htmlAlfredo Sumaran2016-02-291-30/+18
|
* Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-32/+32
|
* Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improveconnorshea2016-02-231-12/+14
| | | | | | | | | | | - Separates the User page bio from the username and account creation date. - Separates the pseudo-selector adding a Middle Dot out from the `profile-link-holder` class and into a `middle-dot-divider` class. Resolves #13406. See merge request !2827.
* Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-271-1/+1
| | | | | | | | | By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415
* sanitize user supplied input.Josh Frye2016-01-161-24/+1
|
* Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-161-0/+23
|
* Fix missing padding for user/group pagesDmitriy Zaporozhets2016-01-141-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Apply new layout to user pageDmitriy Zaporozhets2016-01-131-62/+65
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-131-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status