summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'note-role' into 'master'Dmitriy Zaporozhets2015-05-122-9/+28
|\
| * Show user roles by comments.Douwe Maan2015-05-122-9/+28
* | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-128-235/+330
|\ \
| * | Refactor SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-6/+13
| * | Check if `system` is truthy in `Note.cross_reference?`Robert Speicher2015-05-111-1/+1
| * | Update SystemNoteService method naming conventionsRobert Speicher2015-05-116-77/+73
| * | Remove legacy special case for emphasized reference notesRobert Speicher2015-05-111-13/+9
| * | Add a SystemNoteService classRobert Speicher2015-05-118-218/+320
| * | Simplify `Note#upvote?` and `Note#downvote?`Robert Speicher2015-05-101-17/+11
* | | Merge branch 'project-page' into 'master'Dmitriy Zaporozhets2015-05-128-81/+94
|\ \ \
| * | | Move "Forked from" above "Version".project-pageDouwe Maan2015-05-121-8/+9
| * | | Move clone panel to bottom of project sidebar.Douwe Maan2015-05-121-3/+3
| * | | Restructure project sidebar.Douwe Maan2015-05-122-65/+81
| * | | Fix alignment of ref picker, breadcrumb and buttons.Douwe Maan2015-05-124-14/+3
| * | | Add icons to more tabs.Douwe Maan2015-05-122-1/+8
| | |/ | |/|
* | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-1212-8/+222
|\ \ \ | |/ / |/| |
| * | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-111-0/+21
| * | Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
| * | Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
| * | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-2/+7
| * | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-091-2/+8
| * | Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-092-4/+1
| * | Autofocus the pin field on 2FA enable formRobert Speicher2015-05-091-1/+1
| * | Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-091-1/+1
| * | Fix 2FA backup code removalRobert Speicher2015-05-091-0/+3
| * | Quotes, icon helper in profiles/accounts/show viewRobert Speicher2015-05-091-5/+5
| * | Re-annotate User modelRobert Speicher2015-05-091-0/+5
| * | Add a hint on login form about using a recovery codeRobert Speicher2015-05-091-0/+1
| * | Improve copy for enabling 2FARobert Speicher2015-05-092-4/+5
| * | Update copy for generating new recovery codesRobert Speicher2015-05-091-4/+4
| * | Refactor SessionsControllerRobert Speicher2015-05-092-23/+25
| * | Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-092-2/+2
| * | Add page titles for two_factor_auths viewsRobert Speicher2015-05-093-0/+6
| * | Make two-factor login work and add a feature specRobert Speicher2015-05-091-7/+24
| * | Update User model for two-factor authRobert Speicher2015-05-091-2/+10
| * | Update login views for two-factor authRobert Speicher2015-05-092-6/+2
| * | Fix Devise parameter sanitizer for otp_attemptRobert Speicher2015-05-091-1/+1
| * | Don't use hard-coded sign_in pathRobert Speicher2015-05-091-1/+1
| * | prepend_before_filter -> prepend_before_actionRobert Speicher2015-05-091-1/+1
| * | Be consistent with what we call the 2FA featureRobert Speicher2015-05-094-11/+13
| * | Update copy for recovery codesRobert Speicher2015-05-091-5/+4
| * | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-095-11/+27
| * | Add support for backup codesDmitriy Zaporozhets2015-05-093-13/+31
| * | Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap u...Dmitriy Zaporozhets2015-05-095-18/+59
| * | Fix rubocop complainDmitriy Zaporozhets2015-05-092-2/+1
| * | Make 2 factor authentication workDmitriy Zaporozhets2015-05-093-9/+37
| * | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-093-0/+47
| * | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-092-2/+6
* | | Merge branch 'commit_time_timezone' into 'master'Douwe Maan2015-05-121-1/+1
|\ \ \
| * | | Fix commit time being displayed in the wrong timezone in some casesHannes Rosenögger2015-05-071-1/+1
View Lorry Controller Status