Sam Saffron
14a807f433
Merge branch 'master' of github.com:discourse/discourse
2013-02-08 08:50:08 +11:00
Sam Saffron
470ecf97cc
I have no objection to the removing of haml, but breaking our templates ... bad
2013-02-08 08:49:58 +11:00
Robin Ward
76cb20ae1f
Merge pull request #65 from ZogStriP/patch-3
...
Added travis-ci build status image
2013-02-07 13:48:31 -08:00
Régis Hanol
139d44cb33
Added travis-ci build status image
...
Now that discourse is using travis-ci, why not show the build status right in the README?
Note: not sure where to place it...
Documentation is over here: http://about.travis-ci.org/docs/user/status-images/
2013-02-07 22:46:06 +01:00
Robin Ward
2d064571df
Fixes some minor issues with users deleting their own posts.
2013-02-07 16:42:31 -05:00
Jeff Atwood
b8ded55450
a few minor copyedits, 1px adjust
2013-02-07 13:41:33 -08:00
Robin Ward
5ee91cc296
Merge pull request #62 from arikfr/master
...
Added TravisCI support
2013-02-07 13:20:46 -08:00
Robin Ward
c4ad927024
Site Settings was deleting the wrong cache object
2013-02-07 16:11:30 -05:00
Robin Ward
63c0fdda44
Merge pull request #57 from blowmage/user_search_refactor
...
Refactor UserController#search_users
2013-02-07 12:38:39 -08:00
Robin Ward
e98fb5592d
Delete button on OP deletes topic
2013-02-07 15:31:53 -05:00
Robin Ward
084a873b91
Give regular users a delete button. If they click it, their post will be revised to
...
say it was deleted.
2013-02-07 15:14:23 -05:00
Arik Fraimovich
ad93fe68d8
Updated .travis.yml to run migrations
2013-02-07 22:03:44 +02:00
Jeff Atwood
af11547108
shift post metadata closer to post
2013-02-07 11:56:22 -08:00
Arik Fraimovich
a63b07f7a5
Empty commit to trigger CI build.
2013-02-07 21:47:41 +02:00
Jeff Atwood
18b0be7a3a
need break-word on user page excerpts
2013-02-07 11:45:20 -08:00
Arik Fraimovich
c5233505e9
Added TravisCI configuration file
2013-02-07 21:43:07 +02:00
Elliot Murphy
f3bcbd8bc3
Use chef-solo to install phantomjs into Vagrant VM.
...
This introduces two configuration management runs into the
Vagrant provisioning phase. The first chef-solo run ensures that
a current version of chef is installed using the omnibus updater.
The second chef-solo run installs vim and phantomjs.
Much more is possible, this is a proof of concept.
Cookbooks are stored in the chef directory, and managed by
librarian-chef, which is like a bundler for cookbooks.
Chef is run when VM is first downloaded and booted, but not on
subsequent halt/up cycles. To force chef to run again, use
`vagrant provision`.
2013-02-07 14:09:57 -05:00
Elliot Murphy
9e198c3ac5
Merge branch 'master' into vagrant-chef
2013-02-07 13:58:28 -05:00
Robin Ward
8be8be9d93
Merge pull request #58 from tjstein/master
...
Fixing spelling error in public/500.html
2013-02-07 10:25:44 -08:00
Robin Ward
424d131d00
Merge pull request #60 from ZogStriP/patch-2
...
Changed Discourse CLA link to the canonical one
2013-02-07 09:49:52 -08:00
Régis Hanol
bb20466215
Changed Discourse CLA link to the canonical one
2013-02-07 18:47:51 +01:00
Robin Ward
3bd72d79f0
Merge pull request #59 from ZogStriP/patch-1
...
Added the link to the Discourse development forums
2013-02-07 09:42:42 -08:00
Régis Hanol
dbb595d83d
Added the link to the Discourse development forums
2013-02-07 18:38:57 +01:00
Mike Moore
d72c26ff92
Refactor UserSearch tests
2013-02-07 09:35:38 -07:00
Mike Moore
e41b6537f9
Remove expectation of term case
2013-02-07 09:35:38 -07:00
Mike Moore
5b01ac9288
Return User objects instead of hashes
2013-02-07 09:35:38 -07:00
Mike Moore
1cd565ec0d
Extract SQL generation method
2013-02-07 09:35:38 -07:00
Mike Moore
972b9d735c
Extract search logic to UserSearch model
2013-02-07 09:35:38 -07:00
Mike Moore
0136727595
Add test coverage for UsersController#search_users
2013-02-07 09:34:06 -07:00
Robin Ward
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
Robin Ward
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
Elliot Murphy
d2cebda786
Merge branch 'master' into vagrant-chef
2013-02-07 11:08:17 -05:00
Jakub Arnold
61654ab8f0
Fix all the trailing whitespace
2013-02-07 16:45:24 +01:00
Robin Ward
00ad40c243
Merge pull request #55 from spockz/patch-1
...
Added bundle install command to easy setup
2013-02-07 07:32:52 -08:00
Robin Ward
1839614bcc
Merge pull request #36 from fenprace/master
...
Remove some gems in the Gemfile
2013-02-07 07:09:28 -08:00
Robin Ward
f83dc09804
Merge pull request #54 from patdeegan/test-cleanups
...
Test cleanups.
2013-02-07 07:05:56 -08:00
Robin Ward
d49cf88c35
Merge pull request #51 from danneu/slug-patch
...
Strip leading and trailing slug punctuation.
2013-02-07 07:02:58 -08:00
Sam Saffron
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
Alessandro Vermeulen
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
Sam Saffron
168bb01439
allow for empty headers properly
2013-02-07 18:25:18 +11:00
Sam Saffron
85973ce6b0
added delete all posts button
...
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
Elliot Murphy
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
Elliot Murphy
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
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
