Commit Graph

1980 Commits

Author SHA1 Message Date
Sander Datema 2af902f4d1 Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation 2013-04-14 20:46:00 +02:00
Sander Datema f47f880f8b Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:44:59 +02:00
Jeff Atwood a1d7f24240 improve "override default" text in customize 2013-04-14 11:22:25 -07:00
Jeff Atwood c4a0cf6517 Merge pull request #707 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
2013-04-13 09:35:02 -07:00
Jeff Atwood 6a90ef7cf0 Merge pull request #706 from ZogStriP/keep-french-l10n-up-to-date-2013-04-12
keep French l10n up to date
2013-04-13 09:34:42 -07:00
tangramor 344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Régis Hanol efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Sam 5bca572321 Merge pull request #701 from lsdafjklsd/patch-1
Fixed typo
2013-04-12 16:06:50 -07:00
Sam 13adbf6f72 Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11
keep French l10n up to date
2013-04-12 16:06:18 -07:00
Philipp Weissensteiner 3dcb1905e3 Refactor user controller, create action, mostly.
The gist of the commit are a few improvements in the
create action, where:

* long boolean statemenst have been wrapped in smaller more readable
  methods.
* the 3rd party user info creation has been extracted (still in controller)
* a small helper method for creating a new user from params (to reduce
  visual clutter)
* specs have been added where I came across untested methods/branches

Other changes are more trivial like formatting and whitespace fixes.
Hope this helps. Regards.
2013-04-13 00:53:59 +02:00
Neil Lalonde 7bc80ea525 Oops i broke jshint again 2013-04-12 18:13:58 -04:00
Neil Lalonde 48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde 4413d2a92b Version bump to v0.8.6 2013-04-12 16:55:24 -04:00
Neil Lalonde 651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam 8014d7fd25 correct rack::cache so it always punches through users with auth cookies 2013-04-12 21:59:52 +10:00
Sam 1725bf77a7 fix build 2013-04-12 21:09:41 +10:00
Sam 5551ef9418 ok I should not be coding to a deadline ... grrr 2013-04-12 18:15:19 +10:00
Sam 86b317ea73 oops 2013-04-12 18:14:36 +10:00
Sam 0054416786 keep jshint happy :) need to reconfigure my vim jshint ... 2013-04-12 18:04:35 +10:00
Sam e969eb14e8 added 2 new flag types: notify user and notify moderators
fixed up messed up user navigation
refactored
2013-04-12 17:55:45 +10:00
Sam 0f362c5474 this has been bugging me for ages, broken "fill your profile link" fixed AND bio updates when you save 2013-04-12 10:07:58 +10:00
Régis Hanol ed790384b0 keep French l10n up to date 2013-04-12 00:07:14 +02:00
Ryan Haywood 57e16613cb Fixed typo 2013-04-11 17:42:52 -03:00
Neil Lalonde 04ca4077a7 Merge pull request #697 from kubabrecka/quote_post_fix
fix title of "quote post" button
2013-04-11 10:59:42 -07:00
Neil Lalonde 36dc5874e5 Post image_count doesn't count favicons and thumbnails in oneboxes, so visitors can post links that get oneboxed 2013-04-11 12:36:45 -04:00
Neil Lalonde e2ff5a1898 Use a button for the 'visit category topic' link 2013-04-11 11:43:08 -04:00
Neil Lalonde 7b76447e5e Change edit category modal submit button text to Save Category 2013-04-11 10:50:25 -04:00
Sam e1b958d483 oops 2013-04-11 21:31:56 +10:00
Sam 92e15ff4ef comment re cdn 2013-04-11 20:49:47 +10:00
Sam 3860a9302b fix quote reply regression 2013-04-11 16:32:56 +10:00
Sam 850b042cab introduce rack:cache as a default, so users don't need to configure apache or nginx
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)

reorganised so mini profilers can be cleanly disabled from config file

added caching for categories index

move production.rb to production.sample.rb
2013-04-11 16:24:21 +10:00
Jeff Atwood edd25e01a8 rename expertise to "built with" and move it up 2013-04-10 21:47:45 -07:00
Jeff Atwood 3a791d85e2 add proper deep links to team section 2013-04-10 21:45:31 -07:00
Jeff Atwood ec4e254f2e freeeeedoommmmm 2013-04-10 21:41:30 -07:00
Jeff Atwood b58d8cd987 more refinements 2013-04-10 21:33:28 -07:00
Jeff Atwood 546d537996 clean up readme a bit 2013-04-10 21:25:34 -07:00
Sam 5c4a5a9134 Merge pull request #687 from wojciechka/config_ru_prefix
Allow running discourse with prefix with passenger without requiring a symlink
2013-04-10 21:17:23 -07:00
Sam 4377bd1036 Merge pull request #688 from wojciechka/rakefile_db_dump_fix
Prevent crashes during migration in certain PostgreSQL configurations
2013-04-10 21:13:57 -07:00
Sam 5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles
auto replace rules in titles
2013-04-10 21:12:20 -07:00
Jeff Atwood 5fc38d0613 use proper blog post title for consistency 2013-04-10 15:05:22 -07:00
Jeff Atwood f139a3b1bc add link to blog post 2013-04-10 14:59:35 -07:00
Jeff Atwood 703ead66b4 move vagrant warning down 2013-04-10 14:58:12 -07:00
Jeff Atwood 41dde3fb63 add link to blog post 2013-04-10 14:55:14 -07:00
Neil Lalonde 19a1855ea0 Give vm more memory with DISCOURSE_VM_MEM env variable 2013-04-10 16:57:34 -04:00
Neil Lalonde c0f3c47196 Use message bus to broadcast addition and removal of categories 2013-04-10 15:53:36 -04:00
Kuba Brecka 11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde 229395729d Make title field bigger when editing a topic title 2013-04-10 14:19:34 -04:00
Neil Lalonde 669dad6cbb Merge pull request #696 from kubabrecka/update_stemmers
update the list of i18n postgre stemmers
2013-04-10 11:07:05 -07:00
Neil Lalonde 312c42ae98 Merge pull request #690 from kubabrecka/update_cs32
cs translation update
2013-04-10 11:02:26 -07:00
Neil Lalonde 28ed4defe3 Merge pull request #692 from ZogStriP/fix-text-not-updated-when-changing-notifications
FIX: Text not updated when changing notifications after reading a topic
2013-04-10 10:54:44 -07:00