summaryrefslogtreecommitdiff
path: root/app/views/users
Commit message (Collapse)AuthorAgeFilesLines
* Use briefcase icon for company32807-company-iconAnnabel Dunstone Gray2017-05-241-1/+1
|
* recenter profile page nav links32465-centerSimon Knox2017-05-181-2/+2
|
* Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-081-2/+2
|
* Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
|
* Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
|
* Note Ghost user and refer to user deletion documentationMark Fletcher2017-05-031-0/+10
| | | | + Add a partial for displaying user deletion guidance
* Append .json to ajax endpoint to prevent browser to display raw jsonAlfredo Sumaran2017-04-211-5/+5
| | | | Add CHANGELOG entry
* Merge branch 'scrollable-secondary-tabs' into 'master' Annabel Dunstone Gray2017-03-291-16/+19
|\ | | | | | | | | | | | | Fixed inner page tabs not being scrollable Closes #18853 See merge request !10204
| * Added scrolling tabs to user#showPhil Hughes2017-03-281-16/+19
| |
* | Merge branch 'calendar-tooltips' into 'master' Rémy Coutable2017-03-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Add tooltip to user's calendar activities Closes #28925 See merge request !10123
| * | Add tooltip to user's calendar activitiesalex argunov2017-03-221-2/+2
| | |
* | | Refactored the user callout classPhil Hughes2017-03-241-2/+2
| |/ |/| | | | | | | | | | | | | Instead of the JS being in charge of the HTML, the HAML now handles it. The HAML can then check the cookie & show it needed. It also allows the HAML access to the paths so we don't have to pass that through. Closes #29955
* | Add tooltip and accessibility label for profile cover buttonsKushal Pandya2017-03-231-2/+2
| |
* | Fix usercallout to only show on the current logged in user profileJose Ivan Vargas Lopez2017-03-231-1/+2
| |
* | Removed the hours & minutes from the users since date on their profilePhil Hughes2017-03-231-1/+1
| | | | | | | | Closes #28842
* | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-201-1/+1
|/ | | | | | Adds rel="noopener noreferrer" to all links with target="_blank" See merge request !2071
* create a cacheable commons bundle for d3 libraryMike Greiling2017-03-031-1/+1
|
* Show public RSS feeds to anonymous usersMichael Kozono2017-02-281-7/+6
|
* Modified the user_callout behaviourJose Ivan Vargas2017-02-231-2/+2
| | | | | Now it appends a template instead of relying in a partial to show it.
* Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-231-2/+1
| | | | | | | Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line
* Changed the javascript class from using the global scope to exporting it via ↵Jose Ivan Vargas2017-02-231-4/+1
| | | | | | webpack Also improved accesibility and change the id from user_callouts to a class
* Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-231-13/+3
| | | | | Also changed the user_callout haml to a partial and added the corresponding SVG icon
* Initial version of the user-calloutsJose Ivan Vargas2017-02-231-2/+17
|
* Merge branch '26287-link-branch-in-calendar-activity' into 'master'Rémy Coutable2017-02-141-5/+9
|\ | | | | | | | | | | | | Add Links to Branches in Calendar Activity Closes #26287 See merge request !9224
| * Add Links to Branches in Calendar ActivityJan Christophersen2017-02-141-5/+9
| |
* | Merge branch '26286-most-recent-activity-profile-header' into 'master' Annabel Dunstone Gray2017-02-141-0/+2
|\ \ | |/ |/| | | | | | | | | Add 'Most Recent Activity' header to User Profile Closes #26286 See merge request !9189
| * Add 'Most Recent Activity' header to the User Profile pageJan Christophersen2017-02-131-0/+2
| |
* | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-132-3/+5
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-272-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ...
| * HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-241-4/+4
| |
| * HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-241-1/+1
| |
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-2/+2
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-311-4/+4
|
* HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-311-1/+1
|
* Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-031-1/+1
|
* Fix haml_lint23545-distorted-imagesAnnabel Dunstone Gray2016-11-011-2/+2
|
* 23545 Fix distorted project and group avatarstauriedavis2016-11-011-1/+2
|
* Merge branch 'update-profile-view' into 'master' Annabel Dunstone Gray2016-10-061-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update profile view ## What does this MR do? Centers entire profile information section ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-03_at_4.23.03_PM](/uploads/bc2017e88cb52ec0e817c4c59e70a186/Screen_Shot_2016-10-03_at_4.23.03_PM.png) After: ![Screen_Shot_2016-10-03_at_4.21.57_PM](/uploads/86ce1339d21cc39a64c22f27868a2986/Screen_Shot_2016-10-03_at_4.21.57_PM.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/22829 cc @dzaporozhets See merge request !6662
| * add spaces and fix handle stylestauriedavis2016-10-041-2/+2
| |
* | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-061-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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