1237 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeff Atwood	38285b6219	for PMs, switch to envelope glyph instead of lock	2013-03-23 02:46:50 -07:00
Sam	4907d162ef	Merge pull request #534 from kubabrecka/cs_update ... update cs translation	2013-03-22 19:28:50 -07:00
Sam	c20aa07725	Merge pull request #536 from nverba/heroku-doc ... Added mandrill email example and Gemfile step to HEROKU.md	2013-03-22 19:28:01 -07:00
nverba	ba189df836	added mandrill email example	2013-03-23 01:53:40 +00:00
Jeff Atwood	f0b57d5e4a	reduce basic user time required from 25m to 20m	2013-03-22 15:33:40 -07:00
Neil Lalonde	158cda7628	Add moderator and admin count to dashboard	2013-03-22 17:50:34 -04:00
Kuba Brecka	260a113bea	update cs translation	2013-03-22 22:07:21 +01:00
Robin Ward	86eaf10c3e	Fix i18n integrity issue	2013-03-22 16:01:05 -04:00
Robin Ward	f1fbb9b09e	Merge pull request #527 from dacap/spanish ... Spanish translation	2013-03-22 12:50:17 -07:00
Robin Ward	8761b5ac4f	Merge pull request #533 from moneypenny/master ... Use consistent new-style hashes in render calls	2013-03-22 12:48:47 -07:00
Neil Lalonde	aa6e87c5c1	Dashboard memory warning	2013-03-22 15:47:35 -04:00
Robin Ward	9c38c13ac5	The "Best Of" mode uses a percentage ranking of posts.	2013-03-22 15:44:39 -04:00
Neil Lalonde	ab412dd8b4	Update admin dashboard views now that ember lets us render the same view multiple times with different models	2013-03-22 14:31:40 -04:00
Sarah Vessels	54c7b1ab63	Use consistent new-style hashes in render calls *twitch*	2013-03-22 14:08:11 -04:00
Robin Ward	3d4fb43c73	Re-enable integrity check	2013-03-22 12:49:46 -04:00
David Capello	2481fed8a4	Add Spanish translation (WIP)	2013-03-22 13:28:21 -03:00
Robin Ward	1d7c38bedf	Merge pull request #531 from kubabrecka/unused_code ... removing some unused code	2013-03-22 09:20:18 -07:00
Robin Ward	7b3149a65a	Merge pull request #528 from kubabrecka/missing_js_langs ... adding JS support for id and pt languages	2013-03-22 09:19:37 -07:00
Robin Ward	62f60a4f5d	Merge pull request #530 from kubabrecka/fix_nl_translation ... attemping to fix NL translation (client.nl.yml) which seems to be somehow broken	2013-03-22 09:19:18 -07:00
Robin Ward	7527d65d60	Merge pull request #529 from kubabrecka/i18n_date_formats ... update JS date formats for new languages	2013-03-22 09:18:45 -07:00
Robin Ward	de25c82a0c	Merge pull request #525 from habfast/master ... Improving french L10E	2013-03-22 09:18:09 -07:00
Robin Ward	291bd0b9e2	Merge pull request #526 from kubabrecka/cs_update ... cs translation update	2013-03-22 09:17:28 -07:00
Kuba Brecka	b392143991	removing some unused code	2013-03-22 17:14:29 +01:00
Robin Ward	154471126f	Update to master Ember.js	2013-03-22 12:13:52 -04:00
Robin Ward	bfa14b419c	Animate in the bottom filter bar	2013-03-22 12:05:17 -04:00
Robin Ward	5ec8af0019	Cleaned up a bunch of JS	2013-03-22 12:05:13 -04:00
Kuba Brecka	30e275fb87	attemping to fix NL translation (client.nl.yml) which seems to be somehow broken	2013-03-22 16:45:34 +01:00
Neil Lalonde	6f8d13d47e	Dashboard warning when sidekiq is not running	2013-03-22 11:35:51 -04:00
Kuba Brecka	d14198ce0c	update JS date formats for new languages	2013-03-22 16:32:03 +01:00
Kuba Brecka	4f74d4e8fc	adding JS support for id and pt languages	2013-03-22 16:18:06 +01:00
Kuba Brecka	377f380193	cs translation update	2013-03-22 15:54:50 +01:00
habfast	bc1aa12b02	Improving french translation ... Quoting everything minor correction for respecting french grammar rules	2013-03-22 15:15:32 +01:00
Robin Ward	d2a3fc8c47	Merge pull request #522 from panckreous/dberman-typo ... someone's been playing too much	2013-03-22 06:58:00 -07:00
Robin Ward	d5e03b02a3	Merge pull request #524 from ZogStriP/fix-opengraph-tags-not-fully-sanitized ... FIX: OpenGraph tags not fully sanitized	2013-03-22 06:41:34 -07:00
Régis Hanol	2ab08ef21d	FIX: OpenGraph tags not fully sanitized	2013-03-22 12:32:56 +01:00
Dan Berman	9ad5720090	someone's been playing too much	2013-03-22 06:18:48 -04:00
Sam	664915fcd2	Merge pull request #520 from Supermathie/master ... cdn prefetch: modify to pull files one-by-one	2013-03-21 20:03:19 -07:00
Supermathie	eedd69631b	Stage files to cdn77 one at a time ... * cdn77 API isn't allowing more than one file in a prefetch request * modify code to do them one-by-one	2013-03-21 23:56:58 -03:00
Robin Ward	ee5213be5f	Fixes regression with video embeds	2013-03-21 20:53:12 -04:00
Sam	2620d68fc0	Merge pull request #517 from kid0m4n/start-testing-ruby-2 ... .travis.yml: Start building discourse on ruby 2.0. Local build shows gre...	2013-03-21 17:53:00 -07:00
Karan Misra	c3affe31a6	.travis.yml: Start building discourse on ruby 2.0. Local build shows green	2013-03-22 06:14:48 +05:30
Sam	b516eccfc0	Merge pull request #515 from kid0m4n/ignore-binstubs ... .gitignore: Allow the binstubs folder generated by bundler to be ignored	2013-03-21 17:42:03 -07:00
Sam	799f25bb81	Merge pull request #516 from kid0m4n/fix-typo-1 ... .gitignore: Fix typo in the word refreshing	2013-03-21 17:41:01 -07:00
Karan Misra	929d4cd43b	.gitignore: Allow the binstubs folder generated by bundler to be ignored	2013-03-22 05:40:30 +05:30
Karan Misra	c9a81e6ef6	.gitignore: Fix typo in the word refreshing	2013-03-22 05:38:49 +05:30
Neil Lalonde	4d237c46a0	Add Java to vagrant image using chef	2013-03-21 18:51:33 -04:00
Robin Ward	d81a3230b5	Merge pull request #512 from ZogStriP/keep-french-l10n-up-to-date-2013-03-21 ... keeping the French l10n up to date	2013-03-21 14:28:09 -07:00
Régis Hanol	ce33432ac4	keeping the French l10n up to date	2013-03-21 22:12:48 +01:00
Neil Lalonde	8cc7f3c20b	Dashboard warning when clockwork doesn't seem to be running	2013-03-21 16:51:50 -04:00
Neil Lalonde	40962c84ca	Add 'all' column to admin dashboard counts	2013-03-21 16:51:50 -04:00