Commit graph

5803 commits

Author SHA1 Message Date
Robin Ward
4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward
62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
2013-12-31 12:52:31 -05:00
Robin Ward
6c4417e0f0 Use the standard .jshintrc file for JSHint options. 2013-12-31 12:41:40 -05:00
Robin Ward
e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
verg
8a830fb8e3 Prevent deleting 'uncategorized' category 2013-12-31 11:22:44 -06:00
Régis Hanol
131bf2db2b Merge pull request #1779 from discourse/override-templates
FEATURE: allow plugins to overwrite handlebars templates
2013-12-31 08:06:19 -08:00
Régis Hanol
7fd88a52c9 FEATURE: allow plugins to overwrite handlebars templates 2013-12-31 16:43:29 +01:00
Sam
d150bc20cf no need to remove what is not there 2013-12-31 15:12:07 +11:00
Sam
530b67aabd Merge pull request #1709 from chancancode/boot_to_master
Make Discourse work on Rails master (4.1)
2013-12-30 15:52:29 -08:00
Sam
95cbcc198e FEATURE: add support for gem source in plugins 2013-12-31 09:58:58 +11:00
Godfrey Chan
c6577fb98e Added a reload to fix a test broken on master
I am not sure why this is wokring on Rails 4, but the problem is that `post3`
here is holding on to an old reference of some associations so `PostDestroyer`
is not doing the right thing.
2013-12-30 14:36:51 -08:00
Godfrey Chan
f9110ad4cb No more with_default_scope on Rails master, see 94924dc32b 2013-12-30 14:36:51 -08:00
Godfrey Chan
bb768a30ca Added a rails_master section to Gemfile 2013-12-30 14:36:51 -08:00
Sam
2c04f615f4 Merge pull request #1778 from davidcelis/configure-redis-db
Allow configuration of Redis DB and cache DB
2013-12-30 13:58:07 -08:00
David Celis
0ed42707cc Allow configuration of Redis DB and cache DB
Hardcoding the Redis DB and Redis Caching DB to 0 and 2 in
`config/database.yml` makes an unsafe assumption that Discourse is the
only application using that install of redis-server. Instead of forcing
users to undergo yet another form of configuration, allow Discourse
admins a nicer way to configure the Redis databases used.

Signed-off-by: David Celis <me@davidcel.is>
2013-12-30 13:39:43 -08:00
Neil Lalonde
47e1d00f96 Check that common passwords list is greater than 0 2013-12-30 14:26:02 -05:00
Robin Ward
8a1593bfd2 Upgrade JSHint to master + my fix for tokens.hasOwnProperty 2013-12-30 14:19:00 -05:00
Régis Hanol
54686388fb FEATURE: display the Top tab by default for long-time-no-see users 2013-12-30 19:42:45 +01:00
Robin Ward
a502266c42 Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Régis Hanol
8685e4079f FEATURE: the top tab is the default for new users 2013-12-30 18:49:16 +01:00
Robin Ward
7e984e369a Upgrade JSHint. Fixes linting issues. 2013-12-30 12:42:05 -05:00
Robin Ward
3a459f3634 Support for dry runs when importing via Disqus, replacing text, foreign accents 2013-12-30 11:32:21 -05:00
Sam
65014a03ca appease jshint 2013-12-30 19:50:52 +11:00
Sam
8ec887e9cf PERF: speed up breakUp
breakUp function is complicated now, add a capped memoizer to ensure it runs a lot less.
2013-12-30 16:47:25 +11:00
Sam
d8c43f7b58 BUGFIX: fix username breakup so it works with IE
FEATURE: breakup username based on name as well
2013-12-30 16:07:35 +11:00
Sam
b8184d8b92 speed up bench add param for iterations 2013-12-30 15:15:30 +11:00
Sam
1915f292ad BUGFIX: invalid referer would cause 500 errors 2013-12-30 14:05:44 +11:00
Sam
9738c4ff48 FEATURE: backport a minimal String#scrub
BUGFIX: invalid byte sequence in email would explode all processing
2013-12-30 14:05:25 +11:00
Sam
81eec5ff06 remove "host" so it uses sockets by default, easier to configure 2013-12-30 13:02:38 +11:00
Sam
db1d01d1a2 Discourse as a Mailing List improvements
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
  When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
  was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
2013-12-30 13:02:12 +11:00
Sam
293b7e5857 add spec to demo blanking props 2013-12-30 08:42:55 +11:00
Neil Lalonde
1781b290cb Fix top_topic.rb to be compatible with ruby 1.9 2013-12-27 16:16:25 -05:00
Neil Lalonde
eca291c9fc FIX: After closing a topic that's set to auto-close, remove the message that it will auto-close. Server was already doing the right thing. 2013-12-27 15:38:57 -05:00
Neil Lalonde
ad375e231a Fix wrapping of validation messages on signup form 2013-12-27 14:36:36 -05:00
Neil Lalonde
b5d24c72b4 Improve wording of common password validation error 2013-12-27 14:07:51 -05:00
Régis Hanol
393ffeb6ad Merge pull request #1767 from Bahanix/master
similar_topics french locale was rough
2013-12-27 11:03:03 -08:00
Neil Lalonde
aafb155db2 Merge pull request #1761 from hzeroo/patch-1
Added some missing spanish translations
2013-12-27 11:00:52 -08:00
Neil Lalonde
90bf3cc3d4 Merge pull request #1760 from dv2/fix_spelling
Correct few spelling in the comments
2013-12-27 11:00:02 -08:00
Régis Hanol
b5a59c10d5 let's try another formula for the top tab 2013-12-27 19:12:53 +01:00
Régis Hanol
9c8e50351d first stab at calculating the score of a topic for the top tab 2013-12-27 18:10:35 +01:00
Régis Hanol
90eb6e6b8f FIX: only show edit reason when the user action is an EDIT 2013-12-27 17:17:32 +01:00
Neil Lalonde
2c19d8a136 Fix password_validator_spec 2013-12-27 11:15:53 -05:00
Neil Lalonde
ab12695d63 Block passwords that are in the top 5000 most common passwords. Site setting block_common_passwords can disable this feature. 2013-12-27 11:00:21 -05:00
Sam
b4f547b3e2 oops missing quote 2013-12-27 13:40:13 +11:00
Sam
cbaa0a3a49 BUG: drafts broken for new topics 2013-12-27 10:35:53 +11:00
Sam
31ea259624 extend bench somewhat 2013-12-27 10:20:50 +11:00
Sam
02c149ef8e Merge pull request #1769 from vikhyat/fix-thumb-tack-icon
Fix missing pin icon.
2013-12-26 15:16:04 -08:00
Vikhyat Korrapati
511e2373d5 Fix missing pin icon.
pushpin was renamed to thumb-tack in Font Awesome 4.0.
2013-12-27 03:00:11 +05:30
Régis Hanol
cb6d83943a only show topics that have activity in top page 2013-12-24 15:26:03 +01:00
Régis Hanol
91db466196 add footer on Top page 2013-12-24 14:53:20 +01:00