Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,994 Commits 239 Branches 500 Tags 874 MiB
Commit Graph

7994 Commits

Author SHA1 Message Date
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
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