Commit graph

6086 commits

Author SHA1 Message Date
Robin Ward
1ecdd73a71 Merge pull request #1016 from abbat/master
Russian translation (draft)
2013-06-12 07:44:51 -07:00
Sam
ae1f5b3de0 goodbye NaNy 2013-06-12 16:38:02 +10:00
Sam
2a43d70869 refactor 2013-06-12 16:00:43 +10:00
Sam
165751e71b compact is better 2013-06-12 15:47:58 +10:00
Sam
d5b07464ea partial fix for suggested js error 2013-06-12 15:24:45 +10:00
Sam
201891f51f refactor and fix bug I introduced 2013-06-12 14:56:31 +10:00
Sam
eca2931a63 double notification is not really something we need. 2013-06-12 14:14:15 +10:00
Anton Batenev
f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Sam
54d8c963d0 fix tests and allow SE onebox to onebox Meta cause I need that for an post I am writing 2013-06-12 12:23:24 +10:00
Sam
74041be23b bring back some instrumentation 2013-06-12 11:47:03 +10:00
Sam
c1f6169b48 hidden and deleted state in user stream 2013-06-12 11:14:08 +10:00
Sam
6bf2f15610 use lodash cause we like lodash (faster and we can remove templating easily) 2013-06-12 10:23:47 +10:00
Sam
b6846060b7 Merge pull request #1009 from PavelPenkov/seed_task
Added rake db:seed:welcome task replacing pg_dumps/development-image.sql
2013-06-11 17:01:05 -07:00
Sam
eb91a0c9df Merge pull request #1012 from ZogStriP/extract-imgur-support-to-a-gem
Extract imgur support to a gem
2013-06-11 16:59:53 -07:00
Sam
334194ef82 Merge pull request #1013 from ZogStriP/replaced-lightbox-with-magnific-popup
replaced colorbox with magnific popup lightbox
2013-06-11 16:58:59 -07:00
Sam
638c656a06 Merge pull request #1015 from chrishunt/translate-keys
Get value for each property in i18n helper
2013-06-11 16:57:04 -07:00
Chris Hunt
48ee32f23e Get value for each property in i18n helper 2013-06-11 16:42:12 -07:00
Robin Ward
e116e9edbe Merge pull request #1014 from chrishunt/dont-show-mail-password
Do not show mail password in email settings
2013-06-11 16:23:06 -07:00
Chris Hunt
a362d62b42 Do not return mail password in EmailController 2013-06-11 16:00:13 -07:00
Régis Hanol
ba3d07ddcb replaced colorbox with magnific popup lightbox 2013-06-12 00:32:48 +02:00
Jeff Atwood
acb2126220 Omit Needless Words 2013-06-11 14:31:04 -07:00
Jeff Atwood
85fcfe5ede copyedits on digest email titles 2013-06-11 14:29:21 -07:00
Jeff Atwood
e78c04b88b extra space in email was causing sub-list :( 2013-06-11 13:52:54 -07:00
Régis Hanol
4db87e4972 added untested discourse_imgur plugin
tried to keep as much logic/data from the original source code
2013-06-11 22:44:06 +02:00
Robin Ward
bddc9dd4b8 FIX: Replace modal with an empty view when closed. Fixes the bug where you'd edit a category, close
and then click edit again.
2013-06-11 16:41:09 -04:00
Régis Hanol
8a2d635e62 removed imgur support 2013-06-11 21:51:41 +02:00
Neil Lalonde
a53f958c78 Fix error when trying to edit a category with empty slug 2013-06-11 15:43:07 -04:00
Neil Lalonde
82b5f57e40 Make it possible to set a site setting to empty string 2013-06-11 14:31:38 -04:00
Neil Lalonde
811a0df68b Make s3 region site setting a drop down 2013-06-11 14:24:04 -04:00
Robin Ward
ffde23f09f FIX: Header was sometimes being shown twice in a topic 2013-06-11 13:31:07 -04:00
Robin Ward
0cbf7c2417 FIX: Error viewing user page when not logged in. 2013-06-11 12:58:12 -04:00
Robin Ward
82116d5db5 FIX: Change username view was not loading. Also you can always edit yourself. 2013-06-11 12:35:46 -04:00
Robin Ward
e2ce4947d7 Adds max-width to images in digest emails. 2013-06-11 12:28:50 -04:00
Robin Ward
8b4e3402c2 Small improvements to digest emails and preview mechanism. 2013-06-11 12:27:11 -04:00
Robin Ward
45cff9c674 Merge pull request #1011 from chrishunt/add-parens
Add missing parentheses to moment()
2013-06-11 09:01:04 -07:00
Robin Ward
daeaf090c8 Merge pull request #1008 from Naiqus/patch-5
Update server.zh_CN.yml
2013-06-11 08:59:18 -07:00
Robin Ward
59ede7c51f Merge pull request #1007 from Naiqus/patch-4
Update client.zh_CN.yml
2013-06-11 08:58:59 -07:00
Robin Ward
ad5a511cde Merge pull request #1006 from benaadams/patch-1
sp in a2ensite (missing n)
2013-06-11 08:58:42 -07:00
Chris Hunt
d5c7e6b5f4 Add missing parentheses to moment() 2013-06-11 08:46:14 -07:00
Neil Lalonde
5ff7e570ac Add support for enum site settings that render as a dropdown; use a dropdown for default_locale 2013-06-11 11:40:14 -04:00
Sam
c27d5dc2bd regression, empty suggested list after posting a topic 2013-06-11 18:10:28 +10:00
Sam
c2cfbce9ce automatically updating times for posts on topic
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
2013-06-11 17:25:50 +10:00
Pavel Penkov
9ab743f351 Added rake db:seed:welcome task replacing pg_dumps/development-image.sql 2013-06-11 11:14:00 +04:00
Sam
6d85dc1724 bring in unread items to "latest" as well as new items. 2013-06-11 15:51:43 +10:00
Sam
4d7a520a8c don't render 0 ... also this file needs some love 2013-06-11 15:27:26 +10:00
Sam
4e01b84695 fix digest 2013-06-11 15:27:26 +10:00
Sam
fa8a84f20c removed sugar.js, port functionality to moment and underscore.js
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
Sam
eed5875505 fix bug with wrapping 2013-06-11 15:27:26 +10:00
Sam
a92bb46966 edit date to use formatter, compensate for invalid local time (at least don't blow up) 2013-06-11 15:27:26 +10:00
Naiqus
34eb36c88e Update server.zh_CN.yml 2013-06-11 02:18:12 +03:00