Commit graph

8069 commits

Author SHA1 Message Date
Robin Ward
3151f59bc9 REFACTOR: We don't cache the json for the Site model anymore, so let's
rename and remove the methods leftover from that.
2014-02-24 14:25:37 -05:00
Robin Ward
7f2512b707 Merge pull request #2004 from velesin/posts_controller_tests_refactoring
PostsController tests clean up.
2014-02-24 12:53:54 -05:00
Robin Ward
d727915fd4 Merge pull request #2003 from velesin/posts_controller_instance_vars_fix
Removes unnecessary instance vars.
2014-02-24 12:17:13 -05:00
Wojciech Zawistowski
d555df28f2 PostsController tests clean up. 2014-02-24 18:14:35 +01:00
Wojciech Zawistowski
227c0af20b Removes unnecessary instance vars. 2014-02-24 18:03:29 +01:00
Robin Ward
7e8b0b0e15 Update onebox gem to for recent goodness 2014-02-24 11:13:00 -05:00
Régis Hanol
b9ce9a3f54 Merge pull request #1988 from ligthyear/fix-system-group-aliases
Fix group aliases causing private messages to not be created
2014-02-24 10:49:42 +01:00
Benjamin Kampmann
1e609aac77 Fix: apply excludes for user aliases in user selection view
- fixes a missing reassignment to the new named variable causing the selection of group aliases to fail in the user selector view of private messages
 - apply the list of excludes when a user selects a group alias to prevent double selection of users already in the list and selection of oneself
2014-02-24 10:35:47 +01:00
Régis Hanol
88fb1f75b3 Merge pull request #1997 from dmitry/locale_ru
Adding additional RU translations
2014-02-24 10:30:26 +01:00
Régis Hanol
e6d4bc1b56 Merge pull request #2001 from voisintotoro/trad20140215
Updated French translations
2014-02-24 10:29:28 +01:00
Sam
11f031c8f9 Merge branch 'fix_commit' 2014-02-24 13:16:01 +11:00
Omega Coleman
bc56d821bb Translate client into Chinese. 2014-02-24 13:15:27 +11:00
Sam
2a0df24caf Merge pull request #2002 from awesomerobot/master
color variable adjustments, topic not found page adjustments
2014-02-24 12:58:12 +11:00
Kris Aubuchon
6b050825ff revising color variables appwide, also some adjustments to "topic not found" page 2014-02-23 20:47:44 -05:00
Sam
b74675e153 UPDATE: omniauth gem and some others
needed to update omniauth for security issues
2014-02-24 10:11:16 +11:00
Sam
0679c668b0 UPDATE: sidekiq 2014-02-24 10:00:25 +11:00
Sam
ad95a8d8f3 UPDATE: latest version of Rails 2014-02-24 09:52:44 +11:00
Sam
0a26a12461 Merge pull request #1989 from Dreami/patch-1
Update client.de.yml
2014-02-24 09:33:31 +11:00
voisintotoro
5723124be9 Updated French tranlations 2014-02-23 20:46:18 +01:00
Jeff Atwood
d053f3c996 omit needless words 2014-02-23 10:11:34 -08:00
Jeff Atwood
b033d3c77c guide tweak 2014-02-23 09:41:04 -08:00
Jeff Atwood
aaf83f1410 clean up guide, add mailgun/mailjet opt 2014-02-23 09:38:06 -08:00
Jeff Atwood
1b1169d900 Merge pull request #1999 from trident523/patch-2
Update INSTALL-digital-ocean.md
2014-02-23 09:03:29 -08:00
Ben T
801aec618e One last thing...
it's a little early here... sorry!
2014-02-23 08:09:24 -05:00
Ben T
73692bf229 Left command in quotes. 2014-02-23 08:06:48 -05:00
Ben T
544df66490 Update INSTALL-digital-ocean.md
Why not use the docker install script? It has checks to make sure things are installed correctly. It could also be done via curl: 'curl -sL https://get.docker.io/ | sh'.

There's also https://get.docker.io/ubuntu/ as well, which has less checks.

Finally, should there be steps to set up an additional user and disable root login? Seems a little insecure.
2014-02-23 08:04:21 -05:00
Jeff Atwood
df79346481 header updates on DO guide 2014-02-23 03:03:21 -08:00
Jeff Atwood
fbf9006a63 email deliverability test copy update 2014-02-23 02:42:06 -08:00
Jeff Atwood
ca46418407 clarify guide details 2014-02-23 02:12:40 -08:00
Jeff Atwood
35c9cf1efd clarify guide details 2014-02-23 01:55:01 -08:00
Jeff Atwood
0eb22147c4 omit needless words 2014-02-23 01:39:15 -08:00
Jeff Atwood
104acb8959 nano clarification 2014-02-23 01:37:28 -08:00
Jeff Atwood
fea9d89a28 no needless two line commands please, WTF 2014-02-23 01:04:31 -08:00
Jeff Atwood
28c6bdd413 that ssh-add command is not required 2014-02-23 00:54:03 -08:00
Jeff Atwood
104baa4b95 improve first two images in digital ocean guide 2014-02-23 00:36:09 -08:00
Jeff Atwood
142e39f5f3 we need a bit more top-margin on h1,h2,h3 2014-02-23 00:22:11 -08:00
Jeff Atwood
cb446dd163 another pass on digital ocean guide 2014-02-23 00:02:29 -08:00
Jeff Atwood
83a121176b edits to digital ocean guide for clarity 2014-02-22 23:40:04 -08:00
Jeff Atwood
75fed4e170 add install-digital-ocean 2014-02-22 23:16:56 -08:00
Dmitry Polushkin
5b197bcf6f Adding additional RU translations 2014-02-23 01:47:02 +00:00
Dreami
520c393960 Some small changes
Will squash later...
2014-02-22 12:05:39 +01:00
Jeff Atwood
8f3383ea76 let's try this one more time 2014-02-22 01:51:50 -08:00
Jeff Atwood
b374097633 a wee bit narrower 2014-02-22 01:27:48 -08:00
Jeff Atwood
da31662dc0 images that fit in the narrower default proj view 2014-02-22 01:22:22 -08:00
Jeff Atwood
9bd5ffb2ad rename images to get new ones to appear 2014-02-22 01:01:42 -08:00
Jeff Atwood
a3f2f9a4cd add screenshots of live sites 2014-02-22 00:56:30 -08:00
Robin Ward
27d3fae4df BUGFIX: Typo was causing dismiss read to use id = 0 instead of id = 1 2014-02-21 21:14:07 -05:00
Jeff Atwood
41843e96b6 improved copy for watching/tracked adapted f/BBS 2014-02-21 17:26:32 -08:00
Jeff Atwood
a604ebb5b5 simplify category definition copy 2014-02-21 17:04:59 -08:00
Régis Hanol
68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00