diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-24 17:02:34 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-24 17:02:34 +0400 |
| commit | 8ec956421c5e94bc2a51e30414d85417c10404b8 (patch) | |
| tree | 088334f30fc5bda379b95d24392dda5d4db797c3 /app/assets | |
| parent | 6667f3dbf920d9bcf0e6f3218d27c92811f74224 (diff) | |
| parent | 9c75fcbef16e68dd3898545fc5d11b1261de1a26 (diff) | |
Merge pull request #1539 from NARKOZ/front-end
auto-complete for mentions in notes
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f9fdb0f7dc2..02ef6caba38 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,7 @@ //= require jquery.endless-scroll //= require jquery.highlight //= require jquery.waitforimages +//= require jquery.atwho //= require bootstrap //= require modernizr //= require chosen-jquery diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 92d542a9866..424ba71f7cb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -4,6 +4,7 @@ * the top of the compiled file, but it's generally better to create a new file per style scope. *= require jquery.ui.all *= require jquery.ui.aristo + *= require jquery.atwho *= require chosen *= require_self *= require main |