Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,927 Commits 240 Branches 500 Tags 896 MiB
Commit Graph

1731 Commits

Author SHA1 Message Date
Robin Ward b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Neil Lalonde 648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Régis Hanol c9dd83cba4 force max-width on images/svgs in composer preview and post view 
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
 2013-10-21 20:01:10 +02:00
Régis Hanol 9c820443fa do not select the marker in Chrome 2013-10-21 19:59:18 +02:00
Robin Ward d9a16079a5 FIX: Do not allow users to create tables 2013-10-21 13:32:15 -04:00
Robin Ward 7a5c3bfcd8 whitelist acceptable syntax highlighting classes 2013-10-21 13:11:10 -04:00
Robin Ward d10f9f756f FIX: `[code]` blocks with `#` headers within 2013-10-21 12:12:58 -04:00
Robin Ward 1783089d64 FIX: [quote] without params was failing. 2013-10-21 11:12:47 -04:00
Robin Ward f565766b1e Merge pull request #1555 from awesomerobot/master 
fixed progress indicator a bit, line under title doesn't span full width...
 2013-10-21 07:51:07 -07:00
Robin Ward 4d9ca99929 Merge pull request #1542 from velesin/debounce_refactoring 
refactors Discourse.debounce
 2013-10-21 07:50:26 -07:00
Robin Ward c5f14cdd0e Merge pull request #1549 from velesin/debounce_promise_refactoring 
refactors Discourse.debouncePromise
 2013-10-21 07:49:47 -07:00
Kris Aubuchon 2c384e0073 fix for long usernames 2013-10-21 10:13:16 -04:00
Kris Aubuchon 77540ed999 fixed progress indicator a bit, line under title doesn't span full width anymore 2013-10-21 09:38:35 -04:00
Jeff Atwood 21ee05583c no line above topic footer buttons please 2013-10-21 01:38:01 -07:00
Jeff Atwood cec9bcfb5d make user titles smaller than usernames 2013-10-21 01:22:36 -07:00
Jeff Atwood 1a0e800afb fix line-height on topic titles 2013-10-21 00:51:11 -07:00
Jeff Atwood 2ac8f3d20b extra-info-wrapper at top of topic too narrow now 2013-10-21 00:38:24 -07:00
Sam e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam a241ddf9d2 Merge pull request #1554 from awesomerobot/master 
gutter links shouldn't fade, fixed
 2013-10-20 22:20:10 -07:00
Kris Aubuchon d4db161133 css transitions were too slow, sped up 2013-10-21 00:45:19 -04:00
Kris Aubuchon 94b5b24d88 gutter links shouldn't fade, fixed 2013-10-21 00:41:16 -04:00
Sam 29c8d2ebec oops add security 2013-10-21 15:33:42 +11:00
Sam 6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Sam 38a33a8c1b work in progress sortable categories 2013-10-21 15:25:20 +11:00
Sam 243a6ae291 Merge pull request #1552 from awesomerobot/master 
a few general fixes to the new flatter theme
 2013-10-20 19:33:38 -07:00
Kris Aubuchon 5d88bfa8e3 a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515 2013-10-20 22:16:02 -04:00
Kris Aubuchon aa42a36b8a a few general fixes to the new flatter theme 2013-10-20 21:59:46 -04:00
Sam 6cfdd083d5 Merge pull request #1525 from squareleaf/logo_header_height 
Change fixed width of logo in header to max-height.
 2013-10-20 17:37:55 -07:00
Sam 614f45d003 correct topic and category counting query 
revive old styling that was stripped
 2013-10-21 10:20:16 +11:00
Tiffany Green 6681751531 Change fixed width of logo in header to max-height. Addresses issue #1045 
Add max width
 2013-10-20 17:35:37 -05:00
Wojciech Zawistowski 4c4a2f220e refactors Discourse.debouncePromise 2013-10-20 10:38:26 +02:00
Kris Aubuchon 88a97bcb71 minimizing the desktop topic view, also effects the background on all pages and removed bootstrap 2013-10-19 18:18:25 -04:00
Wojciech Zawistowski d0f3765967 refactors Discourse.debounce 2013-10-19 09:13:00 +02:00
Robin Ward aef4227073 Remove debug message 2013-10-18 17:49:33 -04:00
Robin Ward db2283b9d3 FIX: JSHint 2013-10-18 17:48:19 -04:00
Robin Ward 1113b8d7a8 FIX: Don't double sanitize values, allow blockquotes with leading text 2013-10-18 17:34:54 -04:00
Robin Ward d7182d0b14 FIX: Only wrap inline html tags in <p> 2013-10-18 15:21:05 -04:00
Régis Hanol 28fd63bd11 don't stretch images in the mobile view 2013-10-18 16:43:53 +02:00
Sam 6f32cb52d6 minor styling changes, kill n+1 query 2013-10-18 11:23:08 +11:00
Sam e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam 1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam 9ad01a1afb more work in progress, wide category list 2013-10-18 11:10:10 +11:00
Sam 8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Sam b567bd3d37 shift site settings in front of routes 2013-10-18 11:10:10 +11:00
Jeff Atwood e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Jeff Atwood 4b53c45d3d make category descriptions plain black 2013-10-17 15:32:11 -07:00
Robin Ward 3408fc395d FIX: User stream pagination 2013-10-17 16:10:11 -04:00
Robin Ward 5fa47984b4 Link large user avatar to user profile 2013-10-17 16:06:58 -04:00
Neil Lalonde 3927913a7e FIX: composer for creating a new topic on mobile 2013-10-17 13:17:54 -04:00
Neil Lalonde 71571b9316 Never show preview pane in composer on mobile. 2013-10-17 12:19:28 -04:00
Robin Ward a215fc5bdc Collapse user details when not viewing index view 2013-10-17 11:27:03 -04:00
Robin Ward d206e1416c Merge pull request #1533 from velesin/remove_return_from_attach_view_with_args 
removes unused return statement from ContainerView.attachViewWithArgs
 2013-10-17 06:57:24 -07:00
Robin Ward 7e9b119c9c Minor tweaks to user view 2013-10-16 16:22:16 -04:00
Robin Ward dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Robin Ward f81b2dc3f2 Extra comma 2013-10-16 14:16:14 -04:00
Robin Ward c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Wojciech Zawistowski 3f02e0bca6 removes unused return statement from Discourse.ContainerView.attachViewWithArgs 2013-10-16 17:52:04 +02:00
Neil Lalonde c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Robin Ward 67771d6bdf FIX: New line after blockquote 2013-10-16 10:28:48 -04:00
Robin Ward f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Neil Lalonde 42cdad9d1d FIX: edit category modal with no title, empty modals that can't be closed. Added a better way to hide a modal without really closing it. 2013-10-15 15:41:15 -04:00
Neil Lalonde 7dcd3117fe On mobile, show new user usernames in grey, and highlight system posts like the desktop site does. 2013-10-15 12:53:14 -04:00
Robin Ward afff145bd3 FIX: Query params were going a bit haywire when going from topic to topic. 2013-10-15 12:40:12 -04:00
Robin Ward 5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-15 10:53:11 -04:00
Nathaniel Palmer 20ab14e1b8 prevent share-view being clipped at viewport bounds 2013-10-12 10:45:21 -04:00
Robin Ward af931f0444 Reverting the Sanitizer commit in case we have to do something urgent 
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
 2013-10-11 16:44:26 -04:00
Robin Ward 9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-11 16:25:40 -04:00
Régis Hanol 7938843b50 ooops. régis can't refactor... 2013-10-11 18:49:17 +02:00
Régis Hanol 35214f0b3a Merge pull request #1522 from velesin/syntax_highlighting_context_refactoring 
removes unused context binding from Discourse.SyntaxHighlighting
 2013-10-11 09:46:47 -07:00
Régis Hanol cf3c4fd743 no need for a computed property 2013-10-11 18:43:10 +02:00
Wojciech Zawistowski c446cc6ce1 removes unused context binding from Discourse.SyntaxHighlighting 2013-10-11 18:37:18 +02:00
Wojciech Zawistowski b4a6a5e841 removes unused context binding from Discourse.Lightbox 2013-10-11 17:40:30 +02:00
Robin Ward 20cba4e092 Never bind the poster expansion twice. 2013-10-10 15:18:38 -04:00
Wojciech Zawistowski 107932576e removes redundant context binding 2013-10-10 18:33:24 +02:00
Robin Ward ea9398467b For @Sam - hide the poster expansion if you click on the avatar of the user who's expanded 2013-10-10 12:03:52 -04:00
Régis Hanol ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde c3fd79d61c Fix rendering of muted topic button 2013-10-10 11:26:20 -04:00
Sam 8afff108bf css.scss makes rails 4 sad 2013-10-10 15:23:14 +11:00
Sam b490fd2f88 Merge pull request #1513 from velesin/computed_self_refactoring 
refactors Discourse.Computed to bind context to self
 2013-10-09 21:16:19 -07:00
Régis Hanol 3854c2d24f Merge pull request #1510 from velesin/model_refactoring 
refactors Discourse.Model
 2013-10-09 09:26:15 -07:00
Wojciech Zawistowski 708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Wojciech Zawistowski 41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski 56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde 4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Neil Lalonde 24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Robin Ward 8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Neil Lalonde 32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol 94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol 2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward 0bda906da4 Merge pull request #1494 from ScotterC/present-user-name 
Presenting name for user stream description
 2013-10-08 08:42:59 -07:00
Scott Carleton 256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward 50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests 
adds unit tests for Discourse.debouncePromise
 2013-10-08 07:56:07 -07:00
Neil Lalonde 6713db7133 Close notifications dropdown on mobile after you click something 2013-10-07 16:11:54 -04:00
Robin Ward cf4666d363 FIX: If the user asks for 0 similar topics, don't show an empty box 2013-10-07 15:14:01 -04:00
Robin Ward 744266374a FIX: Invalid i18n string appearing at bottom of topic 2013-10-07 15:01:51 -04:00
Robin Ward 6949bc6611 Make clickable area for progress much bigger on mobile 2013-10-07 14:41:17 -04:00
Robin Ward 75aaafc06e Don't show the user expansion on mobile 2013-10-07 14:32:15 -04:00
Wojciech Zawistowski 034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00