Commit Graph

10068 Commits

Author SHA1 Message Date
Elliot Murphy 43d4eb681e Fix Guardfile warning about deprecated :version arg. 2013-02-07 01:10:46 -05:00
Elliot Murphy bfa7a5fd67 Increase timeout for spork startup. 2013-02-07 00:42:47 -05:00
Elliot Murphy 98bf443d82 Fix guard warning with version spec for rb-notify. 2013-02-07 00:41:27 -05:00
Elliot Murphy d5a2518fef Merge remote-tracking branch 'discourse/master' 2013-02-07 00:39:11 -05:00
Sam Saffron 8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
Sam Saffron 7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
Sam Saffron c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
Robin Ward 7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward 40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Dan Neumann ee8d68842e Strip leading and trailing slug punctuation. 2013-02-06 19:52:14 -06:00
Sam Saffron 0f5bef61dc Merge branch 'master' of github.com:discourse/discourse 2013-02-07 12:50:08 +11:00
Sam 54260fd766 Merge pull request #45 from choppen5/fix_migration_hstore
initial rake db:migrate was failing if hstore was already set
2013-02-06 17:34:02 -08:00
Sam Saffron 554ba7b676 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 12:32:39 +11:00
Sam Saffron 7cdf1266ad remove unused var 2013-02-07 12:32:29 +11:00
Robin Ward 415f810089 Merge pull request #48 from achambers/patch-1
A tiny typo fix.  It all adds up...
2013-02-06 16:47:56 -08:00
Aaron Chambers 1c29b040c5 A tiny typo fix. It all adds up... 2013-02-07 00:46:57 +00:00
Neil Lalonde 471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
Sam Saffron f79f0e740a Don't allow users to double flag stuff
Correct seed fu to match model
2013-02-07 10:45:58 +11:00
Robin Ward 204a8a8b52 Merge pull request #47 from steveklabnik/patch-1
Fix typo on AUTHORS.md
2013-02-06 15:01:52 -08:00
Sam 19a0efee31 Update README.md 2013-02-07 10:00:45 +11:00
Steve Klabnik 653c146a4b Fix typo on AUTHORS.md
Just one character.
2013-02-06 15:59:25 -07:00
Robin Ward 94e58d733e Add moderator style while in topic 2013-02-06 17:36:07 -05:00
Robin Ward 77a924eadc Revert "Merge pull request #22 from sandal/patch-1"
This reverts commit 0b6b63f24a, reversing
changes made to e2b99f5d33.
2013-02-06 17:26:31 -05:00
Charles Oppenheimer c18a23f63c Fixed typo in EXISTS sql 2013-02-06 13:37:38 -08:00
Robin Ward 96e67002ac Merge pull request #44 from bbonamin/patch-1
Fixed minor typo in lib/guardian.rb
2013-02-06 13:28:56 -08:00
Robin Ward c4b1c10955 Merge pull request #25 from mlinksva/patch-1
Update app/views/static/faq.html.erb
2013-02-06 13:27:39 -08:00
Robin Ward c24e1122b6 Merge pull request #39 from bendoerr/patch-1
Split -vendor-placeholder selector by vendor.
2013-02-06 13:24:38 -08:00
Robin Ward c77dea41b8 Merge pull request #7 from mutewinter/fix_at_dot
Removed unnecessary @.'s
2013-02-06 13:22:13 -08:00
Robin Ward 8c54a97800 Merge pull request #33 from sebasoga/remove_empty_helpers
Remove empty helpers
2013-02-06 13:20:54 -08:00
Robin Ward 2d2b907d2c Temporary Nuclear option on topic titles - disallow non ascii characters so we
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
2013-02-06 15:47:36 -05:00
Robin Ward f1a3e76d2b Support for replacing Site Message content with keys specific to a multisite. 2013-02-06 15:29:03 -05:00
Charles Oppenheimer 9f1c978f11 initial rake db:migrate was failing if hstore was already set 2013-02-06 11:47:39 -08:00
Bruno Bonamin de871ccf8a Fixed minor typo in lib/guardian.rb
Just a letter switch I found upon browsing the code :)
2013-02-06 17:46:45 -02:00
Robin Ward 2ce69c73eb Use double quotes in image uploads instead of single quotes. Our sanitizer seems to
hate single quotes.
2013-02-06 14:27:11 -05:00
Ben Doerr 77908ed3d8 Split -vendor-placeholder selector by vendor.
Some browsers (specifically Firefox(18) that I know of) fail to select
correctly if the selectors are combined. This was fixed in bootstrap
(https://github.com/twitter/bootstrap/blob/master/less/forms.less#L210).
Not sure of the exact commit but there is a nice comment.
2013-02-06 12:39:15 -05:00
Robin Ward 6043a370ad Oops, that should be 1.minute 2013-02-06 12:07:22 -05:00
Robin Ward 8d568b05c4 Don't enable Cache-Control if the site has restricted access. 2013-02-06 11:55:54 -05:00
Robin Ward 0b6b63f24a Merge pull request #22 from sandal/patch-1
Fix typo in AUTHORS.md
2013-02-06 07:08:02 -08:00
Robin Ward e2b99f5d33 Merge pull request #34 from mharen/master
Fix minor type in README.md (someone accidentally a word)
2013-02-06 07:02:23 -08:00
Prace Fen b60be8889f Remove some gems because they are never used in this project. 2013-02-06 22:48:55 +08:00
Michael Haren f4decfcddd someone accidentally a word 2013-02-06 09:36:57 -05:00
Sebastian Sogamoso 24584ae916 Remove empty helpers 2013-02-06 08:32:41 -05:00
Jeff Atwood 27e1a81b34 increase default max_likes_per_day to 30 2013-02-06 00:32:46 -08:00
Mike Linksvayer 28c25940d2 Update app/views/static/faq.html.erb
remove example.com from example.com/tos
2013-02-05 22:48:55 -08:00
Sam Saffron a7f35df9f6 structure.sql should match mine 2013-02-06 17:26:12 +11:00
Sam Saffron 554a3f23d5 Merge branch 'master' of github.com:discourse/discourse 2013-02-06 17:25:06 +11:00
Sam Saffron 2e3bcec5c7 also for about me 2013-02-06 17:24:49 +11:00
Sam Saffron d4bc423320 hook up sanitizer 2013-02-06 17:22:11 +11:00
Sam ccfe874a7b Merge pull request #11 from keekerdc/fixing-outdated-migrations
Working out outdated migrations
2013-02-05 21:46:03 -08:00
Chris Schetter 32ff6c264a Working out outdated migrations
Several migrations were failing when running db:migrate at the initial release version from an empty database.
These changes took out statements that were causing migrations to fail, usually because of references to models that no longer exist.
2013-02-05 21:33:26 -08:00