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

9808 Commits

Author SHA1 Message Date
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
Benjamin Kampmann b942dbfb43 remove block from views so Ember doesn't complain 2014-06-27 10:49:25 +02:00
Jeff Atwood 0051cd8919 better copy for email errors 2014-06-26 16:05:14 -07:00
Régis Hanol 462532dfdb OOOPS: I CAN'T CODE (:fired:) 2014-06-27 00:04:48 +02:00
Neil Lalonde b69bc5a5f5 Trust level 3 measurements redone 2014-06-26 17:33:22 -04:00
Robin Ward 0289e60a25 Merge pull request #2476 from techAPJ/suppress-invite-search 
FIX: show search filter only when invites are greater than or equal to ten
 2014-06-26 15:02:24 -04:00
Arpit Jalan 46f734bb83 FIX: show search filter when invites are greater than ten 2014-06-27 00:22:08 +05:30
Régis Hanol c0cd109e9d TRIVIAL: code formatting 2014-06-26 19:50:29 +02:00
Ben Lubar 1dafad580d set import_id on imported posts 2014-06-26 12:33:56 -05:00
Robin Ward 6907739a0b Merge pull request #2474 from techAPJ/add-topic-id-to-bulk-invite 
FEATURE: Add topic invitation support to Bulk Invite
 2014-06-26 13:30:30 -04:00
Arpit Jalan dad2d34d02 Refactor methods post feedback 2014-06-26 22:50:09 +05:30
Régis Hanol ee1d78c73e BUGFIX: edit history on wiki posts should be visible 2014-06-26 19:19:35 +02:00
Robin Ward 07cb3aff97 We shouldn't have to redeclare tab panels in the category edit menu 2014-06-26 12:30:07 -04:00
Andrew Bezzub 386d1e231a move profile_background from User to UserProfile 2014-06-26 12:30:07 -04:00
Arpit Jalan 52f9984804 FEATURE: Add topic invitation support to Bulk Invite 2014-06-26 20:46:53 +05:30
Jeff Atwood 00910679ad more topic summary tweaks 2014-06-26 00:46:22 -07:00
Sam 24ddb6cfad FIX: Bold, italic should not expect a space boundary 2014-06-26 17:45:51 +10:00
Jeff Atwood 7a65ee3282 convert topic summary links to <table> 2014-06-26 00:08:29 -07:00
Sam b8357aa90a BUGFIX: newline after bold was not producting a BR 2014-06-26 15:28:08 +10:00
Sam dd8a06187a FIX: Invalid URLs cause post not to save 2014-06-26 11:38:23 +10:00
Sam 6527862195 Remove fragile spec 2014-06-26 10:21:19 +10:00
Sam 2bf22e8475 Merge pull request #2473 from riking/patch-1 
Only give necessary context
 2014-06-26 10:03:33 +10:00
Kane York 6f5b58969b Only give necessary context 2014-06-25 17:01:23 -07:00
Sam 6559de0085 Chinese search tests 2014-06-26 09:58:49 +10:00
Sam e05aa9bdc8 Stop spamming mods even on exceptional cases 2014-06-26 09:58:37 +10:00
Sam 67804cb56b Merge pull request #2465 from riking/email_rejections 
Give specific message for each kind of email rejection
 2014-06-26 09:55:24 +10:00
Régis Hanol 87c0c5d6f9 TRIVIAL: we might run the task after disabling s3 storage 2014-06-25 23:16:04 +02:00