Commit Graph

4474 Commits

Author SHA1 Message Date
Alexander deb99e956e RSS title element is SiteSetting.title + translated filter description 2014-05-05 09:33:19 -07:00
Jeff Atwood 5dd82bf723 add danger color to delete-and-block button 2014-05-04 00:38:29 -07:00
Jeff Atwood 04c3779985 and it wasn't even the correct glyph 2014-05-03 15:19:28 -07:00
Jeff Atwood 1cd62c37a4 wow I suck 2014-05-03 15:15:11 -07:00
Jeff Atwood b902119f00 use glyph for "in reply to" chicklet to simplify 2014-05-03 15:04:15 -07:00
Régis Hanol 63c4f24319 BUGFIX: do not show PMs counters when the value is 0 2014-05-03 00:40:57 +02:00
Régis Hanol 4642218662 FEATURE: add private messages counters in user activity feed 2014-05-02 22:53:58 +02:00
Neil Lalonde ce381860dc Order latest.rss by created_at, not updated_at 2014-05-02 11:51:16 -04:00
Alexander 43ed6979be feed titles get translations of "Topics" 2014-05-01 14:17:09 -07:00
Neil Lalonde 2e7b69f849 RSS feed for topics and posts now use a guid that will always be unique, unlike urls which can change when the topic slug changes 2014-05-01 14:09:15 -04:00
Alexander 891a1c4279 feed titles now prefixed with SiteSetting.title 2014-05-01 09:37:13 -07:00
Neil Lalonde df538f63d9 Add Hebrew 2014-05-01 11:00:53 -04:00
Jeff Atwood 0f62a6f132 fix new user color 2014-05-01 01:39:08 -07:00
Régis Hanol 11bfd6b68c Merge pull request #2309 from riking/cat-class
Add class to page based on topic category
2014-05-01 09:58:45 +02:00
Jeff Atwood 41cb378142 why does .cooked need a right margin of 60 px?!? 2014-05-01 00:25:07 -07:00
Jeff Atwood 3c05f97f9e some /faq page layout fixes 2014-04-30 23:59:24 -07:00
riking 63ce01893b Add class to page based on topic category 2014-04-30 22:24:02 -07:00
Jeff Atwood 0fa7aec74a minor copyedits on faq and digest 2014-04-30 16:20:23 -07:00
Régis Hanol 02dd80170a BUGFIX: revision history was messed up when doing quick edits 2014-04-30 22:42:56 +02:00
Neil Lalonde dc0a758ec6 FIX: quote whole post button was broken 2014-04-30 14:21:43 -04:00
Régis Hanol 5fda4a613d Merge pull request #2306 from awesomerobot/master
some alignment fixes for the new username position
2014-04-30 18:08:29 +02:00
Régis Hanol 11af466737 FEATURE: add a specific flag reason when a post has been hidden 2014-04-30 16:58:01 +02:00
Kris Aubuchon e18f435318 some alignment fixes for the new username position 2014-04-30 10:14:27 -04:00
Jeff Atwood f13e9e58e8 change "Log In" to "Sign In"
because
http://www.designcult.org/2011/08/why-do-we-call-in-logging-in.html
2014-04-30 01:10:32 -07:00
Sam 85e7033410 BUGFIX: styling 2014-04-30 17:04:54 +10:00
Sam e964ca4d4e BUGFIX: merge played up correct visual styles 2014-04-30 16:13:08 +10:00
Sam d8046a395f BUGFIX: improve alignment 2014-04-30 16:04:24 +10:00
Kris Aubuchon 7361519e52 some adjustments for the username relocation... 2014-04-30 00:45:11 -04:00
Sam f6c22cc299 Merge pull request #2297 from ligthyear/custom-fields
Custom fields for Topic, Category, Post and Group
2014-04-30 13:15:50 +10:00
Sam 1d2cabc2a6 FEATURE: usernames are now on top. 2014-04-30 12:13:37 +10:00
Robin Ward ad1a8db956 Support for linking to static pages with hash URLs like `#section`. Also
refactor of static code to be more idomatic.
2014-04-29 18:01:13 -04:00
Robin Ward 87b4cd3323 FIX: Don't show `undefined` query params 2014-04-29 16:18:01 -04:00
Robin Ward f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
Neil Lalonde f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Benjamin Kampmann f757706861 Ensure Reload reloads custom_fields, too 2014-04-29 19:34:56 +02:00
Benjamin Kampmann 0cf07d41ae Move Concern from lib into app/models. refs #2279 2014-04-29 19:26:43 +02:00
Benjamin Kampmann e502122c51 Add Custom Fields on Topics 2014-04-29 19:26:42 +02:00
Benjamin Kampmann 2450088c03 Add CustomFields to Post, Category and Group 2014-04-29 19:26:42 +02:00
Benjamin Kampmann e6e03a1a96 move custom fields into its own concern 2014-04-29 19:26:42 +02:00
Régis Hanol 4371374ba6 FEATURE: support for enabling all upload file types
BUGFIX: authorized extensions is now case insensitive
2014-04-29 19:12:35 +02:00
Robin Ward 359d59242e If a new user receives a mention, quote or response to their post, allow
them to continue posting in a topic.
2014-04-29 12:59:14 -04:00
Kris Aubuchon 449de0368e updating d-dropdown so long lists of categories can scroll 2014-04-29 09:50:02 -04:00
Sam d18b136e54 Merge pull request #2299 from borhub/new_html_containers_to_help_custom_theming
User profile page and post page templates: add extra wrappers
2014-04-29 12:31:56 +10:00
Boris 88734957bf Topic page template: add extra wrapper around the username also for the deleted user case (missed in af69b78ecb ) 2014-04-29 11:55:16 +10:00
Sam 0fc4c47927 Merge pull request #2295 from vikhyat/badge-system
Titleable badges
2014-04-29 11:26:51 +10:00
Robin Ward ba683bc611 FIX: XSS in markdown converter. 2014-04-28 14:44:15 -04:00
Neil Lalonde 1da59e7e2e FIX: deactivated users shouldn't be able to log in 2014-04-28 13:46:28 -04:00
Neil Lalonde 340fd303c8 FIX: in multisite setup, links to the current forum are whitelisted when looking for spam hosts 2014-04-28 10:37:28 -04:00
Boris c934411228 User profile page template: add extra wrapper into primary details section to allow laying textual items out on the right of the avatar 2014-04-28 17:51:15 +10:00
Vikhyat Korrapati a8e2c5e616 Use PreloadStore for the badge pages. 2014-04-28 10:30:50 +05:30
Vikhyat Korrapati b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Sam e88e43bfb6 Merge pull request #2279 from fantasticfears/concern
move concerns to the model/concerns
2014-04-28 09:48:33 +10:00
Robin Ward 89df580560 FIX: Reflected post links were being deleted when they shouldn't and
vice versa.
2014-04-25 16:49:48 -04:00
Robin Ward b91c70cac3 FIX: Don't show quote controls when the post id is missing. 2014-04-25 15:41:24 -04:00
Benjamin Kampmann 64918c35f5 Improved Plugins SCSS management
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
 - Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
 - Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
2014-04-25 18:25:45 +02:00
Neil Lalonde 20df262814 Add filters to colors ui 2014-04-25 10:10:17 -04:00
Régis Hanol f8d9fb7bdc Revert "Merge pull request #2284 from jaimeiniesta/patch-1"
This reverts commit a6b88d1e7e, reversing
changes made to 9bee0b6e2d.
2014-04-25 11:40:38 +02:00
Robin Ward cf6cbb955b REFACTOR: Introduce `Discourse.computed.setting` to create a computed
property that links to a `Discourse.SiteSetting`
2014-04-24 18:36:02 -04:00
Robin Ward cdd2101e4f FIX: Don't hotlink links for new users 2014-04-24 18:36:02 -04:00
Robin Ward f527ac33b0 FIX: Make sure the unread counter is updated following a "Dismiss New" 2014-04-24 18:36:02 -04:00
Neil Lalonde feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Régis Hanol c52ee665b4 FEATURE: do not bump topic when pulling hotlinked images 2014-04-24 16:07:47 +02:00
Régis Hanol d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system
Incrementally load users in the badge page
2014-04-24 12:14:41 +02:00
Vikhyat Korrapati 0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30
Vikhyat Korrapati 4e89b64e64 Load 100 users at a time for the badge page, with a button to load more. 2014-04-24 14:48:26 +05:30
riking 7da5d3fe78 Backoff-retry for hotlinked image pull + some style fixes 2014-04-23 22:25:43 -07:00
riking b309deef11 Add site setting for domains to never download images from 2014-04-23 22:24:35 -07:00
Sam a6b88d1e7e Merge pull request #2284 from jaimeiniesta/patch-1
escape gravatar URLs to comply with W3C standards
2014-04-24 12:56:16 +10:00
Sam 9bee0b6e2d BUGFIX: we don't need this param 2014-04-24 12:46:54 +10:00
Sam 05efc8df16 BUGFIX: likes would cause whole post to re-render 2014-04-24 12:42:04 +10:00
Sam 2d123ef1c7 REGRESSION: sortable columns were missing sortable class on first render 2014-04-24 11:24:58 +10:00
Sam 3ff1d63a8d Improve mobile style for topic lists
This has been driving me nuts for a while now
2014-04-24 11:10:50 +10:00
Sam 2debf7d97d Correct colors for tracking glyph in notification area 2014-04-24 10:48:04 +10:00
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
Jaime Iniesta 6084cb969d escape gravatar URLs to comply with W3C standards
This fixes an HTML validation error due to & not being properly escaped on the gravatar URLs.
2014-04-21 00:46:00 +02: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
Erick Guan 6d45f71254 move concerns to the model/concerns 2014-04-19 12:00:40 +08: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
Neil Lalonde 6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward 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
Robin Ward 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
Robin Ward 87682f7539 FIX: Don't include image meta data when embedded in an email 2014-04-17 12:32:51 -04:00
Vikhyat Korrapati 843023d7c9 Fix user_badges n+1 query. 2014-04-17 21:58:05 +05:30
Robin Ward b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Robin Ward 2eab288dc9 Port "Summarize Topic" to query-params-new 2014-04-17 10:46:33 -04:00
Robin Ward 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
Robin Ward c9c95a9ac2 FIX: Ember doesn't allow one route name, `basic`, and Discourse used it! 2014-04-17 10:45:06 -04:00
Robin Ward c820747ea3 FIX: Malformed HTML in templates 2014-04-17 10:45:06 -04:00
Robin Ward fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
Robin Ward 2f9bb6b88f FIX: Deprecation warnings on Ember.js for render without quotes. 2014-04-17 10:45:06 -04:00
Robin Ward 73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
paully21 84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05:00
Onaldanm 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
Vikhyat Korrapati b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Vikhyat Korrapati 89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati 3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati 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
Vikhyat Korrapati acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati 4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30