Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,680 Commits 214 Branches 500 Tags 870 MiB
Commit Graph

23680 Commits

Author SHA1 Message Date
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
Jeff Atwood 6af0d0789c correct TOS links, correct ul/li body-page style 2013-02-09 02:50:13 -08:00
Jeff Atwood 5d21745dcf minor /faq improvements, Omit Needless Words 2013-02-09 02:41:27 -08:00
Jeff Atwood 91b306d159 normalize on H2 in FAQs, copyedits 2013-02-09 01:32:08 -08:00
Jeff Atwood a03676ac62 simplify faq/tos/privacy HTML and CSS 2013-02-09 01:20:57 -08:00
Robin Ward 03a798b202 Can clear flags on deleted posts if you're a moderator 2013-02-08 19:07:29 -05:00
Robin Ward ea631e75c9 Merge pull request #86 from rossta/bug_fix_twitter_complete 
Twitter oauth login failing: fix for javascript error
 2013-02-08 15:56:43 -08:00
Ross Kaffenberger c959f8a67e html safe json data for twitter/complete with view specs 2013-02-08 18:50:42 -05:00
Robin Ward 33757c201a Twitter logins were broken. 2013-02-08 17:57:01 -05:00
Robin Ward 7c11c3fe0f Can edit deleted posts. 2013-02-08 17:49:15 -05:00
Robin Ward 25e9cfe3b8 Remove the distinction between "x replies below" and "x replies" 2013-02-08 17:10:18 -05:00
Robin Ward 12d3c3b66b Enforce entropy on flag text 2013-02-08 17:01:43 -05:00
Neil Lalonde 1635d8e553 Add email_blacklist_regexp to site settings. Not implemented yet. 2013-02-08 16:31:21 -05:00
Robin Ward db0c73e874 Replace all those `deleted_at`s with `acts_as_paranoid` 2013-02-08 16:16:09 -05:00
Robin Ward 50ef0c16bb Removed most manual SQL from PostAction 2013-02-08 16:16:03 -05:00
Neil Lalonde d73baa23dd Better username change validation messages 2013-02-08 16:08:45 -05:00
Neil Lalonde d1a04fa06a Enforce max username length on client 2013-02-08 16:08:45 -05:00
Jeff Atwood 24cf672c7d need word-wrap:break-word on preview 2013-02-08 12:07:32 -08:00
Jeff Atwood cc21cf16d1 copy on email mentions 2013-02-08 11:13:50 -08:00
Neil Lalonde ce7088f081 check_username api now returns correct error message for invalid lengths etc 2013-02-08 14:12:48 -05:00
Cyril Mougel 84191802df Extract the validation of Username format in own class to avoid 
complexity in user model object
 2013-02-08 12:54:47 -05:00
Robin Ward 3ccfa645a8 Rails cache needs to reconnect - Fixes error with Spork / Guard 2013-02-08 12:52:23 -05:00
Robin Ward e96bd8fd01 Merge pull request #74 from spockz/patch-2 
Added requirements on postgres and redis-server
 2013-02-08 08:16:24 -08:00
Robin Ward 36c3467f72 Merge pull request #69 from gammons/master 
use shared_examples_for versioning for posts, topics
 2013-02-08 08:11:44 -08:00
Robin Ward bcd7af742f Merge pull request #72 from tms/topic-page-css 
Button container should be no wider than suggested topics
 2013-02-08 08:10:30 -08:00
Robin Ward c3b12e7e30 Merge pull request #76 from patdeegan/rack-security 
Update rack gem, CVE-2013-0262 & CVE-2013-0263
 2013-02-08 08:03:53 -08:00
Elliot Murphy 5467762557 Update rack gem, CVE-2013-0262 & CVE-2013-0263 2013-02-08 09:20:03 -05:00
Grant Ammons a8c106bba6 use shared_examples_for versioning, for both posts and topics 2013-02-08 08:17:05 -05:00