IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,779 Commits 1,018 Branches 579 Tags
3874d40910efb100fecdb975fe700b6e7b4f1ed6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Atwood 9ee32ad03e UX: don't repeat category name in topnav 2018-07-12 16:52:48 -07:00
Jeff Atwood 033ca0e605 Merge branch 'master' of https://github.com/discourse/discourse 2018-07-12 15:50:36 -07:00
Jeff Atwood 21de8411c9 some badge copy grooming 2018-07-12 15:50:34 -07:00
Jeff Atwood 7dce8290ed copyedit on category drop down 2018-06-26 12:43:45 -07:00
Jeff Atwood 67a986f30d centralize trust level doc to blog 2018-06-25 17:34:47 -07:00
Jeff Atwood 7059d90dee Merge branch 'master' of https://github.com/discourse/discourse 2018-06-23 22:29:18 -07:00
Jeff Atwood 549a47e801 copyedit on TL1 welcome (again) 2018-06-23 22:29:13 -07:00
Jeff Atwood d634486870 copyedit on TL1 congrats PM 2018-06-23 14:30:04 -07:00
Jeff Atwood c2ddad696f Merge pull request #6024 from carrodher/patch-1 
Update Ruby requirements in docs/INSTALL.md
 2018-06-21 13:15:21 -07:00
Jeff Atwood ab48664f79 Merge pull request #6014 from jtlindsey/patch-1 
Updated Elastic Email Pricing for clarity
 2018-06-19 15:52:24 -07:00
Jeff Atwood 0dee603ffc Merge pull request #5985 from featheredtoast/pm-participants-two-lines 
FIX: PM participants listed inline
 2018-06-11 18:33:15 -07:00
Jeff Atwood 4329b484e8 minor copyedit on dashboard chart title 2018-05-18 16:04:33 -07:00
Jeff Atwood 7195bdf025 very minor copyedit 2018-05-16 16:08:14 -07:00
Jeff Atwood dcf97ca559 Merge pull request #5834 from riking/admin-users-groups 
UX: Add link to /groups from Admin>Users
 2018-05-16 10:24:21 -07:00
Jeff Atwood c0a87f1fbf very minor copyedit 2018-05-15 15:22:46 -07:00
Jeff Atwood a041a42645 Merge pull request #5831 from discourse/jomaxro-patch-1 
Fix What's New Link
 2018-05-15 14:05:17 -07:00
Jeff Atwood 50a2508604 minor copyedit 2018-05-03 02:31:18 -07:00
Jeff Atwood f0bdca87d8 improve help copy on enable local logins 2018-04-28 23:27:16 -07:00
Jeff Atwood 64f1480cc0 typo 2018-04-26 14:31:28 -07:00
Jeff Atwood 2d1d2baab2 add DNS instructions 2018-04-26 14:24:34 -07:00
Jeff Atwood 00a0a9ac52 Merge pull request #5791 from yanokwa/patch-1 
Correct spelling errors
 2018-04-26 13:02:55 -07:00
Jeff Atwood 0cad5b2125 missed a file somehow 2018-04-25 12:47:09 -07:00
Jeff Atwood 6fae1cee34 better help for typographer setting 2018-04-25 12:46:45 -07:00
Jeff Atwood 2e1454a6e2 very minor copyedit 2018-04-18 02:08:26 -07:00
Jeff Atwood 1b9647d124 minor copyedit 2018-04-18 01:04:14 -07:00
Jeff Atwood ec7448bd1b shorten copy from "is replying..." to "replying..." 2018-04-17 17:12:45 -07:00
Jeff Atwood bf2574ee76 very minor copyedit (part deux) 2018-04-15 03:44:23 -07:00
Jeff Atwood 9642240a18 very minor copyedit 2018-04-15 03:38:53 -07:00
Jeff Atwood e79c92c0e1 minor copyedit 2018-04-11 20:25:43 -07:00
Jeff Atwood 3d5a55b55b update copy for post hidden twice 2018-04-11 18:28:19 -07:00
Jeff Atwood 131b19c26b move like count a tad closer to like glyph 2018-03-29 16:36:59 -07:00
Jeff Atwood 656da091b6 very minor typo in copy 2018-03-29 15:01:43 -07:00
Jeff Atwood e591f08495 remove "for today" text from rate limit copy 2018-03-29 15:00:42 -07:00
Jeff Atwood 786dd88e5a copyedit: put back copy accidentally removed 2018-03-25 00:58:26 -07:00
Jeff Atwood 3b71abb0e2 very minor copyedits 2018-03-25 00:53:32 -07:00
Jeff Atwood 90af1659ff very minor copyedits on 2fa 2018-03-22 17:17:47 -07:00
Jeff Atwood 1d3a142f35 minor copyedits 2018-03-22 15:27:07 -07:00
Jeff Atwood 448f4afa68 copyedits on login via email link 2018-03-22 04:19:34 -07:00
Jeff Atwood 096c3a0bf8 copyedits on 2 factor auth 2018-03-22 03:39:06 -07:00
Jeff Atwood 337a301a57 missing file in commit 2018-03-22 02:22:25 -07:00
Jeff Atwood d7c2d2edb8 remove extraneous "click to show" copy 2018-03-22 02:19:57 -07:00
Jeff Atwood 158286287a Delete INSTALL-digital-ocean.md 2018-03-15 19:04:45 -07:00
Jeff Atwood 19baf3d150 Update AUTHORS.md 2018-03-15 19:02:01 -07:00
Jeff Atwood 9522469f6a Merge pull request #5664 from dbnicholson/robots-no-uploads 
Prevent robots from indexing uploads
 2018-03-09 13:33:34 -08:00
Jeff Atwood fb77a6eb49 minor copyedit 2018-03-07 14:51:26 -08:00
Jeff Atwood 4132c37add increase grace period max diff to 100 chars 2018-03-07 01:45:48 -08:00
Jeff Atwood 6c29908ba2 very minor copyedits 2018-02-20 00:44:56 -08:00
Jeff Atwood c8cf034092 Merge pull request #5602 from pfaffman/patch-1 
Update INSTALL-cloud.md to reflect new options
 2018-02-16 16:29:01 -08:00
Jeff Atwood ed242d18c3 Merge pull request #5563 from riking/patch-6 
Update default linkify TLDs to top 15
 2018-02-02 21:19:17 -08:00
Jeff Atwood 7b05b12d3c Merge pull request #5515 from mpalmer/iam-profile-description 
UX: Improve description of s3_use_iam_profile
 2018-01-20 01:50:08 -08:00
Jeff Atwood 7ed41fae2b Merge pull request #5493 from notriddle/home_logo_h1 
Change the text-only home logo to an H1
 2018-01-18 16:14:36 -08:00
Jeff Atwood dcbaf2f213 copyedit: personal, not private, message throughout 2018-01-11 16:04:14 -08:00
Jeff Atwood 070fe12e25 Merge pull request #5464 from techAPJ/100k-format 
UX: for numbers greater than 100k allow 0 precision
 2018-01-02 00:24:05 -08:00
Jeff Atwood 3bc53f2946 very minor copyedit 2017-12-21 18:37:14 -08:00
Jeff Atwood 2a8da9a9cb minor copyedit on google id conflict message 2017-12-21 18:36:02 -08:00
Jeff Atwood cedfd6b68c Merge pull request #5449 from Supermathie/google_fix 
FIX: google oauth flow should automatically update the google account used for login when appropriate
 2017-12-21 17:46:43 -08:00
Jeff Atwood ba3bf9c7bb minor copyedit 2017-12-20 21:32:54 -08:00
Jeff Atwood bcd57d72a9 Merge pull request #5389 from vinothkannans/clip-master 
FIX: Skip pasting files if plain text available in clipboard
 2017-12-01 16:41:39 -08:00
Jeff Atwood cf2ff76d09 FEATURE: link to meta release notes tag in version release email text 2017-12-01 12:55:03 -08:00
Jeff Atwood 3e42dceaae "reply to which topic" needs wider buttons 2017-11-30 23:25:32 -08:00
Jeff Atwood c888ee57f0 tags default text was too wordy 2017-11-30 23:20:10 -08:00
Jeff Atwood a1c6bd47a7 copyedits to advanced search text 2017-11-30 01:43:21 -08:00
Jeff Atwood f00b9b15e2 Merge pull request #5326 from discourse/mobile-fix 
mobile topic adjustments
 2017-11-17 14:09:31 -08:00
Jeff Atwood 49790cc05f Merge pull request #5317 from awesomerobot/master 
fixing some button issues on mobile posts
 2017-11-15 12:02:40 -08:00
Jeff Atwood 030c141383 Merge pull request #5310 from quimgil/quimgil-patch-1 
FIX: Changing misattributed Mahatma Gandhi's quote
 2017-11-13 15:52:33 -08:00
Jeff Atwood 832cce8d0d Merge pull request #5309 from awesomerobot/master 
fixing category delete modal background color
 2017-11-13 14:30:03 -08:00
Jeff Atwood d7dbda1503 Merge pull request #5302 from awesomerobot/master 
bringing mobile topic statuses to parity with desktop
 2017-11-10 13:56:32 -08:00
Jeff Atwood e1e6f46d26 Consistent copy for usercard (all past tense verbs) 2017-11-09 07:56:47 -08:00
Jeff Atwood 0efed546a1 minor copyedit on new usercard read time 2017-11-08 16:28:57 -08:00
Jeff Atwood 138e8dc3e3 Merge pull request #5288 from awesomerobot/master 
fixing the "me" color in the directory
 2017-11-03 14:27:55 -07:00
Jeff Atwood b1ec4e17d9 Merge pull request #5271 from awesomerobot/master 
updating banner style, fixes banner on dark themes
 2017-10-26 21:50:58 -07:00
Jeff Atwood ffd4f62543 Merge pull request #5266 from discourse/jomaxro-patch-1 
Change defer flag to ignore flag
 2017-10-25 20:35:24 -07:00
Jeff Atwood c1c03d8de0 Merge pull request #5233 from pfaffman/tweak-install-email 
move mailgun to top--elastic email seems to confuse people
 2017-10-17 13:26:07 -07:00
Jeff Atwood 04de37555f Merge pull request #5221 from pfaffman/fix-discourse-restore 
Tweak error messages for restore
 2017-10-03 16:37:53 -07:00
Jeff Atwood 45822e93e9 Merge pull request #5220 from Supermathie/master 
Update developer instructions so they work!
 2017-10-03 16:09:56 -07:00
Jeff Atwood 3cbe296dc3 Merge pull request #5206 from discourse/jomaxro-patch-2 
Move staged below active
 2017-09-26 13:47:16 -07:00
Jeff Atwood fda65a52ea Merge pull request #5204 from discourse/web-share 
FEATURE: Use new WebShare API on supported platforms
 2017-09-26 02:16:54 -07:00
Jeff Atwood dd101e4f1d Merge pull request #5189 from discourse/jomaxro-patch-1 
Add CSS targets to nav pills
 2017-09-15 12:01:41 -07:00
Jeff Atwood a11a948e24 Merge pull request #5184 from pfaffman/patch-1 
INSTALL-cloud: you can re-run discourse-setup
 2017-09-14 14:06:13 -07:00
Jeff Atwood 9dc5bf1d97 minor copyedits 2017-09-13 17:39:15 -07:00
Jeff Atwood 11cc8ff52d Merge pull request #5181 from vinothkannans/image-placeholder-styling 
UX: Placeholder images color changed & tootip added
 2017-09-13 02:49:34 -07:00
Jeff Atwood f14f8d756f Merge pull request #5149 from davidtaylorhq/presence-translations 
Simplify presence copy & add transifex config
 2017-09-07 16:50:02 -07:00
Jeff Atwood 5aba30ede6 description wasn't checked in. ???? 2017-09-06 18:46:40 -07:00
Jeff Atwood 27e4baf357 minor copyedits on visit days badges 2017-09-06 15:01:04 -07:00
Jeff Atwood 77a4968272 Merge pull request #5107 from gschlager/phpbb3 
phpBB3 importer: Fix validation of site settings
 2017-08-28 16:52:50 -07:00
Jeff Atwood e8a2aaafeb add quotes to toolbar details insertion 2017-08-24 17:04:46 -07:00
Jeff Atwood c8ce3c6dee make composer edu panel close button more visible 2017-08-24 13:49:33 -07:00
Jeff Atwood ab017c90c8 improved email bad destination error copy 2017-08-23 20:04:31 -07:00
Jeff Atwood 42c1b7e6e0 Merge pull request #5068 from xrav3nz/fix-user-page-layout 
last attempt at fixing user page layout
 2017-08-18 20:47:49 -07:00
Jeff Atwood d84f105288 Merge pull request #5060 from xrav3nz/fix-user-activity-word-wrap-take-2 
fixes overflowing div width on user activity page
 2017-08-17 22:48:52 -07:00
Jeff Atwood 8f795b35bb missed a spot on email invite h4 to bold conversion 2017-08-16 16:43:14 -07:00
Jeff Atwood dd2ec7d463 Merge pull request #5051 from jomaxro/patch-1 
Add specific class to site description on /about
 2017-08-15 16:54:58 -07:00
Jeff Atwood e50cad3338 minor 404 page copyedits 2017-08-15 15:29:59 -07:00
Jeff Atwood b900f1b9d5 minor improvements to setup wizard copy 2017-08-10 16:32:56 -07:00
Jeff Atwood 112133736b soften the auto-hiding PM message a bit 2017-08-10 15:34:32 -07:00
Jeff Atwood c1228dab25 improve discobot onebox link help 2017-08-10 14:15:30 -07:00
Jeff Atwood 2f36b7eae1 Merge pull request #5020 from begrif/user_website 
Website RE validator without a 10 char limit on TLD.
 2017-08-02 00:34:54 -07:00
Jeff Atwood 3538b63305 FIX: on desktop, anon topic reply btn too far over 2017-08-01 16:47:52 -07:00
Jeff Atwood 13bb69baca switch from h4 to bold for invite headers 2017-08-01 16:39:59 -07:00
Jeff Atwood 5b72844a9f Merge pull request #4999 from cpradio/fix-padding-for-ul 
Update ul padding/margin to match ol.
 2017-07-25 16:06:18 -07:00