Robin Ward
36c3467f72
Merge pull request #69 from gammons/master
...
use shared_examples_for versioning for posts, topics
2013-02-08 08:11:44 -08:00
Robin Ward
bcd7af742f
Merge pull request #72 from tms/topic-page-css
...
Button container should be no wider than suggested topics
2013-02-08 08:10:30 -08:00
Robin Ward
c3b12e7e30
Merge pull request #76 from patdeegan/rack-security
...
Update rack gem, CVE-2013-0262 & CVE-2013-0263
2013-02-08 08:03:53 -08:00
Elliot Murphy
5467762557
Update rack gem, CVE-2013-0262 & CVE-2013-0263
2013-02-08 09:20:03 -05:00
Grant Ammons
a8c106bba6
use shared_examples_for versioning, for both posts and topics
2013-02-08 08:17:05 -05:00
Sam Saffron
e925d53463
disable diags for now
2013-02-08 22:35:35 +11:00
Sam Saffron
edaa7643c5
add prefix so keys stop clashing
2013-02-08 22:09:09 +11:00
Sam Saffron
d3f911cc4c
Revert "Something here is messed up Revert "message bus fixes and diagnostics""
...
This reverts commit f3c6144e3b
2013-02-08 22:03:45 +11:00
Sam Saffron
457229b133
Revert "Revert "structure.db to my structure""
...
This reverts commit 7c61c3d699
2013-02-08 22:03:25 +11:00
Sam Saffron
7c61c3d699
Revert "structure.db to my structure"
...
This reverts commit 616a1f4906
2013-02-08 21:57:16 +11:00
Sam Saffron
f3c6144e3b
Something here is messed up Revert "message bus fixes and diagnostics"
...
This reverts commit 36d1aafe1e
2013-02-08 21:39:38 +11:00
Sam Saffron
616a1f4906
structure.db to my structure
...
tone down watch for restart
2013-02-08 21:09:46 +11:00
Sam Saffron
36d1aafe1e
message bus fixes and diagnostics
2013-02-08 19:13:36 +11:00
Dan Neumann
0cf68e2714
Extracted default value initializers.
2013-02-08 01:56:12 -06:00
Alessandro Vermeulen
4589e41302
Added requirements on postgres and redis-server
2013-02-08 08:38:23 +01:00
Elliot Murphy
f28dc6115d
Restore NFS shares on darwin & 1024MB in Vagrant.
2013-02-07 22:07:03 -05:00
tms
b502a40b36
Button container should be no wider than suggested topics
...
The button container sticks out farther than necessary because of the
left margin, causing unnecessary horizontal scrolling at supported
resolutions
2013-02-07 21:18:22 -05:00
Neil Lalonde
79dfccf717
Username validation in signup and username change forms
2013-02-07 18:23:52 -05:00
Neil Lalonde
c524e769d0
Mothership#current_discourse_version had an invalid path
2013-02-07 18:23:52 -05:00
Robin Ward
2c8c602086
Always show username on hover, unless there's something else more interesting to say.
2013-02-07 17:41:32 -05:00
Robin Ward
06f4d7ca8e
Merge pull request #67 from arikfr/master
...
Configured Travis CI to run Jasmine specs too
2013-02-07 14:13:06 -08:00
Robin Ward
2d3b3325a0
Updated to acts_as_paranoid. Fixes #5 .
2013-02-07 17:08:54 -05:00
Arik Fraimovich
95179ac22c
Run Jasmine specs in Travis CI
2013-02-08 00:07:48 +02:00
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
