Commit Graph

7416 Commits

Author SHA1 Message Date
Régis Hanol 060cda7772 FIX: proper handling of group memberships 2015-01-05 18:51:45 +01:00
Neil Lalonde 4975fc2890 Remove old access_password_removal cruft from 1.5 years ago 2015-01-05 12:04:27 -05:00
Neil Lalonde 024b88e9c2 FIX: dashboard should be warning about invalid notification_email site setting 2015-01-05 12:04:27 -05:00
Sam fce74e64a1 correct missing new/unread badges 2015-01-05 19:31:29 +11:00
Sam e97aa3f544 fix params that are send to category route 2015-01-05 18:34:06 +11:00
Sam 9c250444ff regression, navigating to category leaves phantom columns 2015-01-05 18:18:50 +11:00
Sam 222964b27b add perf note 2015-01-05 17:54:38 +11:00
Sam 0396fd66f6 FEATURE: sorting by op likes shows the op likes count 2015-01-05 17:39:49 +11:00
Sam ea2f892f4b FEATURE: show likes column if sorting by likes 2015-01-05 17:09:17 +11:00
Sam d0d2a15180 Support likes column via site extension 2015-01-05 17:03:48 +11:00
Sam 69771562d7 clean up rendering and correct issues with topic list to raw commit 2015-01-05 16:37:25 +11:00
Sam fa9bbd554e PERF: unify topic lists, remove star from lists, move to raw rendering 2015-01-05 13:04:15 +11:00
Sam 29acbfb611 improve probing diag tool, add a clear button 2015-01-05 12:00:55 +11:00
Sam 9aba6ab265 Merge branch 'master' of github.com:discourse/discourse 2015-01-05 09:01:54 +11:00
Robin Ward 1e441522c0 Don't use a string buffer to refactor loading outlet 2015-01-02 16:35:56 -05:00
Robin Ward 030bab92a2 Small optimization: remove a template with an `{{if}}` 2015-01-02 16:29:08 -05:00
Robin Ward 5beac44731 If transmitting an empty array, mark it as such 2015-01-02 16:12:06 -05:00
Robin Ward 6f72f265cb A trigger when a topic is updated, adds a couple of custom field tests 2015-01-02 15:57:08 -05:00
Neil Lalonde 4c166942ad FEATURE: Invite admin api has an optional param send_email which can prevent sending an email to the invited user. The api will return the password reset url so that the caller can send an email with it instead. 2015-01-02 15:48:54 -05:00
Robin Ward 7182767349 Refactor topic title/category saving to support easier changing of
attributes via plugins.
2015-01-02 14:25:41 -05:00
Robin Ward 9523b26af2 Move emoji autocomplete into its own file, remove ceremony around
decorating the `ComposerView` for it since it's part of core now.
2015-01-02 11:57:48 -05:00
Robin Ward 701d896912 FIX: Link domains were not showing up in the topic map 2015-01-02 10:46:04 -05:00
Régis Hanol 853e2ee535 FIX: rss link in category pages 2015-01-02 13:06:57 +01:00
Régis Hanol c57a1b393f clean up 'checked_for_custom_avatars' user history entries 2015-01-02 12:37:17 +01:00
Régis Hanol 9fcaf090ec Merge pull request #3068 from fantasticfears/category_slug
support setting category slug
2015-01-02 11:55:27 +01:00
Arpit Jalan bfe95966b4 better filenames for export 2015-01-02 15:30:50 +05:30
Arpit Jalan bae432b255 FIX: show only staff actions in export and hide site setting logs from moderators 2015-01-02 11:13:25 +05:30
Sam faa583cd95 No need for heat mapped numbers in the topic info panel 2015-01-02 11:34:05 +11:00
Sam 049ae70f94 FEATURE: maximize button for customization css/html editor 2015-01-02 11:25:15 +11:00
Sam 9744802be9 FIX: category not hidden correctly 2015-01-02 09:54:54 +11:00
Jeff Atwood a39831cdb1 tighten up mobile header margin 2015-01-01 01:42:50 -08:00
Jeff Atwood 911f941da5 some CSS fixes for mobile sites with text titles 2015-01-01 00:54:53 -08:00
Robin Ward 35edfb5b91 FIX: Don't truncate groups. @ZogStrIP we need to create a better fix for
this in the new year.
2014-12-31 12:58:50 -05:00
Robin Ward 3d42c2d515 Merge pull request #3070 from techAPJ/patch-3
FIX: rate limit user posts export
2014-12-31 11:37:11 -05:00
Jeff Atwood 0ef30ae43c fix weird font size on admin, customize, color 2014-12-30 23:51:32 -08:00
Sam 7ff96241a2 automatically register dom templates 2014-12-31 13:29:14 +11:00
Sam f0ca6150d8 refactor topic list header to use a raw template 2014-12-31 12:32:43 +11:00
Sam 3f0a4b9e52 FEATURE: default string buffer will use a raw template 2014-12-31 12:31:45 +11:00
Sam 7707803201 helper should retain context 2014-12-31 12:30:48 +11:00
Sam 8524a9d94b FEATURE: raw helper has access to parent and options view object 2014-12-31 12:30:14 +11:00
Sam 43c3e6b47f FIX: multisite CDN support for site customizations 2014-12-31 09:12:35 +11:00
Robin Ward 0e0d8e79df For plugin outlets, automatically assign the unique name as a class to
the connector.
2014-12-30 17:08:39 -05:00
Robin Ward 57b89a2c7f Plugin stuff:
* Allow plugins to work with only autoloaded assets.
* Give a plugin outlet a class name based on its name if no view class
* Give the `topic-title` outlet a default class of `clear: both`
2014-12-30 16:29:28 -05:00
Robin Ward a33461d1c7 Temp fix: Don't use CDN for customizations 2014-12-30 14:54:50 -05:00
Arpit Jalan 78537aad39 FIX: rate limit user posts export 2014-12-31 00:54:23 +05:30
Robin Ward 7b9768aa7f FIX: jsHint fail 2014-12-30 13:18:25 -05:00
Robin Ward 2681717a87 FIX: Keep topic list items on screen when using keyboard. 2014-12-30 12:50:58 -05:00
Robin Ward 47d821cd31 FIX: We should only intercept enter as a keypress when a selector
matches it.
2014-12-30 12:05:52 -05:00
Robin Ward 09bc319fd4 Merge pull request #3071 from fantasticfears/visits-again
FIX: use utc time when generate reports; set boundary
2014-12-30 10:06:30 -05:00
Erick Guan 97b3914b70 FIX: use utc time when generate reports; set boundary 2014-12-30 22:43:03 +08:00
Sam d0fe1725c8 FIX: users should be allowed to add @ to the to field of a PM 2014-12-30 13:26:39 +11:00
Sam 8cfd14120c allow forcing of name if needed 2014-12-30 11:07:16 +11:00
Régis Hanol 7bcecb54fd FEATURE: remember last emoji group used 2014-12-29 23:04:37 +01:00
Régis Hanol 386b0a2587 fix the build 2014-12-29 22:36:25 +01:00
Robin Ward 13bf8e1e46 FIX: Markdown bug when a heading preceeded a code block. 2014-12-29 15:59:39 -05:00
Régis Hanol 25e5031fb1 FIX: site setting search 2014-12-29 21:56:33 +01:00
Régis Hanol a04f44d65a Merge pull request #3065 from fantasticfears/fix-visits-report
FIX: today visits not shown
2014-12-29 21:23:47 +01:00
Robin Ward f7955406cc As an optimization, don't return suspended users in the query that
determines who to send digests to.
2014-12-29 15:16:29 -05:00
Robin Ward 1b7450b5ae Merge pull request #3069 from techAPJ/patch-3
FIX: deleted topics were failing user posts archive download
2014-12-29 15:14:50 -05:00
Arpit Jalan e7bfbe8552 FIX: deleted topics were failing user posts archive download 2014-12-30 01:42:36 +05:30
Robin Ward 6df00df1ae FIX: Some query params were showing up as `undefined` 2014-12-29 14:51:04 -05:00
Erick Guan 1e166d89ff support setting category slug 2014-12-30 03:14:54 +08:00
Robin Ward fb33576671 Merge pull request #3067 from techAPJ/patch-3
FEATURE: add more details in user posts archive
2014-12-29 14:09:27 -05:00
Erick Guan fe7f2c6979 FIX: today visits not shown 2014-12-30 03:09:22 +08:00
Arpit Jalan 96608e0ef0 FEATURE: add more details in user posts archive 2014-12-30 00:00:26 +05:30
Robin Ward 07b8dc4eca FIX: Clicking on pin/unpin would refresh the page 2014-12-29 12:29:50 -05:00
Régis Hanol 0ce93f3b29 FIX: use prefixes for CSS transform 2014-12-29 18:08:56 +01:00
Régis Hanol 7ca092da17 Merge pull request #3057 from jaanus/s3-frankfurt-bucket
Add eu-central-1 to list of S3 buckets.
2014-12-29 18:02:14 +01:00
Régis Hanol 432413d3da FEATURE: 🍬 cool transition when expanding lightbox 2014-12-29 18:00:18 +01:00
jaanus f6026ad1d0 Added eu-central-1 S3 bucket. 2014-12-29 18:31:21 +02:00
Régis Hanol a115b4b7f0 FIX: hide emoji toolbar button when emoji are disabled 2014-12-29 17:29:04 +01:00
Robin Ward 1055fc0919 Merge pull request #3021 from jmay/custom-category-slug
optional custom value for category slug (create and update)
2014-12-29 10:34:23 -05:00
Régis Hanol 267de04e2d Merge pull request #3061 from techAPJ/patch-1
Rename CsvExportLog to UserExport
2014-12-29 12:39:53 +01:00
Régis Hanol 97c1de2040 Merge pull request #3064 from fantasticfears/fix-user-card-number
FIX: user card can't expand when the username is number
2014-12-29 12:39:00 +01:00
Erick Guan 489feac121 FIX: user card can't expand when the username is number 2014-12-29 19:15:58 +08:00
Régis Hanol bfbc49ef6f FIX: log only 1 'show email' record 2014-12-29 11:50:36 +01:00
Sam b48f04e772 possible regression fix 2014-12-29 16:32:31 +11:00
Sam a6fbf7d86b PERF: improve rendering speed of topic header
This also ensures we have a clean point to override rendering of topic list header
in case we decide to add/remove columns, you no longer need to override the
entire discovery template, only the header and item templates.
2014-12-29 16:27:41 +11:00
Arpit Jalan 68e66f3a25 Rename CsvExportLog to UserExport 2014-12-28 22:31:12 +05:30
Régis Hanol 8edf2afb83 FIX: proper redirection when deleting a user 2014-12-25 18:25:07 +01:00
Régis Hanol b65ac132b7 FIX: 1.9 regression on i18n strings with variables 2014-12-25 18:04:23 +01:00
Régis Hanol 9932bea7ce FEATURE: default emoji override 2014-12-25 17:58:15 +01:00
Jeff Atwood 92d61755b3 clean up CSS3 animations a bit 2014-12-25 02:29:39 -08:00
Jeff Atwood 2a46418284 add back in @-webkit-keyframes 2014-12-25 02:19:06 -08:00
Jeff Atwood 8b3babdbde add back in a few -webkit- css3 prefixes
due to http://shouldiprefix.com/ and iOS mainly!
2014-12-25 01:41:44 -08:00
Jeff Atwood a82fda0a50 who the hell puts a } in front of a SASS line? 2014-12-25 01:14:20 -08:00
Jeff Atwood b91f9f4142 remove a bunch of needless css prefixes 2014-12-25 01:05:45 -08:00
Jeff Atwood 3b945920d4 copy improvements on data export 2014-12-24 15:41:21 -08:00
Robin Ward 26129e95dc Merge pull request #3051 from RauchF/api_absolute_days
Added absolute dates to user list serializer
2014-12-24 11:32:31 -05:00
Arpit Jalan 7c7474aa10 create a new table to maintain csv export log 2014-12-24 16:25:36 +05:30
Arpit Jalan bb152a5b3f FEATURE: download user posts archive 2014-12-24 15:13:48 +05:30
Jeff Atwood cd3703e441 remove image opengraph tags 2014-12-24 00:30:55 -08:00
Jeff Atwood 3bad0e3a33 fix touch device link sharing in Firefox 2014-12-24 00:11:43 -08:00
Jeff Atwood 1e29f6cbe9 stop rendering spinner in composer for now 2014-12-23 23:44:21 -08:00
Jeff Atwood b69832cf66 make expansion quote titles unselectable 2014-12-23 23:23:47 -08:00
Jeff Atwood e122e52fb8 kill some -webkit-transition CSS 2014-12-23 23:18:57 -08:00
Jeff Atwood 576861505e just use plain CSS3 transition 2014-12-23 03:09:17 -08:00
Jeff Atwood 0b0e9be22f standardize on @transition mixin 2014-12-23 02:52:20 -08:00
Jeff Atwood e41ae020fa add back ade-soft CSS transition on post actions 2014-12-23 02:16:57 -08:00
Sam e23e008682 FIX: buggy unhoisting of escaped \* 2014-12-23 18:25:10 +11:00
Sam e959e7c9df FIX: no way to remove site text 2014-12-23 13:15:54 +11:00
Sam f6f50ffc72 correct live reload code 2014-12-23 13:03:48 +11:00
Sam 5b844f5320 FEATURE: more than 1 site customization can be enabled at once
FIX: more robust site customizations

Rewrote site customization to use distributed cache and a much cleaner
css delivery mechanism
2014-12-23 13:03:48 +11:00
Sam ba68eee20b FIX: stable ordering for site customisations 2014-12-23 13:03:48 +11:00
Sam f23eb475a4 FEATURE: remove override stylesheet option, too confusing 2014-12-23 13:03:48 +11:00
Régis Hanol 23aede6eb5 FIX: use cache to store custom emoji 2014-12-23 01:55:13 +01:00
Régis Hanol 45dbdb6896 FEATURE: custom emojis 2014-12-23 01:12:26 +01:00
Robin Ward 6e1601c10d Second try at making heart pulse. Go faster, stay coloured. 2014-12-22 14:51:11 -05:00
Régis Hanol c5a7bce557 FIX: only create animated thumbnails for GIFs 2014-12-22 12:56:19 +01:00
Sam 9e4942eeeb FIX: don't pop up "cancel" when returning to topic 2014-12-22 16:08:39 +11:00
Sam a75b9db4a2 FIX: sane badge ordering on user page 2014-12-22 14:30:37 +11:00
Sam 27d43ad6c0 PERF: hold back rendering of suggested topics 1 run loop. 2014-12-22 13:18:19 +11:00
Felix Rauch a45024de6c Added absolute dates to user list serializer
Added fields last_seen_at, last_emailed_at, and created_at to the admin user list serializer, to allow client applications to use those dates without having to parse the age string.

Referred to at: https://meta.discourse.org/t/api-returns-relative-times-instead-of-absolute-time-values
2014-12-20 10:24:16 +01:00
Jeff Atwood 157378bfcc edit pencil glyph too big mon TOO BIG 2014-12-19 00:46:24 -08:00
Jeff Atwood 24f1ef024e topic status glyphs too big mon TOO BIG 2014-12-19 00:35:08 -08:00
Robin Ward b06cb26f7f Revert "UX: Let's try an animating heart out"
This reverts commit eb445ca2fc.
2014-12-19 17:24:45 -05:00
Robin Ward 9bb2ab6265 Merge pull request #3034 from fantasticfears/filter_system_user
disable sending email or show presence when forgot system user password
2014-12-19 16:52:01 -05:00
Robin Ward eb445ca2fc UX: Let's try an animating heart out 2014-12-19 16:48:43 -05:00
Robin Ward 043a93dfd5 FIX: Sharing buttons broke in 1.9 template upgrade 2014-12-19 15:26:05 -05:00
Robin Ward 25755efeee FIX: Safari 7 changed popstate behavior 2014-12-19 10:56:19 -05:00
Robin Ward faabdad04e FIX: Regression with ember upgrade on notifications 2014-12-19 10:34:09 -05:00
Robin Ward de027d1f97 FIX: Regression in badges linking to a post 2014-12-19 10:29:02 -05:00
Erick Guan ceca85c9eb use system user helper and constant when it's referred 2014-12-18 18:21:14 +08:00
Jason W. May 18a00d2dd7 remove commented-out code 2014-12-17 08:59:05 -08:00
Robin Ward 2d3a9b334d FIX: LazyYT was not being applied when a post was edited 2014-12-18 12:28:14 -05:00
Robin Ward db89695d4d FIX: Load order of Javascript 2014-12-18 11:22:02 -05:00
Robin Ward 8b51176f2e FIX: Category badges were missing stripes in some places 2014-12-18 11:03:17 -05:00
Robin Ward a8acbc37a2 Refactor selector components for extensibility 2014-12-18 10:36:58 -05:00
Kris Aubuchon bcb03474d6 fixing base line-height and big/small abuse 2014-12-17 14:51:47 -05:00
Régis Hanol c17b111b6d FIX: 1.9.0 regressions with i18n 2014-12-17 19:21:06 +01:00
Robin Ward 0d1bb7763a FIX: 1.9.0 regression with i18n 2014-12-17 12:57:23 -05:00
Robin Ward 01904c6ca3 FIX: Sometimes loading blank topic list 2014-12-17 11:34:20 -05:00
Robin Ward 768027f0e3 Merge pull request #3046 from gdpelican/feature/insensitive-group-names
Remove group name validation case sensitivity
2014-12-17 10:52:45 -05:00
Régis Hanol fc85760bc0 FIX: add topic-owner class to all the posts created by the OP 2014-12-17 16:25:31 +01:00
Robin Ward 2ca0a307de FIX: When using `{{avatar}}` within autocomplete 2014-12-17 10:05:38 -05:00
Robin Ward f42a5c1ba3 Convert a lot of Globals to ES6 modules 2014-12-17 09:31:42 -05:00
Robin Ward 124f47529a Fix regression in `{{each}}` fixes 2014-12-17 09:31:42 -05:00
Robin Ward f3babdb319 Fixes many Ember 1.9.0 deprecations 2014-12-17 09:31:42 -05:00
Robin Ward 3e8d8bf90d Revert i18n initializer, it breaks tests. 2014-12-17 09:31:42 -05:00
Robin Ward 1948b41875 Fix resolve errors 2014-12-17 09:31:41 -05:00
Robin Ward 3e408f9caa Fix more deprecated helpers 2014-12-17 09:31:41 -05:00
Robin Ward 7aaf2fcb65 Fix broken qunit tests in 1.9.0 2014-12-17 09:31:41 -05:00
Robin Ward bdc075b266 Minimize use of `stream` calls 2014-12-17 09:31:41 -05:00
Sam 51c4cb3de1 fix helper 2014-12-17 09:31:41 -05:00
Sam f8f1611035 compatibility fixes 2014-12-17 09:31:41 -05:00
Sam a0787103c1 fix raw helper so its handlebars 2.0 compliant 2014-12-17 09:31:41 -05:00
Robin Ward 008a19f997 More 1.9.0 fixes 2014-12-17 09:31:41 -05:00
Robin Ward 02f3a2d115 Fix more deprecations for 1.9.0 2014-12-17 09:31:41 -05:00
Robin Ward 5659b93c71 Many fixes for Ember 1.9.0 2014-12-17 09:31:40 -05:00
Robin Ward 61101736cb `Ember.empty` has been renamed to `Ember.isEmpty` 2014-12-17 09:31:40 -05:00
Régis Hanol f5317a519f Merge pull request #3035 from oblakeerickson/update_username_return_json
Update username should return a json response
2014-12-17 11:23:33 +01:00
Régis Hanol aff49a1e0d Merge pull request #3043 from fantasticfears/patch-9
expanding active column width
2014-12-17 11:22:05 +01:00
Régis Hanol cdbee4f5d9 Merge pull request #3045 from techAPJ/patch-2
FIX: redirect client to the original url after logging in for private in...
2014-12-17 11:21:56 +01:00
Jeff Atwood 004cfabe81 remove extra font-size declaration 2014-12-17 00:45:32 -08:00
Jeff Atwood 1c8ddccb45 try to correct font scaling problems on Firefox 2014-12-16 23:26:29 -08:00
James Kiesel 84bed4f9ce Remove group name validation case sensitivity 2014-12-17 18:44:30 +13:00
Régis Hanol 6096c88454 FIX: automatically use uploaded avatar when uploading an avatar 2014-12-16 18:36:28 +01:00
Kris Aubuchon c7d7393d80 setting static base font size 2014-12-16 09:24:15 -05:00
Jeff Atwood 23899281d8 minor font sizing CSS fixups 2014-12-16 01:12:52 -08:00
Arpit Jalan 9f8e73303a FIX: redirect client to the original url after logging in for private instances 2014-12-16 13:19:26 +05:30
Jeff Atwood dfd7e69df7 Merge pull request #3044 from awesomerobot/master
changing font sizes to ems, so fonts scale a bit more gracefully
2014-12-15 19:22:35 -08:00
Kris Aubuchon 3eebc0e589 changing font sizes to ems, so fonts scale a bit more gracefully 2014-12-15 22:12:56 -05:00
Régis Hanol 521226f4c9 FIX: registration fails with timeout on gravatar 2014-12-15 22:10:27 +01:00
Robin Ward b2e2a99898 FIX: Don't raise an error when trying to log nothing 2014-12-15 14:14:12 -05:00
Robin Ward 748c13f4a7 Fixes broken test 2014-12-15 13:13:39 -05:00
Robin Ward a2c97b9e6b FIX: If a user uses the keyboard to navigate, don't bubble up the event. 2014-12-15 12:54:05 -05:00
Robin Ward da7fefa263 Merge pull request #3039 from techAPJ/patch-1
Optimize user csv export
2014-12-15 12:26:23 -05:00
Robin Ward b1bc4741b1 FEATURE: Load fewer topics in the topic list on slow platforms (Android) 2014-12-15 11:54:26 -05:00
Régis Hanol a014507da4 FIX: semantic HTML for category with images 2014-12-15 15:39:13 +01:00
Erick Guan 6e59a450c1 expanding active column width
When the post gets older, its translation text needs more space
2014-12-15 22:33:37 +08:00
Robin Ward 2d6b15a34d Load fewer posts when the android platform is detected 2014-12-12 11:47:39 -05:00
Arpit Jalan 2492c41f74 Optimize user csv export 2014-12-12 21:19:57 +05:30
Arpit Jalan 02e1d17ac7 Add Turkish translation files 2014-12-12 12:13:12 +05:30
Robin Ward b366ec7f15 Merge pull request #3036 from techAPJ/patch-4
FEATURE: export csv for all the logs
2014-12-11 14:56:05 -05:00
Régis Hanol 1353557575 FIX: custom flags not possible on very long topic titles 2014-12-11 19:34:52 +01:00
Arpit Jalan 42cbe6ef2a FEATURE: export csv for all the logs 2014-12-11 23:33:26 +05:30
Régis Hanol e6e7948617 FEATURE: support for emoji sets
Added following emoji sets
  - Apple/International
  - Emoji One (default)
  - Android/Google
  - Twitter

FIX: translations from plugins weren't properly merged with default translations
FEATURE: new 'site_setting_changed' event
2014-12-11 17:08:47 +01:00
Sam 32b52642ab PERF: don't render composer until we need it 2014-12-11 16:21:39 +11:00
Sam 8b87f095c6 PERF: don't render share dialog until we have a link. 2014-12-11 15:46:08 +11:00
Sam 46720b1017 PERF: don't render user card until displayed 2014-12-11 15:42:12 +11:00
Blake Erickson 02ade72ceb Update username should return a json response
- Have update username return json response that contains the updated
  username and id. I figured this would be better than just return "OK".
- Add test to verify that the new username is returned.
2014-12-10 09:43:16 -07:00
Robin Ward d2a7904bf2 UX: Banner topics should be readable even with dark color schemes. 2014-12-10 10:46:30 -05:00
Robin Ward ff758cea11 FIX: Text in select2 dropdowns should not be variable since the
background is always white.
2014-12-10 10:25:35 -05:00
Jeff Atwood 7e609e1834 do we need #list-area margin-bottom so big? 2014-12-10 00:33:45 -08:00
Sam 0542c080b3 PERF: optimise rendering of posts 2014-12-10 18:05:04 +11:00
Erick Guan 9937af7ac4 disable sending email or show presence when forgot system user password 2014-12-10 14:17:56 +08:00
Robin Ward e76449d800 When using automatic file includes (es6, hbs) from plugins, allow the
asset pipeline to find new and deleted files with deleting the `tmp`
folder and restarting the server.
2014-12-09 15:23:14 -05:00
Robin Ward 2b817f826b Allows us to easily define routes in plugins 2014-12-09 13:26:30 -05:00
Robin Ward 72efcc8e86 UX: Make category link text black in digest emails 2014-12-09 11:28:45 -05:00
Sam 4f4c49f702 Merge pull request #3031 from oblakeerickson/activate_return_json
Have activate user return json
2014-12-09 10:12:42 +11:00
Robin Ward 4de412365e The `{{i18n}}` helper should use quotes when looking up keys, always. 2014-12-08 16:36:18 -05:00
Régis Hanol 63d4932549 Merge pull request #3032 from awesomerobot/master
adding max-height for embedded video
2014-12-08 21:48:19 +01:00
Kris Aubuchon 448acc627b adding max-height for embedded video 2014-12-08 15:39:36 -05:00
Robin Ward 5fd3f2547c FIX: Fix rerendering issues on some components. 2014-12-08 14:47:49 -05:00
Blake Erickson 1d0eccf710 Have activate user return json
- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec

This commit was created so that when you activate a user through the api
it returns a json response.
2014-12-08 11:16:57 -07:00
Robin Ward 7069ee16e2 FIX: Javascript error when uploading backup 2014-12-08 12:38:36 -05:00
Sam 3547c20aa7 add toolbar to pick emoji family, bump up number to 60 2014-12-08 16:45:24 +11:00
Sam 23163422e6 correct positioning when emoji is added 2014-12-08 14:22:54 +11:00
Sam 555b783864 Add shortcuts support for emoji toolbar
(CTRL E to open, ESC to close)
2014-12-08 13:32:26 +11:00
Sam fdecd69228 Merge pull request #3026 from oblakeerickson/legacy_avatar
Remove legacy avatar code
2014-12-08 11:03:55 +11:00