Commit Graph

2727 Commits

Author SHA1 Message Date
Sam 738a25b732 fix failure in rails 4 mode 2013-10-24 13:40:18 +11:00
Sam 24d732b12a regressions post merge 2013-10-24 12:25:20 +11:00
Sam adeb987c70 oops messed up merge 2013-10-24 12:09:49 +11:00
Sam 666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Neil Lalonde 8aab2253d0 Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets 2013-10-23 17:11:35 -04:00
Robin Ward cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Robin Ward 541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward 49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Robin Ward c814fc16a3 Database structure to support sub categories 2013-10-23 15:22:49 -04:00
Neil Lalonde bf06014a16 Order by creation time by default in screened ip addresses table 2013-10-23 13:01:50 -04:00
Neil Lalonde 237312dbde Styling on screened ip addresses page 2013-10-23 13:01:50 -04:00
Neil Lalonde 3db7529ad4 More icons on screened ip addresses page 2013-10-23 13:01:50 -04:00
Régis Hanol a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol 3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam 9ae4245955 Merge pull request #1565 from awesomerobot/master
topic page: alignment fixes for replies, minor alignment changes
2013-10-22 23:09:44 -07:00
Kris Aubuchon ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Neil Lalonde c1008f4359 Fixes for postgresql inet columns in Rails 4. They're backed by an IPAddr class now, which breaks sql parameter marker support, and automatically sets the attribute to nil when trying to assign an invalid ip address. 2013-10-22 19:19:32 -04:00
Kris Aubuchon 0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Robin Ward 6394d924c8 Change migration to prevent down 2013-10-22 17:51:04 -04:00
Robin Ward 348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Jeff Atwood 5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon 649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Neil Lalonde 7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde b8d586251c Use i18n for the word Cancel in admin/.../user.js.handlebars 2013-10-22 16:30:46 -04:00
Kris Aubuchon c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward 13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward 97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Régis Hanol 26218ce11f RSS feeds should contain only publicly-available posts 2013-10-22 16:30:25 +02:00
Régis Hanol f96ea42974 fix last activity column in suggested topics 2013-10-22 10:43:00 +02:00
Jeff Atwood d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood 5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood 4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol 9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol 6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Robin Ward 0f5bd08aee Merge pull request #1558 from awesomerobot/master
differentiating visited topics better, fixing extra white space & alignment in header
2013-10-21 13:45:51 -07:00
Kris Aubuchon 2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Régis Hanol 9b2f821012 Merge pull request #1512 from ScotterC/avatar-from-url
Build out a URI Adapter to allow uploading an avatar via a url
2013-10-21 13:17:37 -07:00
Robin Ward 2308784713 Merge pull request #1543 from railsaholic/small_users_controller_refactoring
refactor UsersController to reduce complexity
2013-10-21 12:21:03 -07:00
Robin Ward 51b2f512a3 Merge pull request #1557 from awesomerobot/master
fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
2013-10-21 12:19:11 -07:00
Kris Aubuchon ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Robin Ward b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Scott Carleton cbef844a57 Build out a URI Adapter to allow uploading an avatar via a url
Currently only really accessible via the API. The UriAdapter creates a
tempfile from a url and gives a ActionDispatch::HTTP::UploadedFile back
to the controller to process as normal.
This will help a lot in being able to transfer avatar urls from another
app without monkey patching a lot of discourse code.
2013-10-21 14:53:03 -04:00
Neil Lalonde 648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Régis Hanol c9dd83cba4 force max-width on images/svgs in composer preview and post view
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2013-10-21 20:01:10 +02:00