Commit Graph

4299 Commits

Author SHA1 Message Date
Sam 759f4b4fe9 BUGFIX: category name is reserved in multisite 2014-04-24 09:19:59 +10:00
Neil Lalonde d8ebeef857 FIX: NotifyMailingListSubscribers can handle trashed posts, instead of raising an error and retrying 2014-04-23 15:50:52 -04:00
Robin Ward e48cf06fc9 REFACTOR: Add urls for admin groups, make it more idiomatic ember 2014-04-23 15:15:46 -04:00
Neil Lalonde 448802f006 Merge pull request #2288 from yomybaby/i18n_plural_ko
add pluralization rules in ember for Korean (ko)
2014-04-23 12:59:56 -04:00
Régis Hanol de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02:00
Régis Hanol ff1823beca BUGFIX: backups logs page was busted since last Ember update 2014-04-23 11:20:22 +02:00
Sam 7c57d74e85 FEATURE: unicorn sidekiq will restart sidekiq on complete failure.
(checks every 30 minutes for complete failure)
2014-04-23 13:13:18 +10:00
Sam 8abf652dc3 SECURITY: self XSS by admin by editing badge name 2014-04-23 09:46:32 +10:00
Jeff Atwood 6538874064 remove unnecessary css witdh 2014-04-22 16:22:25 -07:00
Jong Eun Lee 00ff3f8953 add pluralization rules in ember for Korean (ko) 2014-04-23 08:08:39 +09:00
Robin Ward af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Robin Ward 8538e31fb4 Don't show link counts in the body of posts for internal links. They are
already in the sidebar.
2014-04-22 15:40:08 -04:00
Régis Hanol 5fd4d88491 BUGFIX: pull hotlinked images job wasn't properly handling the InvalidParameters exception 2014-04-22 15:32:48 +02:00
Vikhyat Korrapati ba862439f2 Move badge styles from desktop to common/base. 2014-04-22 11:50:16 +05:30
Vikhyat Korrapati d54edc7c0e Display username and granted at on badge page. 2014-04-22 11:49:31 +05:30
Sam a3b2b4baca FEATURE: custom fields on User 2014-04-22 13:52:13 +10:00
Robin Ward 78f8fbb7ea FIX: Link to user profile broke the back button 2014-04-21 17:49:10 -04:00
Robin Ward 4eb5474858 Add a SiteSetting to configure how many topics are in the email digest. 2014-04-21 17:49:10 -04:00
Régis Hanol 64b8f2f759 TRIVIAL: remove puts statement (cc. @eviltrout) 2014-04-21 23:00:13 +02:00
Régis Hanol 39cc147138 BUGFIX: only redirect users top /top page once 2014-04-21 20:00:37 +02:00
Régis Hanol 561f7e0148 BUGFIX: add h2 with period when browsing top pages 2014-04-21 20:00:30 +02:00
Jeff Atwood 1623ec77e4 make top user link profile, not activity 2014-04-21 10:18:50 -07:00
Régis Hanol 362c6e443a Merge pull request #2286 from awesomerobot/master
fixing the composer that I just re-broke
2014-04-21 18:01:16 +02:00
Kris Aubuchon 2c44f724f4 fixing the composer that I just re-broke 2014-04-21 11:54:57 -04:00
Robin Ward b9ca124756 Support for /my/preferences to automatically redirect to the logged in
user.
2014-04-21 11:52:11 -04:00
Robin Ward 61e6eae728 FIX: /topics/period routes were broken 2014-04-21 10:26:24 -04:00
Robin Ward 4dc20e6855 FIX: Sanitize custom quote attributes 2014-04-21 10:19:39 -04:00
Kris Aubuchon 5fd874b74a desktop composer fix 2014-04-21 09:56:10 -04:00
Kris Aubuchon e4d1aaa290 pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:17:11 -04:00
Kris Aubuchon bffeba5e3b pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:16:06 -04:00
Kris Aubuchon 3f102a98da initial move of common desktop/mobile styles to common/base 2014-04-19 14:04:22 -04:00
Régis Hanol 454f11e597 FEATURE: new title_sanitize site setting 2014-04-18 21:01:21 +02:00
Régis Hanol 756ea0178a Merge pull request #2276 from vikhyat/badge-system
Badge system updates
2014-04-18 11:46:19 +02:00
Régis Hanol b014d66b65 Merge pull request #2277 from vikhyat/fix-title-html
Fix HTML tags in topic titles
2014-04-18 11:37:33 +02:00
Jeff Atwood b846eb4544 backup size column does not need to be so large 2014-04-17 23:49:58 -07:00
Vikhyat Korrapati 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
Vikhyat Korrapati 27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati e6eb16ee73 Fix infinite loading spinner for badges that have not been granted yet. 2014-04-18 09:20:55 +05:30
Vikhyat Korrapati 8113e8d897 Basic UI for selecting gold/silver badges as titles. 2014-04-18 09:20:51 +05:30
Vikhyat Korrapati 95b430df72 Link poster expansion "+x more" to user badges page. 2014-04-18 08:24:48 +05:30
Vikhyat Korrapati 5bb3a1a05a Show badges filter in user profiles only when the user has badges. 2014-04-18 04:03:13 +05:30
Robin Ward 64faee0935 Break down new topic counts by category if a digest contains many. 2014-04-17 16:42:40 -04:00
Robin Ward 0e56157212 Basic "Also, there are x new topics" text for the digest 2014-04-17 16:04:26 -04:00
Robin Ward 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
Robin Ward 564b1d86b0 Digest should exclude muted topics. 2014-04-17 15:27:11 -04:00
Robin Ward 89aa2380c6 Use "Top" logic for digest emails. Leave out muted categories. 2014-04-17 15:22:19 -04:00
Robin Ward 2341118570 Add categories to the first topics in the email digest 2014-04-17 15:22:19 -04:00
Régis Hanol 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
Régis Hanol bda47c2bf8 Merge pull request #2274 from vikhyat/badge-system
Fix user_badges n+1 query
2014-04-17 21:05:48 +02:00
Neil Lalonde 890e53cd6e Remove the default_invitee_trust_level+1 privilege from trust level 3. 2014-04-17 15:05:15 -04:00