4833 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Ward	2308784713	Merge pull request #1543 from railsaholic/small_users_controller_refactoring ... refactor UsersController to reduce complexity	2013-10-21 12:21:03 -07:00
Robin Ward	51b2f512a3	Merge pull request #1557 from awesomerobot/master ... fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...	2013-10-21 12:19:11 -07:00
Kris Aubuchon	ecb6ec0b6d	fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small	2013-10-21 15:15:32 -04:00
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
Robin Ward	e527cbf884	FIX: Link reference-style text without a url	2013-10-21 14:16:49 -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	fcd85b8a72	allow plugins to be symlinked	2013-10-21 19:59:28 +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	4bf064c3c6	Merge pull request #1556 from eriko/patch-1 ... Update 20131017014509_add_post_count_to_categories.rb	2013-10-21 09:42:16 -07:00
Erik Ordway	fe0dc8161a	Update 20131017014509_add_post_count_to_categories.rb ... In case the category does not have any posts yet. You get a null value error running the migration if this is the case.	2013-10-21 09:28:35 -07: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	0f4f593c89	correct broken test	2013-10-21 17:21:35 +11:00
Sam	e7a037709f	allow ordering categories in the edit category ui	2013-10-21 17:21:34 +11:00
Sam	f0862a5c2e	Merge pull request #1551 from ofgeek/patch-1 ... Update client.zh_CN.yml	2013-10-20 22:21:44 -07:00
Sam	1d71a2c722	Merge pull request #1553 from lucasts/master ... Up-to-date pt_BR translations	2013-10-20 22:21:22 -07:00
Sam	a241ddf9d2	Merge pull request #1554 from awesomerobot/master ... gutter links shouldn't fade, fixed	2013-10-20 22:20:10 -07:00
Sam	451a1620f9	Merge pull request #1545 from railsaholic/lists_controller_refactor ... Remove duplication of action defintion	2013-10-20 22:19:40 -07:00
Sam	31b73171dc	correct ordering algorithm	2013-10-21 16:14:09 +11: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
Manoj	7dfa99998f	Remove duplication of action defintion, add missing spec for topics_by, extract out URL construction logic	2013-10-21 08:34:18 +05:30
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
Lucas	6729b46cff	Up-to-date pt_BR translations ... - some fixes to more approprieted language - mimic source(en) files to easy future translations - added missing texts	2013-10-20 23:58:13 -02:00
ofGEEK	a6a7677fa9	Update client.zh_CN.yml	2013-10-21 08:43:53 +08: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
Sam	25723de9c8	no need for the undefine	2013-10-21 09:52:28 +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
Sam	9f1edd4c7a	Merge pull request #1537 from fny/master ... Remove best standards support for Rails 4 (Removed from ActionDispatch)	2013-10-20 15:22:39 -07:00
Régis Hanol	533006a5ec	Merge pull request #1536 from velesin/computed_tests_refactoring ... Discourse.Computed tests refactoring	2013-10-20 07:01:26 -07:00
Régis Hanol	a2b27d0700	Merge pull request #1546 from lucasts/patch-1 ... Update client.pt_BR.yml	2013-10-20 07:00:02 -07:00
Régis Hanol	ee9ce556f5	Merge pull request #1548 from cassiuschen/patch-1 ... Update server.zh_CN.yml	2013-10-20 06:57:54 -07:00