Commit Graph

7320 Commits

Author SHA1 Message Date
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
riking
dc230cb7e4 Only warn about necromancy when replying 2014-03-19 17:04:42 -07:00
Robin Ward
52fbce07ed Add emoji style for blogs 2014-03-19 17:51:41 -04:00
Neil Lalonde
342d09bc34 FIX: support sso_url that has query params 2014-03-19 17:14:31 -04:00
Robin Ward
faaada6e8a Consider URLs the same even with a trailing slash 2014-03-19 16:33:21 -04:00
Archon
02965515e9 Update client.id.yml 2014-03-19 21:02:15 +01:00
Archon
57945c30f6 Update client.en.yml 2014-03-19 21:01:22 +01:00
Robin Ward
d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Régis Hanol
44888f7acc FEATURE: upload button on mobile composer 2014-03-19 18:34:08 +01:00
Neil Lalonde
a74764c833 Log when facebook doesn't provide an email address 2014-03-19 13:31:17 -04:00
Aselox
8b4dff9f0c Create server.it.yml 2014-03-19 17:00:20 +01:00
Neil Lalonde
7780013c3a Seed categories in transactions 2014-03-19 12:00:13 -04:00
Aselox
5e83ac9fa4 Create client.it.yml 2014-03-19 16:54:49 +01:00
Aselox
62d0ae4a30 Update server.it.yml 2014-03-19 16:51:46 +01:00
Aselox
e34b18fcc8 Update client.it.yml 2014-03-19 16:49:53 +01:00
Robin Ward
51e3d72461 Merge pull request #2141 from riking/correctness
Lots of JS correctness fixes
2014-03-19 11:20:15 -04:00
Robin Ward
7f0b181677 Merge pull request #2144 from nbalonso/spanish-translation
Poll - Spanish Translation
2014-03-19 11:18:16 -04:00
Robin Ward
fe0466f880 Merge pull request #2145 from czarneckid/add-foreman-gem
Adding foreman gem to development group
2014-03-19 11:17:22 -04:00
Neil Lalonde
c708d6fcb8 FIX: post_mover_spec needs to order posts 2014-03-19 11:05:18 -04:00