Commit Graph

4466 Commits

Author SHA1 Message Date
b014d66b65 Merge pull request #2277 from vikhyat/fix-title-html
Fix HTML tags in topic titles
2014-04-18 11:37:33 +02:00
b846eb4544 backup size column does not need to be so large 2014-04-17 23:49:58 -07:00
25a080a8e1 Fix HTML tags in topic titles.
We no longer sanitize titles before saving to the database since it
would cause problems like HTML entities showing up when you try to edit
a topic title. It isn't even really necessary since we only render
fancy_title directly and never title.

The escaping logic used here is the same that is used both in lodash and
onebox. See:

1. https://github.com/discourse/onebox/pull/190/files
2. https://github.com/lodash/lodash/blob/2.4.1/dist/lodash.compat.js#L6194
2014-04-18 10:47:00 +05:30
27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
e6eb16ee73 Fix infinite loading spinner for badges that have not been granted yet. 2014-04-18 09:20:55 +05:30
8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
95b430df72 Link poster expansion "+x more" to user badges page. 2014-04-18 08:24:48 +05:30
5bb3a1a05a Show badges filter in user profiles only when the user has badges. 2014-04-18 04:03:13 +05:30
64faee0935 Break down new topic counts by category if a digest contains many. 2014-04-17 16:42:40 -04:00
0e56157212 Basic "Also, there are x new topics" text for the digest 2014-04-17 16:04:26 -04:00
fd4007eefc FIX: Don't sort the new topics by score since the Top logic is already
sorting them by score.
2014-04-17 15:43:24 -04:00
564b1d86b0 Digest should exclude muted topics. 2014-04-17 15:27:11 -04:00
89aa2380c6 Use "Top" logic for digest emails. Leave out muted categories. 2014-04-17 15:22:19 -04:00
2341118570 Add categories to the first topics in the email digest 2014-04-17 15:22:19 -04:00
b2cb4b27a1 Merge pull request #2273 from paully21/development-branch
Add blurb of post to search results via API
2014-04-17 21:06:03 +02:00
bda47c2bf8 Merge pull request #2274 from vikhyat/badge-system
Fix user_badges n+1 query
2014-04-17 21:05:48 +02:00
890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -04:00
6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
a57f802048 If there's a TopicEmbed record for a url, we don't have to crawl it.
This should help sites like Boing Boing where sometimes links are
crawled before saved in WordPress.
2014-04-17 14:00:22 -04:00
ffc1634193 FIX: Only show link clicks on the title of a onebox, not repeatedly in
its body.
2014-04-17 13:01:44 -04:00
87682f7539 FIX: Don't include image meta data when embedded in an email 2014-04-17 12:32:51 -04:00
843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
2eab288dc9 Port "Summarize Topic" to query-params-new 2014-04-17 10:46:33 -04:00
fdb751296a FIX: ZALGO test suite was causing failures in the wrong place due to
missing `async` bits.
2014-04-17 10:46:33 -04:00
c9c95a9ac2 FIX: Ember doesn't allow one route name, basic, and Discourse used it! 2014-04-17 10:45:06 -04:00
c820747ea3 FIX: Malformed HTML in templates 2014-04-17 10:45:06 -04:00
fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
2f9bb6b88f FIX: Deprecation warnings on Ember.js for render without quotes. 2014-04-17 10:45:06 -04:00
73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05:00
bf8d727a91 Add badges class
Add badges class to the container to custom this new page differently.
2014-04-17 11:40:06 +02:00
Sam
30e73104e4 Bump up to 200 for now, UI perf needs lots of work 2014-04-17 16:25:06 +10:00
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system
Badge system updates
2014-04-17 16:22:41 +10:00
Sam
50d65fc876 Merge pull request #2269 from vikhyat/username-on-top
Add username on top to CSS directory so it can be imported
2014-04-17 16:13:27 +10:00
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
8f53b7a65b Detect arrays for serialization using respond_to?(:to_ary).
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
2014-04-16 20:48:09 +05:30
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
e0a4959dc9 Sort featured badges by badge type first, followed by grant count. 2014-04-16 18:08:10 +05:30
057c56ef9b Add user-badge component. 2014-04-16 18:08:00 +05:30
a1333989f4 Add username on top to CSS directory so it can be imported. 2014-04-16 14:44:55 +05:30
91bfd47419 FIX: don't show contents of hidden posts when quoting the post and when replying as new topic. Also don't allow public to view edit history of hidden posts. 2014-04-15 12:49:08 -04:00
f0e8423445 FIX: don't show hidden posts to crawlers, disabled javascript, and in rss feeds 2014-04-15 12:49:08 -04:00
9cd8476453 REFACTOR: use an options hash instead of multiple nil-able parameters 2014-04-15 17:17:10 +02:00
8b79debde2 Merge pull request #2266 from fantasticfears/locale
add pluralization rules in ember for Chinese
2014-04-15 11:08:22 -04:00
3b53c1814b FIX: don't reload page when creating account with external auth and must_approve_users is enabled. 2014-04-15 10:13:57 -04:00