Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,384 Commits 245 Branches 500 Tags 893 MiB
Commit Graph

9384 Commits

Author SHA1 Message Date
Robin Ward 0f52f26587 TWEAK: Don't show subcategory topic definitions when viewing a category list. 2014-06-30 15:22:40 -04:00
Robin Ward 952426d358 FEATURE: Uploaded images to categories are shown when browsing 2014-06-30 14:14:00 -04:00
Robin Ward e22688a204 FEATURE: Can upload images to categories 2014-06-30 14:14:00 -04:00
Robin Ward 9000c358d1 REFACTOR: Use common path for RESTful `DELETE` action from upload image 
component
 2014-06-30 14:13:59 -04:00
Robin Ward 3cbb32cc20 REFACTOR: uploading avatar should share code with upload component 2014-06-30 14:13:59 -04:00
Robin Ward 4088fba4f2 REFACTOR: Convert profile background uploader to be an ember component 2014-06-30 14:13:59 -04:00
Régis Hanol 06880c28f8 Merge pull request #2485 from awesomerobot/master 
fixing alignment on topic list category buttons
 2014-06-30 17:58:04 +02:00
Kris Aubuchon 63d0485b49 fixing alignment on topic list category buttons 2014-06-30 11:31:17 -04:00
Régis Hanol dcd0b8fecf BUGFIX: no translation for email_error_notifications to admin users 2014-06-30 15:21:26 +02:00
Régis Hanol 37d4324af3 Merge pull request #2484 from techAPJ/update-translations-6 
Update Translations
 2014-06-30 14:42:23 +02:00
Arpit Jalan 923fa4646b Update Translations 2014-06-30 16:21:43 +05:30
Régis Hanol a19f52fc91 BUGFIX: fix borders & rounded corners in the composer 2014-06-30 12:34:40 +02:00
Jeff Atwood f8f79b9388 remove orphaned blockquote sizing 2014-06-30 03:03:54 -07:00
Jeff Atwood d2cf921791 blockquote, *:first-child and *:last-child spacing 2014-06-30 02:42:49 -07:00
Jeff Atwood d379012dbc centralize shared .cooked and #wmd-preview styles 2014-06-30 02:06:13 -07:00
Jeff Atwood 37df22eac6 suppress h1,h2,h3 top margin in quotes 2014-06-30 00:58:27 -07:00
Jeff Atwood 5eef1e0b59 fix blockquote as first element in post 2014-06-30 00:51:24 -07:00
Sam 90d7718103 add search filter 2014-06-30 17:18:08 +10:00
Jeff Atwood b2d6e2aa43 update to normalize.css 3.0.1 (from 2.1.0) 2014-06-30 00:14:02 -07:00
Jeff Atwood 0ffe77d7dc correct h1 line-height, centralize .cooked styles 2014-06-30 00:05:24 -07:00
Sam e2e36a6df3 FIX: bold and italic handling improved 2014-06-30 17:01:46 +10:00
Jeff Atwood 7da8144c74 downsize fixed header title size 1.8em to 1.6em 2014-06-29 23:00:34 -07:00
Sam 777371bf14 Merge pull request #2480 from vikhyat/badge-system 
Add consistency check to revoke invalid badges
 2014-06-30 14:13:12 +10:00
Sam d05fd7f837 FIX: Slim is no longer required for Sidekiq Web 2014-06-30 12:33:04 +10:00
Sam 86383e1241 Merge pull request #2483 from jkingdon/jkingdon/remove-silly-patch 
Remove silliness
 2014-06-30 12:13:57 +10:00
Jim Kingdon 78f6943e8f Replaced by `bundle config local.logster ../logster` 2014-06-29 17:38:29 -07:00
Jeff Atwood 73ed42cc4b correct top alignment of gutter watermark 2014-06-29 15:54:19 -07:00
Jeff Atwood 2c54962ced Merge pull request #2482 from awesomerobot/master 
fixed height header, topic map alignment
 2014-06-29 11:54:50 -07:00
Kris Aubuchon 5ddcad19c9 fixed height header, topic map alignment 2014-06-29 10:39:31 -04:00
Jeff Atwood 10635bcd86 fix #simple-container for mobile 2014-06-29 03:26:48 -07:00
Jeff Atwood 56716a1f91 fix alert success bootbox modal on mobile 2014-06-29 03:19:09 -07:00
Jeff Atwood 6bb17b7214 x is no sexy, × is yes sexy 2014-06-28 02:17:18 -07:00
Jeff Atwood c67c88cee8 add sexy sexy download icon to expanded post images 2014-06-28 01:30:35 -07:00
Jeff Atwood 4a5a428ff6 Merge pull request #2481 from awesomerobot/master 
making menu highlights consistent
 2014-06-27 17:20:02 -07:00
Kris Aubuchon 51f85206ff making menu highlights consistent 2014-06-27 20:10:33 -04:00
Jeff Atwood a886261f75 turns out we had a mixin for unselectable 2014-06-27 16:54:36 -07:00
Neil Lalonde 807bfbd9bb FEATURE: Trust level 3 promotion and demotion. Job is disabled for now. 2014-06-27 18:42:03 -04:00
Jeff Atwood f49b661a0d use modern/current vendor prefixes 2014-06-27 15:36:12 -07:00
Jeff Atwood 224ae7fc92 don't let topic-progress be selected 2014-06-27 15:28:22 -07:00
Vikhyat Korrapati 228a2a8992 Show number of grants on the admin badge pages. 2014-06-28 01:24:07 +05:30
Vikhyat Korrapati 0d16ae0ecf Fix typo. 2014-06-28 01:24:07 +05:30
Vikhyat Korrapati 83749779cc Add consistency check to revoke duplicate badges. 2014-06-28 01:24:00 +05:30
Vikhyat Korrapati 2e52f795ea Backend changes to support improved badge pages. 2014-06-28 01:24:00 +05:30
Robin Ward 386a45aab7 Merge pull request #2479 from vikhyat/badge-system 
Badge system updates
 2014-06-27 15:09:04 -04:00
Robin Ward 380bfd0819 Merge pull request #2478 from riking/patch-email 
Fix email code & tests
 2014-06-27 15:07:46 -04:00
riking da9048f3ea Fix email code & tests 2014-06-27 12:04:31 -07:00
Vikhyat Korrapati 23983efeea Don't grant multiple_grant badges multiple times for the same post. 2014-06-28 00:32:09 +05:30
Robin Ward 07d1be9104 Update onebox gem for more support, minor openssl bug 2014-06-27 12:20:35 -04:00
Robin Ward 85747137ef FIX: Put in admin title when browsing admin section 2014-06-27 11:58:46 -04:00
Robin Ward c6e08deee2 Merge pull request #2477 from ligthyear/fix-outlet-double-render 
Fix Plugin-Outlets: remove block from views so Ember doesn't complain
 2014-06-27 10:26:11 -04:00