summaryrefslogtreecommitdiff
path: root/app/views/profiles
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-fix-time-ago-tooltip-chat-names' into 'master' Kamil Trzciński2016-12-011-1/+1
* Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-183-0/+72
* implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-21/+28
* Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-15/+20
* Remove changelog item and interpolationblackst0ne2016-10-141-1/+1
* Remove '/u' prefix form username from Account pageblackst0ne2016-10-141-2/+2
* Merge branch '22343-honor-user-fixed-layout-pref' into 'master' Fatih Acet2016-10-041-2/+2
|\
| * ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-201-2/+2
* | Add organization field to user profileDmitriy Zaporozhets2016-09-271-0/+3
|/
* Fix spelling: sucessfully -> successfullyStan Hu2016-09-151-1/+1
* Restore SSH Key title auto-population behaviorRobert Speicher2016-09-131-0/+1
* Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-0/+4
|\
| * Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-171-2/+2
| * Added better information about the personal tokensPatricio Cano2016-08-161-1/+1
| * Deny Git over HTTP access to users that have 2FA enabled, unless they use a P...Patricio Cano2016-08-161-0/+4
* | Allow naming U2F devices.Timothy Andrew2016-08-181-3/+28
|/
* Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-031-1/+1
* Add an oauth provider path helper.Connor Shea2016-08-031-1/+1
* Merge branch 'rename-js-files' into 'master' Fatih Acet2016-07-201-1/+1
|\
| * Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-151-1/+1
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-151-0/+4
|\ \ | |/ |/|
| * Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-141-2/+2
| * Load Javascript U2F library selectively.Timothy Andrew2016-07-141-0/+4
* | Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-113-4/+4
* | Add reminder to not paste private SSH keysIngo Blechschmidt2016-07-091-1/+1
|/
* Fix preferences tests.cs-cropperConnor Shea2016-06-3010-3/+12
* Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-291-0/+4
* Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-211-1/+1
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-173-9/+10
|\
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-174-3/+108
| |\
| * | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-173-7/+7
| * | Fixed alignment of notification dropdown menuPhil Hughes2016-06-171-1/+1
| * | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-173-9/+10
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-163-9/+7
* | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-3/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-3/+7
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-161-3/+3
|\ \ \ | | |/ | |/|
| * | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha...Timothy Andrew2016-06-151-3/+3
| |/
* | Implement @DouweM's feedback.Timothy Andrew2016-06-161-12/+3
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-143-29/+3
|\ \ | |/
| * Remove notification level from user modelFelipe Artur2016-06-103-29/+3
* | Implement second round of comments from @jschatz1.Timothy Andrew2016-06-101-5/+6
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-093-51/+82
|\ \ | |/
| * Implement U2F registration.Timothy Andrew2016-06-063-51/+82
* | Implement @jschatz1's comments.Timothy Andrew2016-06-091-16/+33
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-032-3/+3
|\ \ | |/
| * Merge branch 'fix-grammar-issues' into 'master' Jacob Schatz2016-05-251-1/+1
| |\
| | * Resolve some issues Jacob brought up.Connor Shea2016-05-241-3/+3
| | * Fix grammar and wording in text on various pages.Connor Shea2016-05-221-3/+3
| * | Project settings UI updatePhil Hughes2016-05-201-2/+2
| |/
View Lorry Controller Status