summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Write to InfluxDB directly via UDPYorick Peterse2015-12-291-4/+6
* Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-292-1/+23
|\
| * reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-282-1/+23
* | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-291-1/+1
|\ \ | |/ |/|
| * Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-281-1/+1
* | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-281-0/+53
|/
* Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-281-8/+0
|\
| * Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-271-8/+0
* | Make sign-up form retain fields after failed CAPTCHA testStan Hu2015-12-271-4/+5
* | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-271-0/+3
|/
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-9/+4
|\
| * resolves conflicts with new buttonsJacob Schatz2015-12-2323-123/+148
| |\
| * | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-211-2/+2
| * | open and close issue via ajax request. With testsJacob Schatz2015-12-211-9/+4
* | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-1/+1
|\ \ \
| * | | add sorting of awardsValery Sizov2015-12-251-1/+1
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-255-8/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| * | | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| * | | Add og:site_nameDouwe Maan2015-12-251-2/+2
| * | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-243-4/+7
| * | | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| * | | Add page descriptions and imagesRobert Speicher2015-12-235-9/+20
| * | | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
| | |/ | |/|
* | | Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+12
* | | Grace period support for TFAGabriel Mazetto2015-12-241-0/+1
* | | Enable "Add key" button when user fills in a proper keyStan Hu2015-12-241-1/+1
* | | Merge branch 'fix-explore-ui' into 'master' Dmitriy Zaporozhets2015-12-243-3/+3
|\ \ \
| * | | Fix explore projects page UIfix-explore-uiDmitriy Zaporozhets2015-12-243-3/+3
* | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-244-17/+44
|\ \ \ \
| * | | | Moves star code to a classJacob Schatz2015-12-232-35/+3
| * | | | fixes failing test by updating project clone instructionsJacob Schatz2015-12-231-4/+4
| * | | | Merge branch 'master' into new-project-header-redesignJacob Schatz2015-12-238-31/+30
| |\ \ \ \
| * | | | | refactoring javascript to put starring functionality in a functionJacob Schatz2015-12-231-19/+24
| * | | | | spacing changed from 4 to 2 in ` _clone_panel.html.haml`.Jacob Schatz2015-12-231-21/+21
| * | | | | spinach tests will pass nowJacob Schatz2015-12-231-1/+1
| * | | | | dropdown chooses right defaultJacob Schatz2015-12-231-4/+5
| * | | | | adds dropdown for cloningJacob Schatz2015-12-232-13/+40
| * | | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-2/+17
| * | | | | arrows for buttonsJacob Schatz2015-12-233-1/+12
* | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-2414-65/+126
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-2413-59/+122
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into edit-on-forkDouwe Maan2015-12-182-47/+52
| | |\ \ \ \ \
| | * | | | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-182-3/+3
| | * | | | | | Satisfy RubocopDouwe Maan2015-12-182-2/+2
| | * | | | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-1812-47/+113
| * | | | | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-241-6/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-189-112/+117
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-171-6/+4
| | * | | | | | | | Remove the hint on the branch name inputDouglas Barbosa Alexandre2015-12-161-1/+0