Commit Graph

12329 Commits

Author SHA1 Message Date
Régis Hanol 6027073547 FIX: properly unescape HTML entities in excerpts 2014-12-10 12:52:51 +01: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
Sam ccdae40913 show ungrouped emojis in tab, remove a few aliases
(I dislike 💩 and :squirrel: made no sense)

TODO: stop using symlinks for aliases
2014-12-10 13:34:08 +11:00
Jeff Atwood 8c6cb734b1 Update INSTALL-digital-ocean.md 2014-12-09 17:18:26 -08:00
Jeff Atwood c8d564fa83 add embedding notes to install doc 2014-12-09 17:16:58 -08:00
Jeff Atwood 4bcba18167 add embedding notes to admin quick start 2014-12-09 17:16:03 -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
Michael Verdi dfda153ffa [bug fix] When recovering a post, at times the topic related to the post still returns nil.
Use the with_deleted method to include topics that have been soft deleted so that they too can
be recovered.
2014-12-09 11:42:24 -08:00
Robin Ward 663cd93c6d Move `register_asset` into `PluginRegistry` -- the logic works better
there.
2014-12-09 14:20:53 -05:00
Robin Ward 2b817f826b Allows us to easily define routes in plugins 2014-12-09 13:26:30 -05:00
Robin Ward cebb47134f Automatically include all `.hbs` files from plugins 2014-12-09 12:16:47 -05:00
Robin Ward 72efcc8e86 UX: Make category link text black in digest emails 2014-12-09 11:28:45 -05:00
Sam 6ab1720779 Add pagination for emoji, split out foods, make it wider 2014-12-09 17:22:54 +11:00
Sam 57b1f002d1 prep work for emoji versioning 2014-12-09 14:51:44 +11:00
Sam 5551676fef FIX: cache all public resources registered by plugins.
Plugins are responsible for expiry
2014-12-09 14:49:02 +11:00
Sam 51955e6e78 FIX: add CDN support to emoji preview and toolbar 2014-12-09 14:31:49 +11:00
Sam 993d60f9fb clean html 2014-12-09 12:12:11 +11:00
Sam 8b9c7da571 FIX: In Firefox :w autocomplete was broken
Always use hasOwnProperty as opposed to [] on hash objects,
{} has a "watch" function in Firefox
2014-12-09 12:11:56 +11:00
Sam ef5d56a258 correct random ')') showing up 2014-12-09 12:10:30 +11:00
Sam 3b033d2899 allow users to override groups if needed 2014-12-09 12:09:46 +11: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 f0dda91364 Merge pull request #3030 from longhotsummer/fix-facebook-no-email
Facebook auth without an email should allow user to enter email
2014-12-08 21:49:16 +11:00
Greg Kempe e979382ab4 Facebook auth without an email should allow user to enter email
In some cases Facebook doesn't send back a user's email. In this
case, allow the user to enter their email address.

See
https://meta.discourse.org/t/facebook-initial-login-create-account-dialog-leaves-email-field-blank/13815/15
2014-12-08 12:43:06 +02: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 c5e07aa320 refactor emoji into 3 files, start flagging composer bits with the api 2014-12-08 12:51:13 +11:00
Sam abf6871de6 Merge pull request #3027 from techAPJ/update-translations
Add missing translation files and update translations
2014-12-08 11:04:17 +11:00
Sam fdecd69228 Merge pull request #3026 from oblakeerickson/legacy_avatar
Remove legacy avatar code
2014-12-08 11:03:55 +11:00
Sam a7659490c6 Merge pull request #3028 from tytkal/arabic_support
Arabic support
2014-12-08 11:03:12 +11:00
Sam 4082076e0d Merge pull request #3029 from bear-metal/master
Introduce support for being able to dump Rails heap after script/bench.rb runs
2014-12-08 11:01:08 +11:00
Lourens Naudé 2f75078758 Do not assume all interpreter versions support allocation tracing 2014-12-07 23:28:38 +00:00
Régis Hanol fe007d08b3 FIX: remove links and html 'hellips' from topic/post summaries 2014-12-08 00:23:53 +01:00
Lourens Naudé fb60daa867 Introduce support for dumping Rails process heap at the end of a benchmark run 2014-12-07 22:55:37 +00:00
Lourens Naudé c273a6d1d4 Rails -> Ruby verbiage change in script/measure.rb 2014-12-07 22:55:37 +00:00
khalid al-hussayen 7bd0458c71 add arabic local files 2014-12-07 23:06:25 +03:00
khalid al-hussayen 9fc0a3f6f9 add arabic local files 2014-12-07 23:05:24 +03:00
Arpit Jalan 45c2a24075 Update Translations 2014-12-07 22:32:13 +05:30
Blake Erickson e9e88c9b82 Remove legacy avatar code
- Remove method that was only left around because the
  [api](https://github.com/discourse/discourse_api/pull/53) called it
- Modify test to use new route instead of legacy route

https://meta.discourse.org/t/legacy-route-for-avatars/22838/2
2014-12-07 06:13:14 -07:00
Sam a4ce039c85 demock spec 2014-12-07 18:11:38 +11:00
Sam 87e9510bb0 update nokogiri 2014-12-07 18:11:08 +11:00
Sam c05203d449 typo 2014-12-07 16:43:26 +11:00