Commit Graph

20540 Commits

Author SHA1 Message Date
Vibol Hou c3d60d5d1d Merge remote-tracking branch 'upstream/master' 2016-09-29 02:12:05 -07:00
Guo Xiang Tan 9859bfb072 Merge pull request #4471 from tgxworld/fix_plugin_translations_bundle_not_included
FIX: Plugin "admin_js" translations bundle was not fetched.
2016-09-29 07:58:31 +02:00
Guo Xiang Tan 40b83ebb47 Reset `I18n.locale` in tests. 2016-09-29 13:42:56 +08:00
Guo Xiang Tan 72ccb4e11d FIX: Plugin "admin_js" translations bundle was not fetched. 2016-09-29 04:42:26 +08:00
Jeff Atwood 50d4f9d016 Merge pull request #4469 from xfalcox/better-facebook-avatars
Uses higher resolution pictures when importing avatars from Facebook
2016-09-28 18:26:48 +02:00
Rafael dos Santos Silva 5bdaaca848 Make it square! 2016-09-28 12:49:22 -03:00
Jay Pfaffman 84de8e92e1 Rexexp.escape LISTNAME 2016-09-28 08:40:31 -07:00
Robin Ward f0937dc5d3 FIX: Route to `.rss` or `.json` as a server side URL 2016-09-28 10:36:56 -04:00
Robin Ward a69b897545 FIX: Bump the compiler version - the path to `raw-handlebars` changed. 2016-09-28 07:26:31 -04:00
Régis Hanol 11fdb8f038 Merge pull request #4465 from pfaffman/bbpress-env-config
bbpress.rb: move configuration to ENV
2016-09-28 11:20:41 +02:00
Régis Hanol 7bbf5158de Merge pull request #4461 from pfaffman/mbox-sort-order
mbox: sort input files by title, sort messages by date
2016-09-28 11:19:32 +02:00
Régis Hanol 064a83c44c Merge pull request #4464 from xfalcox/patch-2
Make deprecated.js ES5 compatible
2016-09-28 11:17:33 +02:00
Robin Ward 8871c9852c FIX: Allow us to link to server side responses 2016-09-28 05:04:23 -04:00
Arpit Jalan 38c6c69b5a Update Translations 2016-09-28 11:00:36 +02:00
Rafael dos Santos Silva f5746f490f Uses higher resolution pictures when importing avatars from Facebook 2016-09-28 01:38:41 -03:00
Jeff Atwood 214056e782 Merge pull request #4468 from xfalcox/last-visit-adjusts
Last visit adjusts
2016-09-27 22:27:17 +02:00
Rafael dos Santos Silva 2ce8845c89 Enable last visit line on mobile 2016-09-27 16:24:23 -03:00
Rafael dos Santos Silva a0f50ddaa7 Tone down text 2016-09-27 15:43:23 -03:00
Guo Xiang Tan 119225e496 Make eslint happy. 2016-09-27 15:12:47 +08:00
Rafael dos Santos Silva 16aad189fb UX: Add text to new messages line 2016-09-27 14:52:03 +08:00
Jeff Atwood a300e01af3 Merge pull request #4466 from xfalcox/word-wrap-latest-topics
FIX: Add word-wrap for blink browsers on categories latest session
2016-09-27 07:20:27 +02:00
Vibol Hou 34af73c7cb FEATURE: sparkpost webhook 2016-09-26 22:13:34 -07:00
Rafael dos Santos Silva ece10386a1 FIX: Long words on title shouldn't break layout 2016-09-26 19:12:46 -03:00
Jay Pfaffman 1c0e5ce523 bbpress.rb: move configuration to ENV 2016-09-26 15:03:42 -07:00
Rafael dos Santos Silva c759b5f955 Make ES5 compatible 2016-09-26 18:43:33 -03:00
Jeff Atwood d69cf820d8 Merge pull request #4462 from xfalcox/hide-names-about
FIX: Hide full names on /about for crawlers when names are disabled
2016-09-26 23:21:08 +02:00
Jeff Atwood a4dd862ad0 Merge pull request #4463 from xfalcox/emoji-grouping
FIX: New Emoji had missing group info
2016-09-26 23:20:35 +02:00
Rafael dos Santos Silva 7149e2ba20 FIX: New Emoji had missing group info 2016-09-26 18:12:40 -03:00
Rafael dos Santos Silva 108e3fdf97 FIX: Hide full names on /about for crawlers when names are disabled 2016-09-26 16:31:39 -03:00
Neil Lalonde 28ad3cbde6 Merge pull request #4460 from xfalcox/fix-tags-separation-categories-list
Fix tags separation on new category page
2016-09-26 15:23:15 -04:00
Jay Pfaffman 6e603c85a8 mbox: sort input files by title, sort messages by date 2016-09-26 12:18:11 -07:00
Rafael dos Santos Silva 048dea01f4 Fix tags separation on new category page 2016-09-26 16:14:41 -03:00
Guo Xiang Tan 999f52954f FIX: Incorrect import path for `iconHTML` helper. 2016-09-25 12:39:17 +08:00
Guo Xiang Tan 4e663998af PERF: N+1 query on user summary page. 2016-09-23 12:44:08 +08:00
Guo Xiang Tan bddbfa56f6 UX: Format numbers on user summary page. 2016-09-23 12:36:42 +08:00
Guo Xiang Tan 4895723f7b FIX: Regression where api_key is not filtered properly. 2016-09-23 11:38:37 +08:00
Jeff Atwood 0c4e4406a1 simplify quick start guide to reflect setup wizard 2016-09-22 19:06:54 -07:00
Robin Ward f90e1ce847 FIX: Don't double escape the category title 2016-09-22 21:13:08 -04:00
Sam 262297965f Merge pull request #4442 from pfaffman/kunena3-improvements
KUNENA3 importer: parameterize database and fields, link to attachments
2016-09-23 10:36:45 +10:00
Sam 8458badc44 Merge pull request #4436 from AhmadFCheema/patch-1
Rubygems upgrade needed for mailcatcher
2016-09-23 10:35:34 +10:00
Sam df751ed6ec Merge pull request #4457 from JaredReisinger/github-auth-with-email-whitelist
Add support for email whitelist/blacklist to GitHub auth
2016-09-23 09:49:14 +10:00
Robin Ward 3c12dd6549 FIX: Consider lazyYT divs as links when extracting 2016-09-22 16:50:24 -04:00
Jared Reisinger b7ea3de7bb Switch from hard-coded image version to 'latest' 2016-09-22 12:58:43 -07:00
Neil Lalonde e0be2f482e FEATURE: tag filter dropdown menu is scoped to user and category 2016-09-22 15:23:37 -04:00
Robin Ward 3d621767cc FIX: Wizard didn't work with subfolders 2016-09-22 14:39:36 -04:00
Jared Reisinger 2ae7c47a3c Add support for email whitelist/blacklist to GitHub auth
If a site is configured for GitHub logins, _**and**_ has an email domain
whitelist, it's possible to get in a state where a new user is locked to
a non-whitelist email (their GitHub primary) even though they have an
alternate email that's on the whitelist.  In all cases, the GitHub
primary email is attempted first so that previously existing behavior
will be the default.

- Add whitelist/blacklist support to GithubAuthenticator (via
  EmailValidator)

- Add multiple email support GithubAuthenticator

- Add test specs for GithubAuthenticator

- Add authenticator-agnostic "none of your email addresses are allowed"
  error message.
2016-09-22 11:31:10 -07:00
Robin Ward 92529cd409 FIX: Tab ordering and outlines for wizard 2016-09-22 13:38:58 -04:00
Neil Lalonde adfa2cb09e Version bump to v1.7.0.beta5 2016-09-22 12:44:10 -04:00
Neil Lalonde f27676a235 Update translations 2016-09-22 12:43:05 -04:00
Robin Ward 373004a00e FIX: Incorrect color scheme name in admin after using wizard 2016-09-22 11:16:01 -04:00