Merge branch 'jquery-mentions-input'
Showing
- app/views/people/show.html.haml 2 additions, 0 deletionsapp/views/people/show.html.haml
- app/views/status_messages/new.html.haml 4 additions, 10 deletionsapp/views/status_messages/new.html.haml
- config/assets.yml 10 additions, 0 deletionsconfig/assets.yml
- features/step_definitions/custom_web_steps.rb 3 additions, 20 deletionsfeatures/step_definitions/custom_web_steps.rb
- public/javascripts/app/views/publisher_view.js 1 addition, 2 deletionspublic/javascripts/app/views/publisher_view.js
- public/javascripts/mentions.js 26 additions, 0 deletionspublic/javascripts/mentions.js
- public/javascripts/publisher.js 25 additions, 297 deletionspublic/javascripts/publisher.js
- public/javascripts/vendor/jquery.events.input.js 132 additions, 0 deletionspublic/javascripts/vendor/jquery.events.input.js
- public/javascripts/vendor/jquery.mentionsInput.js 387 additions, 0 deletionspublic/javascripts/vendor/jquery.mentionsInput.js
- public/javascripts/vendor/underscore.js 55 additions, 37 deletionspublic/javascripts/vendor/underscore.js
- public/stylesheets/sass/application.sass 1 addition, 1 deletionpublic/stylesheets/sass/application.sass
- public/stylesheets/sass/mentions.scss 97 additions, 0 deletionspublic/stylesheets/sass/mentions.scss
- public/stylesheets/vendor/jquery.mentionsInput.css 4 additions, 0 deletionspublic/stylesheets/vendor/jquery.mentionsInput.css
- spec/javascripts/publisher-spec.js 0 additions, 255 deletionsspec/javascripts/publisher-spec.js
- spec/javascripts/support/jasmine.yml 3 additions, 1 deletionspec/javascripts/support/jasmine.yml
Loading
Please register or sign in to comment