Commit Graph

3878 Commits

Author SHA1 Message Date
Neil Lalonde 8167cefe36 Add envelope glyph to private message topic titles 2014-02-26 12:24:21 -05:00
Robin Ward cae7af4b07 BUGFIX: Do not scroll to top / show spinner when leaving a topic. 2014-02-26 12:04:55 -05:00
Robin Ward c668d49822 REFACTOR: Use the `ScrollTop` mixin instead of custom scrolling code. 2014-02-26 11:54:15 -05:00
Sam 50a8d3caae BUGFIX: sso to send welcome emails 2014-02-26 10:28:03 +11:00
Sam 74a1145a0b BUGFIX: sso to respect must_approve_users 2014-02-26 10:27:39 +11:00
Sam 440435f023 FEATURE: SSO to handle return_path automatically 2014-02-26 09:58:30 +11:00
Neil Lalonde 8cbff3672f Fixes on mobile signup form 2014-02-25 16:40:30 -05:00
Neil Lalonde 0b1d1ffcba FIX: problems with mobile login modal 2014-02-25 16:40:30 -05:00
Robin Ward 4e1a628ff9 Hooks for extra nav items. 2014-02-25 16:02:27 -05:00
Robin Ward d079538a6d Allow the `customHTML` helper to look up fragments outside of the
preloadStore, so plugins can stuff HTML in there when overriding a whole
template doesn't make sense.
2014-02-25 16:02:27 -05:00
Robin Ward 8a96f1a7b6 FIX: Margin in onebox 2014-02-25 14:50:21 -05:00
Jeff Atwood 0e6325d172 unnecessary CSS suppression of li paras 2014-02-25 10:28:48 -08:00
Neil Lalonde b15e771d67 Oops, I meant 1 2014-02-25 12:19:22 -05:00
Neil Lalonde 7288bf1f31 Add previous page link for crawlers 2014-02-25 12:15:48 -05:00
Robin Ward 9ebcdfba1f Merge pull request #2005 from eriko/plugin_store_delete
clean up plugin store when removing data instead of setting the value to...
2014-02-25 11:36:05 -05:00
Erik Ordway dfa6960799 clean up plugin store when removing data instead of setting the value to nil and do it a reasonable way. 2014-02-25 08:26:35 -08:00
Neil Lalonde 8134113b22 Add rel=next to next page link for crawlers 2014-02-25 10:18:07 -05:00
Jeff Atwood d0f5e1f53e Merge pull request #2006 from awesomerobot/master
adding word-wrap: break-word back to usernames, fixing onebox bg in quotes
2014-02-24 20:07:59 -08:00
Kris Aubuchon 8f6ab4fb85 adding word-wrap: break-word back to usernames, fixing onebog bg in quotes 2014-02-24 22:36:30 -05:00
Sam 6f31d3f0e5 FEATURE: single sign on support
Added support for outsourcing auth to a different website, documentation on meta
2014-02-25 14:31:03 +11:00
Erik Ordway db411860c2 clean up plugin store when removing data instead of setting the value to nil. 2014-02-24 16:11:31 -08:00
Neil Lalonde 46d1c8c1e0 FIX: n+1 queries in CategoryList 2014-02-24 15:07:46 -05:00
Robin Ward 4cd5ccdf1f BUGFIX: Don't return child categories if you can't see the parent
category.
2014-02-24 14:52:41 -05:00
Robin Ward 3151f59bc9 REFACTOR: We don't cache the json for the Site model anymore, so let's
rename and remove the methods leftover from that.
2014-02-24 14:25:37 -05:00
Wojciech Zawistowski 227c0af20b Removes unnecessary instance vars. 2014-02-24 18:03:29 +01:00
Benjamin Kampmann 1e609aac77 Fix: apply excludes for user aliases in user selection view
- fixes a missing reassignment to the new named variable causing the selection of group aliases to fail in the user selector view of private messages
 - apply the list of excludes when a user selects a group alias to prevent double selection of users already in the list and selection of oneself
2014-02-24 10:35:47 +01:00
Kris Aubuchon 6b050825ff revising color variables appwide, also some adjustments to "topic not found" page 2014-02-23 20:47:44 -05:00
Jeff Atwood 142e39f5f3 we need a bit more top-margin on h1,h2,h3 2014-02-23 00:22:11 -08:00
Robin Ward 27d3fae4df BUGFIX: Typo was causing dismiss read to use id = 0 instead of id = 1 2014-02-21 21:14:07 -05:00
Régis Hanol 68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00
Robin Ward 23066edbe1 FIX: undefined method error for some digests. 2014-02-21 16:25:19 -05:00
Robin Ward b21949c7cb FIX: Amazon favicon was missing 2014-02-21 16:10:20 -05:00
Robin Ward 80176cb4cf TRIVIAL: Move button to the bottom of the topic list 2014-02-21 15:59:28 -05:00
Robin Ward 1aa27ade17 FEATURE: If you don't select any topics to "Dissmiss Read" it does all
by filter.
2014-02-21 15:18:45 -05:00
Robin Ward a07e9f7e71 FEATURE: Bulk `reset read` status. 2014-02-21 15:18:45 -05:00
Robin Ward 7a07f14dfc FEATURE: Can select topics and hit `Dismiss Read` on the `/unread` filter 2014-02-21 15:18:45 -05:00
Neil Lalonde 5fd390c600 FIX: nuke spammer from flags page 2014-02-21 14:14:30 -05:00
Neil Lalonde 9545e2e46e FIX: broken 404 page. don't bother showing current_usre stuff 2014-02-21 12:24:45 -05:00
Wojciech Zawistowski ed311eb65a PostsController refactoring. 2014-02-21 17:12:43 +01:00
Sam Saffron 451598c511 BUGFIX: regresses correct job execution 2014-02-21 16:05:19 +11:00
Sam Saffron 9a3af8997b BUGFIX: handle partial job failure in multisite
log all failures
2014-02-21 15:31:15 +11:00
Robin Ward d95887c57d CHANGE: We now include the `_escaped_fragment_` support by default, but
only if the crawler check fails. It is a fallback for non-google search
engines that support the Ajax crawling API.
2014-02-20 17:02:26 -05:00
Robin Ward c4b5455c21 REFACTOR: Rename `GooglebotDetection` to `CrawlerDetection` because we
will likely whitelist more crawlers in the future.
2014-02-20 16:07:02 -05:00
Robin Ward b8448b6e39 Merge pull request #1982 from velesin/posts_controller_replies_tests
Adds tests for PostsController#replies.
2014-02-20 13:36:31 -05:00
Neil Lalonde b696c96a19 Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered. 2014-02-20 12:29:40 -05:00
Wojciech Zawistowski cfbeba84d2 Adds tests for PostsController#replies. 2014-02-20 17:38:13 +01:00
Robin Ward a57ecef253 BUGFIX: Do not allow `font` tags. 2014-02-20 11:10:56 -05:00
Robin Ward 2d398903c0 Allow jump to top on post 2 or 3. 2014-02-19 14:23:43 -05:00
Robin Ward 0c45cf1ee7 FIX: Allow closing the category dropdown when clicking on the same
category
2014-02-19 14:17:38 -05:00
Robin Ward 634b769cda Merge pull request #1903 from vikhyat/poll-plugin
Add poll plugin
2014-02-19 13:15:43 -05:00
Robin Ward 40585637fe Merge pull request #1948 from riking/patch-3
Removing more stuff from the sanitizer whitelist
2014-02-19 12:30:56 -05:00
Robin Ward d56b1b1c74 Merge pull request #1975 from orend/simplify_topic_posters_summary
simplify TopicPostersSummary
2014-02-19 12:30:10 -05:00
Régis Hanol d443ddd43d Merge pull request #1922 from joallard/language-toggle
Allow users to toggle interface language in their preferences
2014-02-19 18:28:00 +01:00
Robin Ward ef18e415cf Merge pull request #1978 from velesin/posts_controller__by_number_tests
Adds specs for PostsController#by_number.
2014-02-19 12:26:57 -05:00
Régis Hanol a682c8fc91 BUGFIX: do not push read-only signal to ALL sites 2014-02-19 18:21:41 +01:00
Wojciech Zawistowski 5e8db5ce14 Adds specs for PostsController#by_number. 2014-02-19 17:41:17 +01:00
Oren Dobzinski d0fbabeb0b simplify TopicPostersSummary 2014-02-18 23:53:30 -05:00
Kane York 9f8f0f115c Restore 'article' to whitelist 2014-02-18 16:22:42 -08:00
Neil Lalonde 7f6b2e5563 Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app. 2014-02-18 17:18:53 -05:00
Robin Ward 18e98851e3 Use lower case group names in URLs 2014-02-18 16:43:19 -05:00
Sam 43612e9fde Merge pull request #1971 from velesin/posts_controller_refactoring
Refactors PostsController and adds unit tests.
2014-02-19 08:34:40 +11:00
Sam 3eec3136d5 Merge pull request #1972 from verg/user_pref_save_btn
Add Save button to top of user preferences
2014-02-19 08:30:17 +11:00
Robin Ward f19b0b5fe0 Include members count on groups page. 2014-02-18 16:17:04 -05:00
Neil Lalonde 997a7c676e If flagging a topic with only one post, flag the post instead 2014-02-18 15:18:31 -05:00
Jonathan Allard 0592420e52 Add a site setting to allow users to toggle I18n.locale
It is false by default.
2014-02-18 14:54:00 -05:00
Jonathan Allard c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Robin Ward 3f3c07f136 FEATURE: Can bulk update the notification level of topics 2014-02-18 13:02:22 -05:00
Neil Lalonde d0ecccb7e4 Translate asterisks in ip addresses to mask format so people can enter things like 127.*.*.* in screened ip addresses form 2014-02-18 13:00:55 -05:00
verg d087783fe8 Add Save button to top of user preferences 2014-02-18 12:51:37 -05:00
Régis Hanol 74f1db11e9 remove useless binding 2014-02-18 18:23:28 +01:00
Régis Hanol 30ccdf3fb7 BUGFIX: calling _super() won't actually set the model to the controller
cf.
351719f7c1 (commitcomment-5410366)
for more information
2014-02-18 18:21:35 +01:00
Wojciech Zawistowski 5b9a4d3581 Refactors PostsController and adds unit tests. 2014-02-18 17:19:38 +01:00
Neil Lalonde 6c23a1903e FIX: show ip address with mask again on /admin/logs/screened_ip_addresses 2014-02-18 10:33:08 -05:00
Sam 884346cbea Merge pull request #1951 from thoughtbot/bb-erb
Use ERB to pull conf files into app
2014-02-18 16:23:55 +11:00
Sam 887e835a9b Merge pull request #1969 from riking/scroll-position
Put requested post in middle of page
2014-02-18 16:17:26 +11:00
Sam 983c7567aa BUGFIX: seen recently key needs to be public so mock can easily reach in to it 2014-02-18 16:09:24 +11:00
riking 19922ff174 Have keyboard_shortcuts use Discourse.TopicView.jumpToPost
Instead of _scrollList, which is more appropriate on the topic list.
2014-02-17 16:45:36 -08:00
riking ebb001c24a When entering a topic, place the desired post in the middle of the page 2014-02-17 16:38:01 -08:00
Sam 6360868341 Merge pull request #1968 from stephankaag/drop_rails3
Drop Rails3 support
2014-02-18 10:50:36 +11:00
Régis Hanol 351719f7c1 BUGFIX: do not forget Ember's default behavior 2014-02-17 21:58:28 +01:00
Stephan Kaag f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Régis Hanol aac4b55926 FEATURE: do not redirect to top page when number of topis is low 2014-02-17 14:28:12 +01:00
Régis Hanol 90d20c4373 Merge pull request #1950 from verg/master
Don't render 'Reply' button when user can't post
2014-02-17 14:04:49 +01:00
Régis Hanol 9e9d03d656 Merge pull request #1957 from lonehangman/site_endpoint
Added endpoint for the 'site' JSON (In the preload store)
2014-02-17 09:49:01 +01:00
Régis Hanol 35fd03c1e4 Merge pull request #1961 from verg/site_settings_load_top
Scroll to top on Site-Setting category render
2014-02-17 09:47:20 +01:00
lonehangman 739c9688ae Added endpoint for site JSON
Removed unneeded code
2014-02-17 15:16:53 +09:30
Sam 49efb055f2 Merge pull request #1954 from verg/unbind_user_name
Don't display edits during user's name update
2014-02-17 10:38:43 +11:00
Sam 23af46a66c Merge pull request #1960 from verg/subcategory-search-links
Fix subcategories links from search
2014-02-17 10:33:35 +11:00
verg 7e8c30c715 Scroll to top on Site-Setting category render 2014-02-16 16:35:07 -05:00
verg f723f11443 Fix subcategories links from search 2014-02-16 12:49:20 -05:00
Robin Ward 79b406c0f3 FIX: If default page is categories, anonymous users were seeing latest
categories when going into a category.
2014-02-15 18:54:04 -05:00
Neil Lalonde d298e2e065 Detect Googlebot from user agent and use a different layout that doesn't load javascript 2014-02-15 17:54:34 -05:00
verg fd40d40eca Don't display edits during user's name update 2014-02-15 11:10:06 -05:00
Kris Aubuchon 47d8db4516 making the background on unread notifications stand out a bit more 2014-02-14 23:15:39 -05:00
Régis Hanol 683bf8c0a4 FEATURE: add all email logs tab 2014-02-15 01:17:13 +01:00
Britt Ballard 60e1a5aa69 Use ERB when importing conf files into app 2014-02-14 16:14:55 -08:00
Régis Hanol 3f3c9ca7cb FEATURE: add filters on email logs 2014-02-15 00:50:08 +01:00
Régis Hanol 21f757fd72 mention shortcut in the tooltip on the submit button 2014-02-15 00:49:36 +01:00
Neil Lalonde 9c4dc9a966 Block browser-update.js in robots.txt. Move noscript block above everything else in application layout. 2014-02-14 15:33:00 -05:00
verg 8447fd47e5 Don't render 'Reply' button when user can't post 2014-02-14 14:10:22 -05:00
Robin Ward f7b3856101 FIX: Don't append posts directly to the stream unless all posts are loaded. 2014-02-14 14:03:09 -05:00
Neil Lalonde e83ec810e1 FIX: heading shouldn't say Sent At on the page that shows email that were not sent. duh. 2014-02-14 13:09:22 -05:00
Neil Lalonde 35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
Neil Lalonde 42fb9d4fb1 Avoid calling can_delete_account twice 2014-02-14 13:06:39 -05:00
Robin Ward feb4fa3bb5 FIX: Draft topics should remember the category you chose 2014-02-14 12:33:46 -05:00
Robin Ward 97aa2c8dfe Revert "FIX: restore category when opening draft"
This reverts commit dd7fa2d946.

Unfortunately this introduced a regression where editing a post, then
replying soon after would leave you in edit mode.
2014-02-14 12:06:58 -05:00
verg de9cac0406 Add Private Message count to User Dropdown 2014-02-14 08:45:09 -05:00
Kane York 2e864f5ad7 Remove audio and video tags as well 2014-02-13 21:47:13 -08:00
Sam 177371fb69 do a full GC prior to getting stats 2014-02-14 16:10:26 +11:00
Sam b75620973f FEATURE: memory stats route for diagnostics in admin 2014-02-14 15:45:12 +11:00
Kane York 5b819f191a Removing more stuff from the sanitizer whitelist 2014-02-13 20:18:40 -08:00
Kris Aubuchon cdb888aec3 removing any :focus and/or outline definition so :focus falls back on the browser 2014-02-13 20:56:03 -05:00
Régis Hanol a8b3269fdb reload the page when read_only mode is disabled 2014-02-14 00:27:25 +01:00
Régis Hanol 41d16a3657 forgot the AdminBackupsLogsRoute 2014-02-13 13:31:14 -08:00
Régis Hanol b89d328de2 display/preload the logs of the last/current operation 2014-02-13 13:31:14 -08:00
Régis Hanol 50273ba815 rename site setting to 2014-02-13 13:31:14 -08:00
Régis Hanol 6123223fd0 change button order, read-only mode comes first 2014-02-13 13:31:14 -08:00
Régis Hanol 5725f02d9e allow full access to /admin/backups while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol 0e941a6253 add an alert when trying to login while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol 38e365ea45 do not show the read-only alert to the admin 2014-02-13 13:31:13 -08:00
Régis Hanol e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol b05bb86323 add rollback button style 2014-02-13 13:31:13 -08:00
Régis Hanol babcc3fc50 backup & restore client-side code 2014-02-13 13:31:13 -08:00
Régis Hanol 310a439f3d update client-side admin routes 2014-02-13 13:31:13 -08:00
Régis Hanol 3be1b5569a backups controller & specs 2014-02-13 13:31:13 -08:00
Régis Hanol 93dd619080 Backup serializer 2014-02-13 13:31:13 -08:00
Régis Hanol c82f7bb6dc Backup model 2014-02-13 13:31:13 -08:00
Régis Hanol 8344f0d8fd remove old import/export code 2014-02-13 13:31:13 -08:00
Régis Hanol ffac197386 humanSize handlebars helper 2014-02-13 13:31:13 -08:00
Régis Hanol fe3a76817d fix login on sub-directory install 2014-02-13 13:31:13 -08:00
Régis Hanol 7086f01de4 ligther danger dark highlight 2014-02-13 13:31:13 -08:00
Régis Hanol c5c6986f02 remove gradient & box-shadow on buttons 2014-02-13 13:31:13 -08:00
Régis Hanol a86002f582 add case insensitive test on ajax request type 2014-02-13 13:31:13 -08:00
Régis Hanol 185f4bd8c8 fix code styling 2014-02-13 13:31:13 -08:00
Régis Hanol a89e7ab662 binding to a POJO is useless 2014-02-13 13:31:13 -08:00
Régis Hanol 26409dbef8 remove unnecessary () 2014-02-13 13:31:13 -08:00
Régis Hanol 1636dce624 this should really be the AdminController 2014-02-13 13:31:13 -08:00
Robin Ward d3b2f87f8e In email digests, try to get longer excerpts if we don't have enough
characters from the first paragraph.
2014-02-13 16:11:01 -05:00
Robin Ward 0b6bd5c187 Schedule a `blur` on links when the route changes. Also, convert DOM
cleanup tasks to only schedule once per render.
2014-02-13 15:35:53 -05:00
Sam c0686a6dc6 BUGFIX: regression, not handling nil count for recent report 2014-02-14 07:21:19 +11:00
Neil Lalonde 067b08c422 FIX: stupid mistake that broke flagging of posts 2014-02-13 15:10:02 -05:00
Neil Lalonde 85eba22d65 Use ember computed property shortcuts 2014-02-13 14:48:46 -05:00
Robin Ward a555dc9f5e FIX: Incorrect post number following a link. Updated ember-cloaking. 2014-02-13 14:08:12 -05:00
Neil Lalonde 8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
Robin Ward 5932e32528 Merge pull request #1937 from verg/user_dropdown
Add User Avatar Dropdown
2014-02-13 10:55:58 -05:00
verg 95f4c0f583 Add User dropdown menu to Header 2014-02-13 09:45:51 -05:00
Sam bf957513ec correctly handle empty case 2014-02-13 17:27:50 +11:00
Sam e8aa85d783 FEATURE: unread pms go in front of notification report
also refactor fat controller
2014-02-13 17:27:50 +11:00
Sam 4ff6780758 Merge pull request #1935 from eriko/remove_cas
Remove cas
2014-02-13 17:26:20 +11:00
Kris Aubuchon 7b53efe356 adding style for full-name on topic post user meta data 2014-02-12 21:39:37 -05:00
Kris Aubuchon 70c911018b adding style for full-name in user meta on posts 2014-02-12 21:32:47 -05:00
Vikhyat Korrapati 74ab14de19 Add poll plugin. 2014-02-13 07:39:01 +05:30
Sam 5d7a33a799 BUGFIX: flag topic broke all liking on the sites 2014-02-13 12:56:31 +11:00
Robin Ward f73a3f252a FIX: Don't allow parent categories to be deleted. Also, remove
duplicated logic and rely on the server response for `can_delete`
status.
2014-02-12 17:24:25 -05:00
Robin Ward a963dd9081 Support `embeddable_host` values that contain a HTTP/HTTPs protocol 2014-02-12 15:56:06 -05:00
Robin Ward a929eda8ba NEW: Add user name and title to group posts. 2014-02-12 14:23:10 -05:00
Robin Ward 669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
2014-02-12 14:01:36 -05:00
Neil Lalonde 6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Robin Ward 11ee4e7328 FIX: Incorrect doc change. Thanks @riking 2014-02-12 12:29:09 -05:00
Robin Ward 62592215f4 FIX: Testing environment did NOT like `Discourse.URL` 2014-02-12 11:31:11 -05:00
Robin Ward 721472dab4 FIX: Clicking the logo was not scrolling to the top 2014-02-12 11:03:04 -05:00
Sam 9ec52d9425 BUGFIX: mailing list mode broke regular email 2014-02-12 16:51:26 +11:00
Sam 4803d387bc BUGFIX: another broken rss page when it includes system user 2014-02-12 14:29:58 +11:00
Sam 03619917f0 BUGFIX: rails is choking on userpage_url for System user, breaks rss 2014-02-12 14:08:09 +11:00
Jeff Atwood 9b57501bfc Merge pull request #1936 from awesomerobot/master
various css fixes
2014-02-11 18:36:59 -08:00
Erik Ordway 8fc5c66c55 this needs to go but did not show up in my tests but did on travis 2014-02-11 18:13:24 -08:00
Kris Aubuchon dd4d1eddd4 loading bg fix, watching/heatmap color fix, welcome sticky bg fix, user popup drop-shadow fix 2014-02-11 21:03:25 -05:00
Erik Ordway 1167b5c4b5 I can see this on git hub but it is being missing by the test 2014-02-11 17:25:54 -08:00
Robin Ward ef16c08688 Don't show group title under poster, only show actual title, but link it
to the group.
2014-02-11 17:34:44 -05:00
Robin Ward 3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Régis Hanol 7a85e06119 BUGIX: no draft key when creating a topic from the /top page 2014-02-11 13:51:21 -08:00
Kris Aubuchon c24c60e33f fixing the weird user space column bug on smaller browser widths 2014-02-11 16:00:59 -05:00
Robin Ward b035c050d2 Merge pull request #1920 from nickborromeo/list-controller
Extract queries to keep logic in the Categories Model
2014-02-11 15:48:20 -05:00
Robin Ward 1e374e1958 Merge pull request #1926 from awesomerobot/master
now that wbr tags are inputted, breaking usernames a bit more natually
2014-02-11 15:43:41 -05:00
Robin Ward 80bdc6e430 Merge pull request #1929 from verg/fix_category_in_drafts
FIX: restore category when opening draft
2014-02-11 15:42:48 -05:00
Robin Ward d44d2b3f10 FIX: Was not resuming scroll position on back button 2014-02-11 15:17:36 -05:00
Robin Ward 14f075e812 Missing semicolon; 2014-02-11 14:57:14 -05:00
Régis Hanol b512afe5c9 BUGFIX: make sure we bind the uploader only once 2014-02-11 10:38:41 -08:00
Sam e2d2a955dc BUGFIX: remove hidden posts from a users stream 2014-02-11 17:16:58 +11:00
Sam 7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Kris Aubuchon 3b71f8af3a fixing restricted badge padding in the dropdown menu 2014-02-11 00:53:14 -05:00
Kris Aubuchon 6d47fabec7 fixing restricted badge padding 2014-02-11 00:46:17 -05:00
Kris Aubuchon 24f1832cca Merge remote-tracking branch 'upstream/master' 2014-02-11 00:44:10 -05:00
Sam 57ee244394 Bump up consistency check to run twice a day instead of once 2014-02-11 16:11:40 +11:00
Sam 11e962c848 BUGFIX: improve quality of unread / new counters 2014-02-11 15:28:05 +11:00
Sam 750d3a6b18 BUGFIX: ensure topic_view exists before attempting to access it 2014-02-11 10:23:47 +11:00
Sam 820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
Robin Ward 14449f236a FIX: Back button in chrome on static pages 2014-02-10 17:07:39 -05:00
Robin Ward b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it
and apply a CSS class to their posts.
2014-02-10 17:00:15 -05:00
verg dd7fa2d946 FIX: restore category when opening draft 2014-02-10 15:30:08 -05:00
Robin Ward f1a9e52d7e When creating/editing a category the parent shoudl be none. 2014-02-10 14:08:16 -05:00
Robin Ward 45afed8720 FIX: Chrome has a bug where if you request the same URL with a different
MIME type, then leave and hit the back button, you'll get the last MIME
type requested instead of HTML. This fixes it.
2014-02-10 12:43:17 -05:00
Robin Ward b61b33c0fa Add groups list to the poster expansion when you click an avatar while
in a topic.
2014-02-10 12:30:36 -05:00
Robin Ward 25070dcde7 FIX: Show the renamed uncategorized name instead of "(no category)" 2014-02-10 11:15:42 -05:00
Kris Aubuchon dec7a9b998 now that wbr tags are inputted, breaking usernames a bit more natually 2014-02-10 09:45:35 -05:00
Jeff Atwood c900ee055b Merge pull request #1924 from awesomerobot/master
simplfying color palette, collecting colors into unified variables
2014-02-09 22:34:25 -08:00
Kris Aubuchon 2d872795d6 simplfying color palette, collecting colors into unified variables 2014-02-10 01:04:21 -05:00
Sam 4f6cef01e4 fix build 2014-02-10 16:07:09 +11:00
Sam 5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Nick Borromeo b51bebb200 Extract queries to keep logic in the Categories Model
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.

This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.

 Please enter the commit message for your changes. Lines starting
2014-02-08 14:10:48 -08:00