Commit Graph

11040 Commits

Author SHA1 Message Date
dbb595d83d Added the link to the Discourse development forums 2013-02-07 18:38:57 +01:00
d72c26ff92 Refactor UserSearch tests 2013-02-07 09:35:38 -07:00
e41b6537f9 Remove expectation of term case 2013-02-07 09:35:38 -07:00
5b01ac9288 Return User objects instead of hashes 2013-02-07 09:35:38 -07:00
1cd565ec0d Extract SQL generation method 2013-02-07 09:35:38 -07:00
972b9d735c Extract search logic to UserSearch model 2013-02-07 09:35:38 -07:00
0136727595 Add test coverage for UsersController#search_users 2013-02-07 09:34:06 -07:00
66a9b97b65 Oops, slim is required for sidekiq's web interface. 2013-02-07 11:32:23 -05:00
TJ
555fed1f45 fixing spelling error 2013-02-07 08:27:59 -08:00
09a1317478 Merge pull request #12 from darthdeus/fix-all-the-trailing-whitespace
Fix all the trailing whitespace
2013-02-07 08:08:44 -08:00
d2cebda786 Merge branch 'master' into vagrant-chef 2013-02-07 11:08:17 -05:00
61654ab8f0 Fix all the trailing whitespace 2013-02-07 16:45:24 +01:00
00ad40c243 Merge pull request #55 from spockz/patch-1
Added bundle install command to easy setup
2013-02-07 07:32:52 -08:00
1839614bcc Merge pull request #36 from fenprace/master
Remove some gems in the Gemfile
2013-02-07 07:09:28 -08:00
f83dc09804 Merge pull request #54 from patdeegan/test-cleanups
Test cleanups.
2013-02-07 07:05:56 -08:00
d49cf88c35 Merge pull request #51 from danneu/slug-patch
Strip leading and trailing slug punctuation.
2013-02-07 07:02:58 -08:00
4fcd924797 I committed a regression around multi site today and site customization, added tests so it don't happen again 2013-02-08 00:55:04 +11:00
efa4495fc2 Added bundle install command to easy setup
When I tried to follow the steps mentioned I needed to perform `bundle install` as well.
2013-02-07 13:44:10 +01:00
168bb01439 allow for empty headers properly 2013-02-07 18:25:18 +11:00
85973ce6b0 added delete all posts button
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
3b49f96e9a Update & simplify vagrant instructions.
The gem installer is deprecated, direct people to the real installer.
No longer need to require XCode and RVM installs, just install vagrant
and go. Password prompt during boot only happens on windows, not OS X
and Linux hosts.
2013-02-07 01:22:31 -05:00
f54e530a3e Tuneups of Vagrant
Increase memory allocation to 512MB so guest VM is not swapping.
SSH forwarding, DNS host nat resolver.
Don't use NFS on darwin, just use standard folder sharing.
2013-02-07 01:13:24 -05:00
43d4eb681e Fix Guardfile warning about deprecated :version arg. 2013-02-07 01:10:46 -05:00
bfa7a5fd67 Increase timeout for spork startup. 2013-02-07 00:42:47 -05:00
98bf443d82 Fix guard warning with version spec for rb-notify. 2013-02-07 00:41:27 -05:00
d5a2518fef Merge remote-tracking branch 'discourse/master' 2013-02-07 00:39:11 -05:00
8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
ee8d68842e Strip leading and trailing slug punctuation. 2013-02-06 19:52:14 -06:00
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
554ba7b676 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 12:32:39 +11:00
7cdf1266ad remove unused var 2013-02-07 12:32:29 +11:00
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
1c29b040c5 A tiny typo fix. It all adds up... 2013-02-07 00:46:57 +00:00
471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
f79f0e740a Don't allow users to double flag stuff
Correct seed fu to match model
2013-02-07 10:45:58 +11:00
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
653c146a4b Fix typo on AUTHORS.md
Just one character.
2013-02-06 15:59:25 -07:00
94e58d733e Add moderator style while in topic 2013-02-06 17:36:07 -05:00
77a924eadc Revert "Merge pull request #22 from sandal/patch-1"
This reverts commit 0b6b63f24a8a727e37497263a9e4172effc4da95, reversing
changes made to e2b99f5d33b6664b8cacd0db78c5c53a6c0412f2.
2013-02-06 17:26:31 -05:00
c18a23f63c Fixed typo in EXISTS sql 2013-02-06 13:37:38 -08:00
96e67002ac Merge pull request #44 from bbonamin/patch-1
Fixed minor typo in lib/guardian.rb
2013-02-06 13:28:56 -08:00
c4b1c10955 Merge pull request #25 from mlinksva/patch-1
Update app/views/static/faq.html.erb
2013-02-06 13:27:39 -08:00
c24e1122b6 Merge pull request #39 from bendoerr/patch-1
Split -vendor-placeholder selector by vendor.
2013-02-06 13:24:38 -08:00
c77dea41b8 Merge pull request #7 from mutewinter/fix_at_dot
Removed unnecessary @.'s
2013-02-06 13:22:13 -08:00