Commit Graph

7438 Commits

Author SHA1 Message Date
Jeff Atwood 2a6849b387 add additional reply via email help text example 2014-03-21 23:41:33 -07:00
Jeff Atwood 43f2e5b747 make user setting desc less big/dark 2014-03-21 23:09:48 -07:00
Jeff Atwood 57f33686cc make setting descriptions less big/dark 2014-03-21 23:06:53 -07:00
riking 7237eb5e00 Shuffle around the order of site settings
The goal of this is twofold:
 - Make the more commonly changed settings higher
 - Find groups for more uncategorized settings

Additionally, the SEO category was deleted, its contents folded into Security and Spam.
2014-03-21 19:03:29 -07:00
riking f75a7f8832 Clean up site_settings.yml
- Hide several variables that the client does not use
 - Use concise default syntax when possible
2014-03-21 18:01:39 -07:00
Jeff Atwood 84a7d75828 clarity: change flag "Notify" to "Private message" 2014-03-21 13:02:27 -07:00
Neil Lalonde c3c5ac3ef7 Some tweaks to sub-category badges 2014-03-21 15:33:44 -04:00
Jeff Atwood 256186c836 Merge pull request #2162 from archon432/master
'Topics' are capitalized
2014-03-21 12:15:41 -07:00
Robin Ward 097125215a Merge pull request #2163 from awesomerobot/master
added the header shadow back in
2014-03-21 15:11:44 -04:00
Kris Aubuchon 3b8f6d3fe1 added the header shadow back in 2014-03-21 14:50:42 -04:00
Neil Lalonde c649959e34 Show parent category on category badges 2014-03-21 14:34:50 -04:00
Robin Ward 2842952a76 FIX: Update ember-cloaking. Should fix some vanishing posts 2014-03-21 14:30:03 -04:00
Robin Ward 539890afdf Let's not show tons of extra information about invites unless you're the
person who invited them.
2014-03-21 14:16:11 -04:00
Neil Lalonde e7ae0bba5f Update pt_BR translations from Transifex. Thanks, translators 2014-03-21 14:00:46 -04:00
Robin Ward c1b4f5b80b FIX: `sed` on OSX sucks and doesn't work with the same commands as on
most Linux machines. This regexp is compatible with both.
2014-03-21 11:57:33 -04:00
Régis Hanol e8c53d171a Merge pull request #2161 from awesomerobot/master
dialing back the animations I added previously
2014-03-21 14:54:16 +01:00
Kris Aubuchon 63eb7a60e5 dialing back the animations I added previously 2014-03-21 09:23:22 -04:00
Régis Hanol 88ba80b239 Merge pull request #2160 from borhub/fix-excessive-li-in-category-breadcrumb
Fix visual bug from excessive LIs being rendered around Category breadcrumbs
2014-03-21 10:00:04 +01:00
Sam 28ffb3025c Merge pull request #2150 from vikhyat/badge-system
Interface for granting/revoking badges from admin user page
2014-03-21 17:56:08 +11:00
Jeff Atwood c37b08908d Omitted is too fancypants. Say "hidden" instead 2014-03-20 23:25:20 -07:00
Boris 0a330544b3 Prevent rendering of excessive <li> wrapper around a category breadcrumb which already is a <li>.
The excessive <li> wrapper coming from the template is automatically closed by the browser during the HTML parsing step, causing an empty <li> being visible in the rendered source (preceding the first breadcrumb). This causes a visual bug when not using the default Discourse stylesheet, because the extra LI element pushes the content to the right and sometimes also renders an extra black pixel.
2014-03-21 16:58:06 +11:00
Sam 12513f430c thread_safe 0.3.0 DoA 2014-03-21 16:46:21 +11:00
Vikhyat Korrapati dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati 0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati 8163fcade7 Combobox view: escape name string. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati 50ce93a850 Use render_serialized for rendering instances in UserBadgeController. 2014-03-21 11:09:19 +05:30
Sam 2dc5e3c81e Merge pull request #2118 from vikhyat/firefox-middle-click
Fix Firefox middle-click popup blocker issue
2014-03-21 16:27:02 +11:00
Sam 0462969ba8 Merge pull request #2138 from chancancode/upgrade_4_0_4
Upgraded rails to 4.0.4
2014-03-21 16:20:59 +11:00
Sam 31ce05b5ae Merge pull request #2157 from Aselox/master
Updated Italian Translation + added Italian poll locales
2014-03-21 16:19:13 +11:00
Jeff Atwood dbf3d29d9e Merge pull request #2158 from awesomerobot/master
adding a few simple animations to the topic list loading spinner and modals
2014-03-20 13:42:05 -07:00
Kris Aubuchon ca4d211268 adding a few simple anmiations to the topic list loading message and modals 2014-03-20 16:33:03 -04:00
Robin Ward f12b2b45aa Version bump to v0.9.8.11 2014-03-20 16:26:03 -04:00
Robin Ward f1b11327dd Also link avatar to user profile 2014-03-20 16:12:41 -04:00
Robin Ward f2e17af130 Add staff and new user colours to embedded discourse. Also link
usernames to profiles.
2014-03-20 16:04:50 -04:00
Robin Ward ebb0661029 FIX: Should be `href` for the link 2014-03-20 15:37:00 -04:00
Robin Ward fa3e9144e2 FIX: Update links regardless of trailing slashes 2014-03-20 15:33:56 -04:00
Robin Ward a4daafa026 Support trailing `/` when retrieving comment counts. 2014-03-20 15:22:49 -04:00
Robin Ward b0a130db86 Precompile break_string 2014-03-20 14:50:34 -04:00
Robin Ward e8ee490778 Extract breaking up a string into a separate file, include it in
embedded view.
2014-03-20 14:34:51 -04:00
Aselox fa7e6e81b9 Fix poll server.it.yml 2014-03-20 19:13:50 +01:00
Robin Ward db8f4ea58f Don't show "in reply to" when there's a quote 2014-03-20 14:02:21 -04:00
Robin Ward 3fbb2cd728 Improve date displaying on embedded comments 2014-03-20 13:25:17 -04:00
Robin Ward e5cb1cac86 FIX: Weird spacing with lists in embedded comments 2014-03-20 11:20:12 -04:00
Robin Ward 83778138ad FIX: Discourse quoting class for embedded content 2014-03-20 11:11:33 -04:00
Robin Ward a22f6f6a02 Added `blockquote` class to embedded comments. 2014-03-20 11:08:30 -04:00
Robin Ward 375719edfb FIX: Links in the iframe should all be target=_blank 2014-03-20 10:57:36 -04:00
Jeff Atwood 764ba152d1 mobile notification options on own line 2014-03-19 21:43:28 -07:00
Sam 5c148faeb9 annotations were out of date 2014-03-20 15:35:51 +11:00
Sam c240fb0d83 BUGFIX: facebook does not always provide username
We key on facebook_user_id its the only thing that matters
2014-03-20 15:35:30 +11:00
Sam 619fa50d4b BUGFIX: twitter auth asking for a password 2014-03-20 14:49:25 +11:00