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
25,103 Commits 1,018 Branches 579 Tags
3c8b376e4ad1dc2e72c3a8429cc3f170794ff9ec
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Atwood ff5a7e8945 Merge pull request #4992 from awesomerobot/master 
mildly lighter @mention
 2017-07-24 19:53:48 -07:00
Jeff Atwood df653a2350 Merge pull request #4991 from awesomerobot/master 
fixing @mention color
 2017-07-24 18:33:00 -07:00
Jeff Atwood 9e0381396f adjust markdown for account required message 2017-07-23 12:49:39 -07:00
Jeff Atwood bc9270defb filetype comparison needs to be case insensitive 2017-07-22 13:18:15 -07:00
Jeff Atwood 4c7b725e19 remove quote marks from search term result page 2017-07-21 12:35:30 -07:00
Jeff Atwood 18d1ff0c0a Merge pull request #4980 from cpradio/fix-ol-margin-padding 
Fix ol margin/padding so it displays ordered lists without cutting them off.
 2017-07-20 13:58:17 -07:00
Jeff Atwood 5be9bee230 safe to default to read only off during backups 2017-07-12 04:52:17 -07:00
Jeff Atwood f585f2cca5 switch to H4 for invite body title copy 2017-07-11 15:05:07 -07:00
Jeff Atwood 9e91d137e3 switch to h4 for invite body title copy 2017-07-11 15:04:04 -07:00
Jeff Atwood 40646ebe1f Merge pull request #4949 from andrewschleifer/INSTALL-cloud 
Re-order list to match Droplet creation screen
 2017-07-03 13:41:12 -07:00
Jeff Atwood 38950cdc10 add missing span tags to new topic btn 2017-06-27 02:47:10 -07:00
Jeff Atwood bfd892bbbc better responsive layout for new topic btn 2017-06-23 01:52:09 -07:00
Jeff Atwood 8c9e24e9b0 override desktop styles for mobile topic admin 2017-06-23 00:59:53 -07:00
Jeff Atwood c1c778f1e5 move mobile topic admin button to bottom 2017-06-23 00:36:50 -07:00
Jeff Atwood 0dd1d736c8 user stream UI should match time color 2017-06-20 17:19:53 -07:00
Jeff Atwood 1c688c9eae copyedit on login help text 2017-06-19 03:08:20 -07:00
Jeff Atwood 5ff986129a copyedit to unsubscribe email 2017-06-09 00:27:24 -07:00
Jeff Atwood 33e3746d4d Merge pull request #4916 from pfaffman/patch-1 
Typo: I've been staring at this thing starting for weeks
 2017-06-08 13:17:30 -07:00
Jeff Atwood ba578f2aa9 Merge pull request #4900 from barryvan/patch-1 
Clarify category tag settings text
 2017-06-05 14:22:25 -07:00
Jeff Atwood 5b0e8d3b0b copyedit on download button 2017-06-01 19:51:30 -07:00
Jeff Atwood 9fd35e6d6a minor copyedit on site assets topic 2017-06-01 15:57:44 -07:00
Jeff Atwood 9c40b6c1ec Merge pull request #4894 from jomaxro/patch-1 
Fix typo in transifex instructions
 2017-05-31 23:30:00 -07:00
Jeff Atwood 6a746c931a add vandalism cue to spam flag 2017-05-20 11:31:20 -07:00
Jeff Atwood 393c060047 use moon glyph to denote "later today" 2017-05-19 17:02:00 -07:00
Jeff Atwood 387cad693e "next month" doesn't need time fidelity 2017-05-18 23:29:37 -07:00
Jeff Atwood ef2811f39a simplify time formats for set topic timer 2017-05-18 17:14:07 -07:00
Jeff Atwood 5b73da9c87 add Seth Godin's text for daily email limits 2017-05-17 01:26:15 -07:00
Jeff Atwood db06dd8032 remove labels from tag edit buttons in header 2017-05-17 01:18:31 -07:00
Jeff Atwood be722543c1 less scary warning for email daily limit reached 2017-05-16 20:02:21 -07:00
Jeff Atwood 83d3938df9 remove welcome invitation to reply 
.. not needed in a post-discobot world of 1.8 release
 2017-05-16 15:29:11 -07:00
Jeff Atwood 3958b87c5c Merge pull request #4867 from punit2502/master 
Added Elastic Email
 2017-05-16 15:13:35 -07:00
Jeff Atwood b14ea0e751 forgot markdown text marker for log PM 2017-05-08 22:47:52 -07:00
Jeff Atwood cfb30bca80 UX: simplify delete gap style 2017-05-05 17:06:13 -07:00
Jeff Atwood 27e52bc66d user page stats too "buttony" 2017-05-05 15:36:13 -07:00
Jeff Atwood 9d7917f79d minor copyedit 2017-05-03 14:00:20 -07:00
Jeff Atwood 3460b506d8 copyedit on new user of the month PM 2017-05-01 17:38:20 -07:00
Jeff Atwood 0b24cc8541 fix invite description 2017-05-01 16:41:19 -07:00
Jeff Atwood ee3d4f2a27 add link to flags nag copy 2017-05-01 12:14:17 -07:00
Jeff Atwood a4815047c0 purge scheduler_stats every 1 month instead of 3 2017-04-28 15:05:15 -07:00
Jeff Atwood a26483bfd6 missed a file again 2017-04-27 16:39:27 -07:00
Jeff Atwood 52007222fc more realistic maximum password values 2017-04-27 16:38:50 -07:00
Jeff Atwood cc5f3273dc Merge pull request #4842 from chrisbeach/master 
Admin button "Change Timestamp" should read "Change Timestamp..."
 2017-04-26 14:53:09 -07:00
Jeff Atwood de25f91cd4 Merge pull request #4834 from gschlager/phpbb3 
phpBB3 importer: Disable file size validators during import
 2017-04-25 16:15:56 -07:00
Jeff Atwood 644c15926a Merge pull request #4832 from cpradio/float-banner-close-button-right 
UX: Change banner close button to be floated to the right
 2017-04-24 18:29:34 -07:00
Jeff Atwood 6d6e208037 Merge pull request #4828 from cpradio/normal-reply-state 
FEATURE: Add normal as a preference for topic subscription state when replying to a topic
 2017-04-20 21:24:13 -07:00
Jeff Atwood 8090e2844c Merge pull request #4822 from cpradio/fix-auto-notification-updating 
FIX: Correct behavior of auto-notification state updating to exclude …
 2017-04-19 03:38:34 -07:00
Jeff Atwood 8440ea3a56 Merge pull request #4820 from jomaxro/patch-2 
Small copy edit for tracking notification reasons
 2017-04-17 21:39:00 -07:00
Jeff Atwood dae3f9a69e Merge pull request #4813 from davidtaylorhq/theme_keys_fix 
FIX: Corrects typo to avoid error 500 on theme change
 2017-04-14 17:25:15 -07:00
Jeff Atwood d12ba0548c Merge pull request #4812 from cpradio/spec-auto-notification-update 
Add spec for auto notification update
 2017-04-14 16:01:38 -07:00
Jeff Atwood ecace5085c Merge pull request #4811 from cpradio/update-auto-notification 
FIX: Update auto_notification to also update the subscription state when replying if the current state is less than the state being requested
 2017-04-14 12:50:49 -07:00
Jeff Atwood 3a235d1241 clarify on disk space requirements for install 2017-04-11 16:36:47 -07:00
Jeff Atwood c6cd25b0ff Update README.md 2017-04-11 15:11:50 -07:00
Jeff Atwood 549aa9204c typo fix 2017-03-31 23:37:48 -07:00
Jeff Atwood 3b64aeaf21 loosen new user of the month criteria slightly 2017-03-31 16:33:50 -07:00
Jeff Atwood c58f9d37ae copyedits on New User of the Month 2017-03-31 16:28:29 -07:00
Jeff Atwood 2fd1c49b88 we don't need this IE 10 tag any more, see 
http://stackoverflow.com/questions/26346917/why-use-x-ua-compatible-ie-edge-anymore
 2017-03-31 00:12:07 -07:00
Jeff Atwood 0f9fb01c6b Merge pull request #4766 from davidtaylorhq/twitter_onebox_fixes 
Twitter onebox improvements
 2017-03-17 14:04:55 -07:00
Jeff Atwood 63c8b23690 minor copyedits in guidelines 2017-03-16 13:36:27 -07:00
Jeff Atwood 0bfc8104ad add cc mention to mailgun 2017-03-06 12:38:02 -08:00
Jeff Atwood a3ca6d8d66 improve SPF/DKIM instructions 2017-03-06 12:36:13 -08:00
Jeff Atwood 3be01c9678 minor copyedit 2017-03-02 04:25:01 -08:00
Jeff Atwood 0e6c99859f improve setup wizard copy slightly 2017-03-01 16:27:21 -08:00
Jeff Atwood e4f38fd795 copyedit on wizard site banner 2017-03-01 16:09:09 -08:00
Jeff Atwood ea9929cf58 add stronger backup download language 2017-03-01 15:16:05 -08:00
Jeff Atwood ad6cb3c638 force all iOS editors to minimum height for compat 2017-02-22 16:56:19 -08:00
Jeff Atwood 22fc761cc3 tweak iOS composer heights a bit 2017-02-22 15:48:39 -08:00
Jeff Atwood c191e2e84c more conservative editor heights on iOS 2017-02-21 16:25:46 -08:00
Jeff Atwood 4f32d9e9f7 Merge pull request #4713 from vvanpo/master 
desktop/topic.scss: fix responsive width
 2017-02-19 20:27:12 -08:00
Jeff Atwood 6212016688 remove "invitation is from a trusted user" copy 2017-02-16 17:09:39 -08:00
Jeff Atwood 9b263a0559 increase req min unique pw chars from 5 to 6 2017-02-16 17:06:19 -08:00