34307 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Edward Ocampo-Gooding	b7a76cbd24	Consistency in SQL style	2013-02-11 01:03:21 -05:00
Sam Saffron	3f7a711dd6	I thought this would work but it fails horribly Revert "update markdown converter from showdown source, handles trailing parens etc." ... This reverts commit e55b713c59.	2013-02-11 15:54:26 +11:00
tms	29d2f04d87	Disable reply button on archived/closed topics	2013-02-10 23:39:09 -05:00
Sam Saffron	4b92cfe80f	Merge branch 'master' of github.com:discourse/discourse	2013-02-11 15:38:26 +11:00
Sam Saffron	e55b713c59	update markdown converter from showdown source, handles trailing parens etc.	2013-02-11 15:37:42 +11:00
Sam Saffron	374820ae8b	not required there, if anything should go in the initializer	2013-02-11 15:13:40 +11:00
Sam	14fd671914	Merge pull request #110 from tms/share-box-zindex ... Reduce z-index on reply tab so it's below the share box	2013-02-10 20:05:09 -08:00
tms	a07adc01bc	Reduce z-index on reply tab so it's below the share box	2013-02-10 22:36:24 -05:00
Sam Saffron	a6fc46599f	Merge branch 'master' of github.com:discourse/discourse	2013-02-11 11:43:20 +11:00
Sam Saffron	543845c673	rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default.	2013-02-11 11:43:07 +11:00
Sam	8eed88da27	Merge pull request #108 from tms/searchbox-key-interceptions ... Prevent click from being trapped in the editor field	2013-02-10 16:36:43 -08:00
Sam Saffron	004d4bf4e1	Merge branch 'master' of github.com:discourse/discourse	2013-02-11 11:03:08 +11:00
Sam Saffron	c50a9e4d01	added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false	2013-02-11 11:02:57 +11:00
tms	0dc5b9be39	Prevent click from being trapped in the editor field	2013-02-10 18:36:11 -05:00
Robin Ward	0dcba67a7e	Merge pull request #98 from blom/define_method ... Use define_method instead of eval-ing a string	2013-02-10 14:15:48 -08:00
Sam Saffron	8250586306	add to_date so its more explicit	2013-02-11 09:11:02 +11:00
Sam	1264f628c8	Merge pull request #104 from kubabrecka/fix_non_us_locale ... fix user listing and search on non-US locale	2013-02-10 14:08:13 -08:00
Neil Lalonde	946255fcc4	Remove export images from repo until import handles db migrations better	2013-02-10 12:25:25 -05:00
Robin Ward	515d4452b3	Merge branch 'define_method' of git://github.com/blom/discourse	2013-02-10 11:35:21 -05:00
Sam Saffron	c06f1438d3	ilike is slow in theory, unless some sophisticated index is in place	2013-02-10 23:47:04 +11:00
Sam Saffron	af810f38dd	UserSearch refactor ... Added .sql_builder to all AR models	2013-02-10 23:37:24 +11:00
Sam Saffron	6fb78809c2	better support for multi host in site customization	2013-02-10 23:05:11 +11:00
Kuba Brecka	d0c1d94918	fix user listing and search on non-US locale	2013-02-10 12:18:11 +01:00
Charles Roper	37fb2ddb6b	Update DEVELOPMENT.md ... Add missing `git clone` command.	2013-02-10 08:44:58 +00:00
Sam	4b0eec334f	Merge pull request #101 from tms/profile-stream-cleanup ... Tweaked profile stream activity entries	2013-02-09 21:46:39 -08:00
tms	86d8326e30	Allow forcing username as image title when generating avatar	2013-02-10 00:12:27 -05:00
tms	9e653ad370	Show "You" to same-user on activity stream items	2013-02-09 23:44:03 -05:00
Sam	ca0c4926f6	Merge pull request #99 from tms/firefox-placeholders ... Prevent Firefox from using the wrong placeholder colour	2013-02-09 19:53:35 -08:00
tms	f6b4d0d57a	Swap name / title in activity stream, link post number	2013-02-09 22:33:07 -05:00
tms	a588939d81	Prevent Firefox from using a more-specific text color definition in place of the placeholder color	2013-02-09 20:04:01 -05:00
Ørjan Blom	f00853bee8	Use define_method instead of eval-ing a string ... It avoids the need for escaping the interpolations.	2013-02-10 00:13:46 +01:00
Jeff Atwood	c5e1dba31f	copyedit on PM invite button	2013-02-09 13:33:38 -08:00
Jeff Atwood	c2bac8358e	update /faq more after sleeping on it	2013-02-09 12:57:34 -08:00
Robin Ward	e0f4dd6c60	Merge pull request #95 from tjstein/tjstein-02092013 ... Correcting link to Mailcatcher	2013-02-09 12:43:57 -08:00
Robin Ward	650a2195f7	Merge pull request #97 from jaimeiniesta/documentation ... Instruct developers to prepare the test DB before launching guard	2013-02-09 12:43:09 -08:00
Jeff Atwood	bfb28b3d54	add local greyscale dev logos	2013-02-09 12:32:53 -08:00
Jaime Iniesta	247d5a205a	Instruct developers to prepare the test DB before launching guard	2013-02-09 20:44:49 +01:00
TJ	7e3e976042	Correcting link to Mailcatcher	2013-02-09 10:49:39 -08:00
Neil Lalonde	679988b59c	Add mailcatcher instructions to DEVELOPMENT.md	2013-02-09 12:59:43 -05:00
Robin Ward	f2ec4b63de	Merge pull request #93 from johnmcdowall/clean_up_gemfile ... Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe style	2013-02-09 09:33:43 -08:00
Robin Ward	9cca0144f7	Merge branch 'clean_up_gemfile' of git://github.com/johnmcdowall/discourse	2013-02-09 12:28:20 -05:00
johnmcdowall	dd88e3def3	Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe delimeter, grouped by reference type and alphabetized within	2013-02-09 12:04:52 -05:00
Robin Ward	272a1e567f	Merge pull request #92 from gammons/master ... Factored out @post.revise into a new PostRevisor class	2013-02-09 08:13:12 -08:00
Robin Ward	ac0d329e60	Merge branch 'master' of git://github.com/gammons/discourse	2013-02-09 11:07:12 -05:00
Robin Ward	cbf60f49e8	Merge pull request #91 from kubabrecka/upstream ... correct noscript link to next page	2013-02-09 08:01:36 -08:00
Grant Ammons	701ecddac2	factor out @post.revise into its own class. clean up PostRevisor class to be more readable	2013-02-09 10:33:25 -05:00
Kuba Brecka	12fa6e9a4e	correct noscript link to next page	2013-02-09 14:12:31 +01:00
Jeff Atwood	f44dba5fc5	edit id anchors on /faq	2013-02-09 03:46:41 -08:00
Jeff Atwood	99f1d40748	Omit Needless Words, again	2013-02-09 03:38:40 -08:00
Jeff Atwood	c868283813	li height, copy on /faq	2013-02-09 03:22:03 -08:00