Commit Graph

16535 Commits

Author SHA1 Message Date
Kane York fc8539cb90 Merge branch 'master' into signup-cta
Conflicts:
	.eslintignore
2015-09-15 13:59:36 -07:00
Robin Ward 24991c4016 FIX: ESLint failure 2015-09-15 16:57:57 -04:00
Robin Ward 3c28eeaae3 FIX: Don't ESLINT addons 2015-09-15 16:54:51 -04:00
Neil Lalonde 41025be8f7 add download icon 2015-09-15 16:52:46 -04:00
Kane York d47f1db2be Merge branch 'master' into signup-cta
Conflicts:
	app/assets/javascripts/discourse/templates/topic.hbs
2015-09-15 13:52:12 -07:00
Neil Lalonde b4a724e80a FEATURE: export dashboard reports to csv file 2015-09-15 16:45:10 -04:00
Robin Ward b12ace5f9d FEATURE: Add staff gear icon to composer with options 2015-09-15 16:42:04 -04:00
Kane York 53c5c17625 Add ember-addons to eslintignore 2015-09-15 13:14:50 -07:00
Kane York 2e2fa693f5 You need to translate the site settings, dummy 2015-09-15 12:42:14 -07:00
Kane York 6be78861ca Merge branch 'master' into signup-cta
Conflicts:
	app/assets/javascripts/discourse/lib/key-value-store.js.es6
2015-09-15 12:26:25 -07:00
Kane York 41721b0898 Rename variables 2015-09-15 12:25:29 -07:00
Kane York 62444b9a13 Fix the visit tracking logic 2015-09-15 12:25:12 -07:00
Régis Hanol 9c740ffa7e UX: top period chooser was misaligned on mobile 2015-09-15 18:33:46 +02:00
Robin Ward 91f3e8e724 For now, restrict whispering to staff only. 2015-09-15 12:29:32 -04:00
Régis Hanol 7e1a24e205 FEATURE: ensure localStorage is disabled in smoke tests 2015-09-15 18:26:09 +02:00
Neil Lalonde 721b282d3c Merge pull request #3701 from xfalcox/patch-1
Fix same domains links on subfolder installs
2015-09-15 11:49:09 -04:00
Robin Ward 72f2454290 FIX: Auto close was broken 2015-09-15 11:09:20 -04:00
Régis Hanol 872239fc19 Merge pull request #3768 from erlend-sh/patch-7
Correct and update some links
2015-09-15 15:47:01 +02:00
Erlend Sogge Heggen 9484a042b2 Correct and update some links
- Point to updated Google OAuth2 doc
- Remove `/latest` from Twitter doc
- Replace @eviltrout's blog link with the new canonical Meta doc
2015-09-15 15:42:34 +02:00
Régis Hanol 0de00308af FIX: categories' notification_level wasn't serialized when hitting /categories 2015-09-15 14:58:22 +02:00
Régis Hanol c46269e7ec Merge pull request #3766 from tgxworld/fix_selected_posts_mobile
Fix selected posts mobile
2015-09-15 11:24:15 +02:00
Guo Xiang Tan 6360420aed FIX: Make category combobox in modal take 100% width. 2015-09-15 16:53:49 +08:00
Guo Xiang Tan 9977599ca9 FIX: Input on modal was overflowing. 2015-09-15 16:53:49 +08:00
Guo Xiang Tan 46c93a2687 FIX: Selected posts buttons not clickable. 2015-09-15 16:53:41 +08:00
Arpit Jalan 9dafc8b89b Merge pull request #3765 from tgxworld/typo_translation
[CI SKIP] Typo.
2015-09-15 13:27:25 +05:30
Guo Xiang Tan d49f382dcc [CI SKIP] Typo. 2015-09-15 15:55:23 +08:00
Sam 6496895096 FEATURE: search for all posts by a group 2015-09-15 17:39:14 +10:00
Sam 17d999ab12 FEATURE: search for all posts of users that have a badge
with_badge:"badge name" will allow you to search only
posts of users with a particular badge
2015-09-15 17:22:08 +10:00
Arpit Jalan 38adb6b6fb Merge pull request #3764 from techAPJ/master
FEATURE: add users to group via email
2015-09-15 12:45:11 +05:30
Arpit Jalan 607265fc28 FEATURE: add users to group via email 2015-09-15 12:36:44 +05:30
Sam 4758144f6a FIX: avoid horizontal scrollbar on narrow windows 2015-09-15 15:35:58 +10:00
Sam 83efde79f0 specs to account for new default letter avatar location 2015-09-15 13:25:15 +10:00
Sam 24520937aa FEATURE: improve safari editor hack 2015-09-15 13:09:12 +10:00
Sam e0562894a8 FEATURE: if there is only one category, don't show the category picker 2015-09-15 10:52:42 +10:00
Sam d0199bb717 FEATURE: by default everyone gets the letter free avatar service 2015-09-15 09:54:18 +10:00
Neil Lalonde 3ebad3e294 show a dot and reply count for new topics on mobile 2015-09-14 18:56:38 -04:00
Sam 8bcb22f52d Merge pull request #3723 from tgxworld/remove_sequential_rendering_of_time_gap
FIX: Timegap only shows up for sequential posts.
2015-09-15 08:28:45 +10:00
Rafael dos Santos Silva 230bc8bb6e Add tests to isInternal on subfolder installs 2015-09-14 18:39:54 -03:00
Rafael dos Santos Silva 4e39f9662d Rewrite origin so it matches original behavior
As suggested by @nlalonde
2015-09-14 18:29:39 -03:00
Robin Ward 3a93fafb58 FIX: Add `when` to split this topic text 2015-09-14 16:15:34 -04:00
Neil Lalonde 991a36f4f2 always use fetch_stats to get AdminDashboardData data 2015-09-14 16:10:54 -04:00
Neil Lalonde db1820f39c make it possible for plugins to add methods to classes that don't follow naming conventions 2015-09-14 16:10:54 -04:00
Robin Ward a8b3010617 FIX: Pagination was broken for groups 2015-09-14 15:54:48 -04:00
Régis Hanol edf54979e4 UX: don't show the top period in the navigation bar since it has its own dropdown 2015-09-14 21:54:39 +02:00
Régis Hanol 26c743a962 FIX: disable poll dialect when poll plugin is disabled 2015-09-14 20:11:03 +02:00
Robin Ward 1853829471 FIX: When switching discovery routes, fill the screen if content changes 2015-09-14 13:52:21 -04:00
Neil Lalonde 30999de3e2 add support for reports of 'time to first response' from a set of users 2015-09-14 13:36:54 -04:00
Régis Hanol 60bbd81607 FIX: polls with votes were preventing users from updating the post 2015-09-14 19:27:54 +02:00
Robin Ward 9420424a28 Merge pull request #3756 from riking/patch-6
Unlock eslint version
2015-09-14 11:49:23 -04:00
Robin Ward d02c996dde Merge pull request #3762 from ismail-arilik/patch-2
add GitHub login configuration link
2015-09-14 11:49:04 -04:00