Commit Graph

6858 Commits

Author SHA1 Message Date
Robin Ward 4e1a628ff9 Hooks for extra nav items. 2014-02-25 16:02:27 -05:00
Robin Ward d079538a6d Allow the `customHTML` helper to look up fragments outside of the
preloadStore, so plugins can stuff HTML in there when overriding a whole
template doesn't make sense.
2014-02-25 16:02:27 -05:00
Jeff Atwood ce607e9d1c Merge pull request #2009 from techAPJ/update-docker-guide
Generalize the guide
2014-02-25 12:38:00 -08:00
Arpit Jalan 014c7c21e7 Generalize the guide 2014-02-26 01:56:03 +05:30
Jeff Atwood 18059991fc Merge pull request #2008 from techAPJ/update-docker-guide
Remove irrelevant image.
2014-02-25 12:14:08 -08:00
Arpit Jalan 8f6acc3404 Remove unnecessary image. 2014-02-26 01:34:01 +05:30
Robin Ward 8a96f1a7b6 FIX: Margin in onebox 2014-02-25 14:50:21 -05:00
Robin Ward cbf2e2e8f9 FIX: DiscourseLocalOnebox should have a higher priority than other
discourse sites
2014-02-25 14:08:48 -05:00
Robin Ward 2def97aceb FIX: DiscourseLocalOnebox is used! 2014-02-25 13:35:21 -05:00
Robin Ward cd7ef6b49a Revert "FIX: Bunch of Onebox issues"
This reverts commit ccbe671e4a.
2014-02-25 13:35:08 -05:00
Robin Ward ccbe671e4a FIX: Bunch of Onebox issues 2014-02-25 13:29:05 -05:00
Jeff Atwood 0e6325d172 unnecessary CSS suppression of li paras 2014-02-25 10:28:48 -08:00
Régis Hanol 32e3058f16 BUGFIX: force tar to follow symlinks during the export 2014-02-25 19:23:37 +01:00
Neil Lalonde b15e771d67 Oops, I meant 1 2014-02-25 12:19:22 -05:00
Neil Lalonde 7288bf1f31 Add previous page link for crawlers 2014-02-25 12:15:48 -05:00
Robin Ward 9ebcdfba1f Merge pull request #2005 from eriko/plugin_store_delete
clean up plugin store when removing data instead of setting the value to...
2014-02-25 11:36:05 -05:00
Erik Ordway dfa6960799 clean up plugin store when removing data instead of setting the value to nil and do it a reasonable way. 2014-02-25 08:26:35 -08:00
Neil Lalonde fdcd3c20b6 Admin Quick Start Guide topic is visible only to staff in new sites 2014-02-25 10:35:37 -05:00
Neil Lalonde 8134113b22 Add rel=next to next page link for crawlers 2014-02-25 10:18:07 -05:00
Jeff Atwood 1ead3a9114 no samsaffron 2014-02-25 01:27:34 -08:00
Jeff Atwood e5a520007d readme cleanup 2014-02-25 01:27:11 -08:00
Jeff Atwood 27768dfe77 Update INSTALL-digital-ocean.md 2014-02-25 01:22:15 -08:00
Jeff Atwood ac745da02f 2GB vs 1GB 2014-02-25 01:21:56 -08:00
Jeff Atwood f13a83cc3a clean up DO guide a bit more 2014-02-25 01:19:12 -08:00
Jeff Atwood 919d7881e3 Update TROUBLESHOOTING.md 2014-02-25 01:13:12 -08:00
Jeff Atwood 3ee7ef0953 normalize on Docker installs 2014-02-25 01:11:32 -08:00
Jeff Atwood adcd4a17c2 Rename HEROKU.md to install-HEROKU.md 2014-02-25 00:55:17 -08:00
Jeff Atwood 7fef2fa784 Update INSTALL-email.md 2014-02-25 00:54:00 -08:00
Jeff Atwood 7362b1edea deprecate this guide in favor of Docker 2014-02-25 00:53:27 -08:00
Jeff Atwood 77466f4f34 link to master install guide 2014-02-25 00:51:29 -08:00
Jeff Atwood c8a8e0df0f deprecate this guide in favor of Docker 2014-02-25 00:45:21 -08:00
Jeff Atwood 64258de688 shorten to "Invite Friends" 2014-02-24 23:23:55 -08:00
Jeff Atwood d0f5e1f53e Merge pull request #2006 from awesomerobot/master
adding word-wrap: break-word back to usernames, fixing onebox bg in quotes
2014-02-24 20:07:59 -08:00
Kris Aubuchon 8f6ab4fb85 adding word-wrap: break-word back to usernames, fixing onebog bg in quotes 2014-02-24 22:36:30 -05:00
Sam 6f31d3f0e5 FEATURE: single sign on support
Added support for outsourcing auth to a different website, documentation on meta
2014-02-25 14:31:03 +11:00
Erik Ordway db411860c2 clean up plugin store when removing data instead of setting the value to nil. 2014-02-24 16:11:31 -08:00
Neil Lalonde 46d1c8c1e0 FIX: n+1 queries in CategoryList 2014-02-24 15:07:46 -05:00
Robin Ward 4cd5ccdf1f BUGFIX: Don't return child categories if you can't see the parent
category.
2014-02-24 14:52:41 -05:00
Neil Lalonde 3690a24f7f FIX: welcome topic should be uncategorized 2014-02-24 14:27:29 -05:00
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