Commit Graph

  • 9e198c3ac5 Merge branch 'master' into vagrant-chef Elliot Murphy 2013-02-07 13:58:28 -0500
  • 8be8be9d93 Merge pull request #58 from tjstein/master Robin Ward 2013-02-07 10:25:44 -0800
  • 9dfd5de391 Merge 555fed1f45 into 424d131d00 TJ 2013-02-07 10:25:28 -0800
  • 424d131d00 Merge pull request #60 from ZogStriP/patch-2 Robin Ward 2013-02-07 09:49:52 -0800
  • 40b5334d87 Merge bb20466215 into 3bd72d79f0 Régis Hanol 2013-02-07 09:47:58 -0800
  • bb20466215 Changed Discourse CLA link to the canonical one Régis Hanol 2013-02-07 18:47:51 +0100
  • 3bd72d79f0 Merge pull request #59 from ZogStriP/patch-1 Robin Ward 2013-02-07 09:42:42 -0800
  • b85ae49ab2 Merge dbb595d83d into 66a9b97b65 Régis Hanol 2013-02-07 09:41:03 -0800
  • dbb595d83d Added the link to the Discourse development forums Régis Hanol 2013-02-07 18:38:57 +0100
  • d72c26ff92 Refactor UserSearch tests Mike Moore 2013-02-07 06:50:59 -0500
  • e41b6537f9 Remove expectation of term case Mike Moore 2013-02-07 05:59:25 -0500
  • 5b01ac9288 Return User objects instead of hashes Mike Moore 2013-02-07 05:54:55 -0500
  • 1cd565ec0d Extract SQL generation method Mike Moore 2013-02-07 05:07:03 -0500
  • 972b9d735c Extract search logic to UserSearch model Mike Moore 2013-02-07 04:34:49 -0500
  • 0136727595 Add test coverage for UsersController#search_users Mike Moore 2013-02-07 04:25:51 -0500
  • 66a9b97b65 Oops, slim is required for sidekiq's web interface. Robin Ward 2013-02-07 11:32:23 -0500
  • 555fed1f45 fixing spelling error TJ 2013-02-07 08:27:59 -0800
  • 09a1317478 Merge pull request #12 from darthdeus/fix-all-the-trailing-whitespace Robin Ward 2013-02-07 08:08:44 -0800
  • d2cebda786 Merge branch 'master' into vagrant-chef Elliot Murphy 2013-02-07 11:08:17 -0500
  • edfc2b22b4 Merge 61654ab8f0 into 00ad40c243 Jakub Arnold 2013-02-07 07:45:39 -0800
  • 61654ab8f0 Fix all the trailing whitespace Jakub Arnold 2013-02-07 16:45:24 +0100
  • 00ad40c243 Merge pull request #55 from spockz/patch-1 Robin Ward 2013-02-07 07:32:52 -0800
  • b0881c54a2 Merge efa4495fc2 into 1839614bcc Alessandro Vermeulen 2013-02-07 07:12:28 -0800
  • fd8aed2bd0 Merge 6977585d7c into 1839614bcc Sridhar Ratnakumar 2013-02-07 07:11:20 -0800
  • 1839614bcc Merge pull request #36 from fenprace/master Robin Ward 2013-02-07 07:09:28 -0800
  • 25c24a2cc9 Merge b60be8889f into f83dc09804 Prace Fen 2013-02-07 07:09:10 -0800
  • f83dc09804 Merge pull request #54 from patdeegan/test-cleanups Robin Ward 2013-02-07 07:05:56 -0800
  • 90fe08e219 Merge 3b49f96e9a into d49cf88c35 Elliot Murphy 2013-02-07 07:03:45 -0800
  • d49cf88c35 Merge pull request #51 from danneu/slug-patch Robin Ward 2013-02-07 07:02:58 -0800
  • 31c0981bb5 Merge ee8d68842e into 4fcd924797 Dan Neumann 2013-02-07 07:01:49 -0800
  • 4fcd924797 I committed a regression around multi site today and site customization, added tests so it don't happen again Sam Saffron 2013-02-08 00:55:04 +1100
  • efa4495fc2 Added bundle install command to easy setup Alessandro Vermeulen 2013-02-07 13:44:10 +0100
  • 168bb01439 allow for empty headers properly Sam Saffron 2013-02-07 18:25:18 +1100
  • 85973ce6b0 added delete all posts button wired up the ability to enable all themes Sam Saffron 2013-02-07 18:11:56 +1100
  • 3b49f96e9a Update & simplify vagrant instructions. Elliot Murphy 2013-02-07 01:18:45 -0500
  • f54e530a3e Tuneups of Vagrant Elliot Murphy 2013-02-07 01:13:24 -0500
  • 43d4eb681e Fix Guardfile warning about deprecated :version arg. Elliot Murphy 2013-02-07 01:10:46 -0500
  • bfa7a5fd67 Increase timeout for spork startup. Elliot Murphy 2013-02-07 00:42:47 -0500
  • 98bf443d82 Fix guard warning with version spec for rb-notify. Elliot Murphy 2013-02-07 00:41:27 -0500
  • d5a2518fef Merge remote-tracking branch 'discourse/master' Elliot Murphy 2013-02-07 00:39:11 -0500
  • 6977585d7c vagrant instructions incorrectly uses localhost Sridhar Ratnakumar 2013-02-06 21:35:30 -0800
  • 8f4417f962 Merge branch 'master' of github.com:discourse/discourse Sam Saffron 2013-02-07 16:00:55 +1100
  • 7b123e12dd improving flag handling, links and delete button Sam Saffron 2013-02-07 16:00:40 +1100
  • c7461622a9 admins can now clear flags inline Sam Saffron 2013-02-07 15:15:48 +1100
  • 809205bb32 Merge d9a0ad7a98 into 7d7d8c7d4f Dan Neumann 2013-02-06 19:05:53 -0800
  • d9a0ad7a98 Simplified character replacement. Dan Neumann 2013-02-06 20:56:40 -0600
  • 0489df0e35 Replaced the hand rolled #strip! Dan Neumann 2013-02-06 20:56:26 -0600
  • 7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse Robin Ward 2013-02-06 20:59:07 -0500
  • 40da901e5d Introduction of TextSentinel to enforce title and body quality. Robin Ward 2013-02-06 20:09:31 -0500
  • ee8d68842e Strip leading and trailing slug punctuation. Dan Neumann 2013-02-06 19:52:14 -0600
  • 0f5bef61dc Merge branch 'master' of github.com:discourse/discourse Sam Saffron 2013-02-07 12:50:08 +1100
  • 54260fd766 Merge pull request #45 from choppen5/fix_migration_hstore Sam 2013-02-06 17:34:02 -0800
  • 7030bf0ab0 Merge c18a23f63c into 415f810089 Charles Oppenheimer 2013-02-06 17:33:40 -0800
  • 554ba7b676 Merge branch 'master' of github.com:discourse/discourse Sam Saffron 2013-02-07 12:32:39 +1100
  • 7cdf1266ad remove unused var Sam Saffron 2013-02-07 12:32:29 +1100
  • 415f810089 Merge pull request #48 from achambers/patch-1 Robin Ward 2013-02-06 16:47:56 -0800
  • 2b80dd5eb2 Merge 1c29b040c5 into 471c61fd69 Aaron Chambers 2013-02-06 16:47:11 -0800
  • 1c29b040c5 A tiny typo fix. It all adds up... Aaron Chambers 2013-02-07 00:46:57 +0000
  • 471c61fd69 Add honeypot and challenge to signup form Neil Lalonde 2013-02-06 19:25:21 -0500
  • 71a9ce86a3 Merge 9e5530ca13 into f79f0e740a Jeremy Dunck 2013-02-06 15:55:02 -0800
  • f79f0e740a Don't allow users to double flag stuff Correct seed fu to match model Sam Saffron 2013-02-07 10:45:58 +1100
  • 204a8a8b52 Merge pull request #47 from steveklabnik/patch-1 Robin Ward 2013-02-06 15:01:52 -0800
  • ecf90bd1ba Merge 653c146a4b into 19a0efee31 Steve Klabnik 2013-02-06 15:01:32 -0800
  • 19a0efee31 Update README.md Sam 2013-02-07 10:00:45 +1100
  • 653c146a4b Fix typo on AUTHORS.md Steve Klabnik 2013-02-06 15:59:25 -0700
  • 9e5530ca13 Remove Gemfile.lock Jeremy Dunck 2013-02-06 14:54:27 -0800
  • 94e58d733e Add moderator style while in topic Robin Ward 2013-02-06 17:36:07 -0500
  • 4708076284 minor typo fix Alexander 2013-02-06 14:26:32 -0800
  • 77a924eadc Revert "Merge pull request #22 from sandal/patch-1" Robin Ward 2013-02-06 17:26:31 -0500
  • c18a23f63c Fixed typo in EXISTS sql Charles Oppenheimer 2013-02-06 13:37:38 -0800
  • 96e67002ac Merge pull request #44 from bbonamin/patch-1 Robin Ward 2013-02-06 13:28:56 -0800
  • 731607a4d0 Merge de871ccf8a into c4b1c10955 Bruno Bonamin 2013-02-06 13:28:40 -0800
  • c4b1c10955 Merge pull request #25 from mlinksva/patch-1 Robin Ward 2013-02-06 13:27:39 -0800
  • 3cc4542f0c Merge 28c25940d2 into c24e1122b6 Mike Linksvayer 2013-02-06 13:27:11 -0800
  • c24e1122b6 Merge pull request #39 from bendoerr/patch-1 Robin Ward 2013-02-06 13:24:38 -0800
  • 05545ceca3 Merge 77908ed3d8 into c77dea41b8 Ben Doerr 2013-02-06 13:23:27 -0800
  • c77dea41b8 Merge pull request #7 from mutewinter/fix_at_dot Robin Ward 2013-02-06 13:22:13 -0800
  • 2e5f4f4f92 Merge 87ff4373f5 into 8c54a97800 Jeremy Mack 2013-02-06 13:21:37 -0800
  • 8c54a97800 Merge pull request #33 from sebasoga/remove_empty_helpers Robin Ward 2013-02-06 13:20:54 -0800
  • d62d3bd7d8 Merge 24584ae916 into 2d2b907d2c Sebastian Sogamoso 2013-02-06 13:20:34 -0800
  • 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. Robin Ward 2013-02-06 15:47:36 -0500
  • f1a3e76d2b Support for replacing Site Message content with keys specific to a multisite. Robin Ward 2013-02-06 15:29:03 -0500
  • 9f1c978f11 initial rake db:migrate was failing if hstore was already set Charles Oppenheimer 2013-02-06 11:47:39 -0800
  • de871ccf8a Fixed minor typo in lib/guardian.rb Bruno Bonamin 2013-02-06 17:46:45 -0200
  • 2ce69c73eb Use double quotes in image uploads instead of single quotes. Our sanitizer seems to hate single quotes. Robin Ward 2013-02-06 14:27:11 -0500
  • d4e5ed6348 Merge 295e8b6ff8 into 6043a370ad Sridhar Ratnakumar 2013-02-06 10:53:51 -0800
  • 295e8b6ff8 fix a syntax error in Gemfile Sridhar Ratnakumar 2013-02-06 10:51:30 -0800
  • 77908ed3d8 Split -vendor-placeholder selector by vendor. Ben Doerr 2013-02-06 12:39:15 -0500
  • 6043a370ad Oops, that should be 1.minute Robin Ward 2013-02-06 12:07:22 -0500
  • 8d568b05c4 Don't enable Cache-Control if the site has restricted access. Robin Ward 2013-02-06 11:55:54 -0500
  • 0b6b63f24a Merge pull request #22 from sandal/patch-1 Robin Ward 2013-02-06 07:08:02 -0800
  • 706a7409bd Merge d598851a88 into e2b99f5d33 Gregory Brown 2013-02-06 07:02:58 -0800
  • e2b99f5d33 Merge pull request #34 from mharen/master Robin Ward 2013-02-06 07:02:23 -0800
  • b60be8889f Remove some gems because they are never used in this project. Prace Fen 2013-02-06 22:48:55 +0800
  • b8c4f25ce4 Merge f4decfcddd into 27e1a81b34 Michael Haren 2013-02-06 06:38:29 -0800
  • f4decfcddd someone accidentally a word Michael Haren 2013-02-06 09:36:57 -0500
  • 24584ae916 Remove empty helpers Sebastian Sogamoso 2013-02-06 08:32:41 -0500
  • ef610e74ea gitigore xdite 2013-02-06 18:02:45 +0800
  • e6b41be87e Merge 4ad57586ba into 27e1a81b34 Terry 2013-02-06 01:52:09 -0800
  • 4ad57586ba Add redis.yml to .gitignore and renamed redis.yml to redis.yml.sample Terry Tai 2013-02-06 17:52:00 +0800