Commit Graph

8687 Commits

Author SHA1 Message Date
Robin Ward 1df3214773 ES6: Convert header view 2014-06-09 11:34:38 -04:00
Robin Ward c176dc07c1 Merge pull request #2421 from peternlewis/reply_to_name
Use an appropriate name in the Reply-To header
2014-06-09 11:04:53 -04:00
Neil Lalonde 4d50d0d109 FIX: admins should be able to create topics, even if min_trust_to_create_topic is higher than their trust level 2014-06-09 11:03:21 -04:00
Robin Ward b16c18e667 Merge pull request #2424 from abezzub/website
Move website from User to UserProfile
2014-06-09 11:00:20 -04:00
Peter N Lewis 93f5f98b58 Corrected and added appropriate specs to confirm correct behaviour.
Tests ensure that the site name is used for public replies and the username is used for private replies.
2014-06-09 18:26:19 +08:00
Jeff Atwood 2c1903574f Merge pull request #2427 from techAPJ/fix-typo
Fix Typo
2014-06-08 11:05:52 -07:00
Arpit Jalan 0ca9d5f3f9 Fix Typo 2014-06-08 18:04:35 +05:30
Jeff Atwood 5483ce74d1 apt-get update not needed as get.docker.io does it 2014-06-07 23:42:01 -07:00
Jeff Atwood 4a5d021485 add Docker 0.12 workaround 2014-06-07 23:30:09 -07:00
Jeff Atwood 61bcdb926a make create new account a big button vs. link 2014-06-07 22:27:41 -07:00
Jeff Atwood 547ee55d42 Update INSTALL-digital-ocean.md 2014-06-07 21:28:07 -07:00
Jeff Atwood efc421bce5 Update INSTALL-digital-ocean.md 2014-06-07 21:24:42 -07:00
Andrew Bezzub 0a42901c40 do not use try in UserSerializer for fields coming from UserProfile 2014-06-07 13:30:35 -07:00
Jeff Atwood 9a416614a4 Update INSTALL.md 2014-06-07 12:31:56 -07:00
Jeff Atwood a64fd8aa91 Merge pull request #2426 from techAPJ/fix-badge-spacing
Fix Badge Spacing
2014-06-07 12:26:44 -07:00
Arpit Jalan 42d6cf90f6 Fix Badge Spacing 2014-06-08 00:17:33 +05:30
Andrew Bezzub 7db31adf35 move website from User to UserProfile 2014-06-06 21:54:32 -07:00
Jeff Atwood 1c7f68764a Merge pull request #2423 from ArmedGuy/master
Deboxify .nav-stacked on user-page
2014-06-06 19:53:54 -07:00
Johan Jatko c6a8c095f2 Deboxify .nav-stacked on user-page 2014-06-07 04:41:14 +02:00
Sam 0f37699d5f BUGFIX: broken schedule 2014-06-07 10:25:15 +10:00
Neil Lalonde b031327a46 Reverse the order of rows in a report so today is first 2014-06-06 17:08:35 -04:00
Neil Lalonde 4f90869618 Add content :bottom to the bottom of every page, as it says it should 2014-06-06 16:48:17 -04:00
Neil Lalonde d4b8581fbe FIX: avatars:refresh job calling undefined method 2014-06-06 16:48:17 -04:00
Robin Ward 78f2d6f870 FIX: Support YouTube embeds with the alternate timestamp format. 2014-06-06 13:19:24 -04:00
Régis Hanol aa71d15b7d TRIVIAL: uses the new attribute 2014-06-06 19:00:00 +02:00
Régis Hanol 8262279380 update ember-cloaking to support bottom fixed element 2014-06-06 18:59:07 +02:00
Robin Ward e0b72997db FIX: Upgrade onebox gem to fix broken image urls 2014-06-06 10:36:32 -04:00
Robin Ward 6048c9e100 Let's switch back to using post numbers rather than `last` for links to
the last post. We'll keep support for the old format, but start linking
directly to the last post.
2014-06-06 10:14:43 -04:00
Peter N Lewis 0af1242aa8 Use an appropriate name in the Reply-To header
Use "Site Name <>" for the Reply-To header when the reply is to the site or a public topic.

Use "username <>" for the Reply-To header only when the reply is to a private message topic.
2014-06-06 21:09:00 +08:00
Sam cc1bbf3a7b BUGFIX: cut up line while searching in chrome mac 2014-06-06 17:15:14 +10:00
Sam 41b15d1ad1 BUGFIX: not notifying unread and new counts correctly 2014-06-06 15:17:02 +10:00
Sam 3767080f3b Added rake task to normalize code 2014-06-06 14:08:39 +10:00
Sam Saffron d97ceb1d72 FEATURE: log_out endpoint for admins 2014-06-06 13:02:52 +10:00
Sam Saffron 05ca1e6e46 Added code block normalization routing for import 2014-06-06 10:34:21 +10:00
Jeff Atwood 544e7b999e Merge pull request #2419 from adamloving/patch-1
Heroku Readme: Add instructions to add postgres
2014-06-05 15:31:21 -07:00
Adam Loving b33a6e363b Add instructions to add postgres
heroku addons:add heroku-postgresql
2014-06-05 14:55:33 -07:00
Jeff Atwood 221fc2aef4 Merge pull request #2417 from adamloving/doc-fixes
Minor fixes to documentation and comments
2014-06-05 14:49:59 -07:00
Jeff Atwood c27e70849e Merge pull request #2418 from kevinreese/master
restore bg-color for New Topic / New Post rows of Topic-List Categories
2014-06-05 14:46:50 -07:00
Robin Ward 97715b33d5 FIX: Composer wasn't displaying errors correctly. The fix is a hack
around our weird view structure that we need to fix.
2014-06-05 17:06:42 -04:00
Neil Lalonde cc257e1f5c Boolean site settings don't save immediately 2014-06-05 17:02:15 -04:00
Neil Lalonde e114e47533 FIX: enum site settings UI was broken 2014-06-05 16:42:37 -04:00
Robin Ward 651def63e5 Return the current user's custom fields 2014-06-05 16:16:45 -04:00
Neil Lalonde f085770ed4 Import scripts: add update_feature_topic_users 2014-06-05 15:31:05 -04:00
Neil Lalonde 9bd76b0c16 Import scripts: relax our posting rules before the import starts 2014-06-05 15:31:05 -04:00
Robin Ward 6ae7d48fd1 FIX: Make sure the context of plugin outlets is correct 2014-06-05 15:20:55 -04:00
Robin Ward e65283ecf5 ES6: Convert a view, adds a backwards compatibility layer with
deprecations for the old view helper names.
2014-06-05 15:09:20 -04:00
Kevin Reese 49ef3958c5 restore bg-color for New Topic / New Post rows in Topic-List Categories table 2014-06-05 11:58:20 -07:00
Neil Lalonde 2f706d084f FIX: in import scripts, don't generate names for users based on their emails. It's basically the same as publicizing their emails. 2014-06-05 14:15:52 -04:00
Robin Ward 7bb33c28c2 Add new `max_width` feature for oneboxes. Allows vimeo oneboxes to not
look like total garbage.
2014-06-05 13:18:18 -04:00
Adam Loving 5e57ff485c Update development docs regarding SMTP 2014-06-05 09:52:49 -07:00