Commit Graph

11296 Commits

Author SHA1 Message Date
Robin Ward 11b52d1334 More deprecations to allow us to work on future versions of Ember 2014-10-07 16:04:19 -04:00
Neil Lalonde 0ab9a0867a Merge branch 'master' of github.com:discourse/discourse 2014-10-07 15:53:11 -04:00
Neil Lalonde a30e70e8f1 FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users 2014-10-07 15:52:54 -04:00
Robin Ward e20c82436d FIX: Clicking "Latest" while ordering by a column should reset the
order.
2014-10-07 15:19:17 -04:00
Robin Ward bb192dd0a3 UX: Remove sortable column from "Topic" and "Users" column. 2014-10-07 14:45:36 -04:00
Jeff Atwood 056438a7f4 security updates, firewall note 2014-10-07 11:44:51 -07:00
Robin Ward 1c57a60822 Also import Q+A comments 2014-10-07 14:32:50 -04:00
Robin Ward 1252e7324f Added easy impersonate route while in development mode 2014-10-07 12:25:50 -04:00
Jeff Atwood 305830eb44 Merge pull request #2856 from awesomerobot/master
changes: topic title editor layout, badge alignment in scrolled header
2014-10-07 08:51:24 -07:00
Kris Aubuchon f4f6236902 changes: topic title editor layout, badge alignment in scrolled header 2014-10-07 11:41:04 -04:00
Régis Hanol c46b9c0ac3 FIX: allow admins to search users by email 2014-10-07 12:05:38 +02:00
Jeff Atwood e8563c7d57 tweaks to make flagging page better on mobile 2014-10-07 01:29:44 -07:00
Jeff Atwood 1146ad3a63 use proper trash watermark 2014-10-07 00:24:24 -07:00
Jeff Atwood 03d440095f clean up /about page styles on mobile 2014-10-07 00:18:54 -07:00
Jeff Atwood a0d78290f2 incorrect fix for avatar height in topic map 2014-10-07 00:03:39 -07:00
Sam a7618ec4f6 FIX: select + replies could not be selected 2014-10-07 16:53:19 +11:00
Sam 620c3b3dcd UX: improve select2 category picker styling 2014-10-07 16:28:11 +11:00
Sam 0378dca66f FIX: dismissed banner topic returned after saving user profile 2014-10-07 16:11:19 +11:00
Sam 836bc0f935 FIX: incorrect edit notification in user stream
FIX: missing edit notifications when post edited by multiple users
2014-10-07 15:57:48 +11:00
Sam dde8ae7e96 FIX: analytics universal not sending correct location 2014-10-07 12:23:04 +11:00
Sam 4e2f1811ca a bit hackish, override fa-certificate for default icon (it is set by pg in the column default) 2014-10-07 12:01:06 +11:00
Sam dba1616762 FIX: blank page on user page in rare cases 2014-10-07 11:43:17 +11:00
Jeff Atwood b4c38dbc5a correct star spacing for topics with no category 2014-10-06 16:19:27 -07:00
Jeff Atwood 7c386035d1 remove float-left from title-wrapper 2014-10-06 16:02:16 -07:00
Jeff Atwood 8474e3b77f oops 2014-10-06 15:33:25 -07:00
Jeff Atwood 93e7aa832c tweaks to has-category docked layout 2014-10-06 15:32:38 -07:00
Robin Ward e383a8ab01 Merge pull request #2854 from techAPJ/patch-1
Feature: resend invites
2014-10-06 17:25:36 -04:00
Neil Lalonde 96e4d2b662 remove the notification_email_top customization 2014-10-06 17:00:20 -04:00
Neil Lalonde ad387a1150 FEATURE: posts will be deleted immediately if delete_removed_posts_after is set to 0 2014-10-06 16:30:07 -04:00
Robin Ward 76a9eca5b0 FIX: Malformed HTML really screws with the renderer 2014-10-06 16:29:13 -04:00
Robin Ward 52298faaa0 Revert "Revert "Add striped category badges under title""
This reverts commit 85b6b2550e.
2014-10-06 16:29:13 -04:00
Robin Ward 02814f0d89 Revert "Revert "new docked title category style - needs additional work""
This reverts commit e886cc2dad.
2014-10-06 16:29:13 -04:00
Régis Hanol aa3a658bb1 remove float from the 'show email' button on user's profile on mobile 2014-10-06 22:24:43 +02:00
Robin Ward e886cc2dad Revert "new docked title category style - needs additional work"
This reverts commit 43467a8aaa.
2014-10-06 16:13:51 -04:00
Robin Ward 85b6b2550e Revert "Add striped category badges under title"
This reverts commit 331e63e3af.
2014-10-06 16:13:51 -04:00
Arpit Jalan 78fd99fc40 Feature: resend invites 2014-10-07 01:43:17 +05:30
Robin Ward 379b810397 Merge pull request #2853 from techAPJ/patch-3
FIX: fix broken test
2014-10-06 15:59:16 -04:00
Robin Ward 331e63e3af Add striped category badges under title 2014-10-06 15:58:57 -04:00
Kris Aubuchon 43467a8aaa new docked title category style - needs additional work 2014-10-06 15:58:57 -04:00
Régis Hanol ac069d22a9 FIX: delete spammer modal doesn't show the email address 2014-10-06 21:55:52 +02:00
Arpit Jalan 20c2480eb3 FIX: fix broken test 2014-10-07 01:23:39 +05:30
Régis Hanol baee5c95ac add more context to allow better translation of 'max' in TL3 requirements 2014-10-06 21:32:19 +02:00
Jeff Atwood e301a89b3f optional_re shouldn't be included by default 2014-10-06 12:31:17 -07:00
Neil Lalonde 427487783b remove block_login? check from current user 2014-10-06 14:39:48 -04:00
Régis Hanol 67c10a7eab UX: add topic admin button to the bottom of the topic 2014-10-06 20:19:07 +02:00
Robin Ward b1271ed44b FIX: Remove html entities from text emails 2014-10-06 13:57:38 -04:00
Robin Ward 55fc54fe69 Merge pull request #2844 from akshaymohite/optimization-fixes
raise migration error in development if pending migrations
2014-10-06 13:35:53 -04:00
Robin Ward d82767fbdf Merge pull request #2845 from akshaymohite/access-specifiers-fix
Fix access specifiers with private_class_methods instead of removing dir...
2014-10-06 13:34:29 -04:00
Robin Ward 318286dc7c Merge pull request #2847 from techAPJ/patch-2
Improve email_subject setting copy
2014-10-06 13:33:15 -04:00
Jeff Atwood 948f4a59e9 Merge pull request #2852 from awesomerobot/master
restructuring post titles a bit
2014-10-06 09:57:00 -07:00